ae

cmt-dtu-energy · Jan 25, 2025 · 6a2c2cc · 6a2c2cc
1 parent e63ba76
commit 6a2c2cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
@@ -48,6 +48,8 @@ jobs:
         cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\"
         .\Launch-VsDevShell.ps1
         cd ${{ github.workspace }}/python/src/magtense/lib/
+        conda deactivate
+        conda activate magtense-env
         make cmdx64
 
     # - name: Build Python wrapper in x64 Native Tools Command Prompt for VS 2022

diff --git a/python/src/magtense/lib/Makefile b/python/src/magtense/lib/Makefile
@@ -203,7 +203,6 @@ cuda:
 
 ${PYTHON_MODN_ALL}:
 	${CP_LIB}
-	FC=${FC} FFLAGS=${EXTRA_FFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARYPATH=${CONDA_PATH}/Library/lib \
-		python -m numpy.f2py -c -m ${PYTHON_MODN} \
+	FC=${FC} FFLAGS=${EXTRA_FFLAGS} LDFLAGS=${LDFLAGS} 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}