ac

cmt-dtu-energy · Jan 25, 2025 · 690aa05 · 690aa05
1 parent a7eeb8d
commit 690aa05
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
@@ -42,10 +42,13 @@ jobs:
         cd ${{ github.workspace }}/source/MagTenseFortranCuda/cuda
         make wrap
 
-    - name: Build Python wrapper in PowerShell
-      shell: pwsh
-      working-directory: ${{ github.workspace }}/python/src/magtense/lib/
-      run: make cmdx64
+    - name: Build Python wrapper in Developer PowerShell for VS 2022
+      shell: pwsh -NoExit -ExecutionPolicy ByPass -File {0}
+      run: |
+        cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\"
+        .\Launch-VsDevShell.ps1
+        cd ${{ github.workspace }}/python/src/magtense/lib/
+        make cmdx64
 
     # - name: Build Python wrapper in x64 Native Tools Command Prompt for VS 2022
     #   shell: cmd /k "{0}" -arch=amd64 -host_arch=x64

diff --git a/python/src/magtense/lib/Makefile b/python/src/magtense/lib/Makefile
@@ -203,6 +203,6 @@ cuda:
 
 ${PYTHON_MODN_ALL}:
 	${CP_LIB}
-	FC=${FC} FFLAGS=${EXTRA_FFLAGS} LDFLAGS=${LDFLAGS} python -m numpy.f2py -c -m ${PYTHON_MODN} \
+	FC=${FC} FFLAGS=${EXTRA_FFLAGS} LDFLAGS=${LDFLAGS} LIBS=${CONDA_PATH}/Library/lib/libiomp5md python -m numpy.f2py -c -m ${PYTHON_MODN} \
 		--build-dir ./build -I${OPT} -I${INCLUDE_OBJ} ${CVODE_OPT} \
 		-L${MKFILE_PATH} ${LIB_OPT} FortranToPythonIO.f90 ${MKL} ${CUDA} ${CVODE}