Quick fix for building error with nvcc

Author: spollok

.conda-recipe/bld.bat

@@ -6,9 +6,12 @@ call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
 
 :: Navigate to wrapper file for python module
 cd %RECIPE_DIR%\..\python\src\magtense\lib
-del /Q /F %RECIPE_DIR%\..\python\src\magtense.egg-info
-del /Q /F %RECIPE_DIR%\..\python\build
+rmdir /S /Q %RECIPE_DIR%\..\python\src\magtense.egg-info
+rmdir /S /Q %RECIPE_DIR%\..\python\build
 make clean
+
+:: As nvcc compilation in build environment throws an error
+copy %RECIPE_DIR%\..\source\MagTenseFortranCuda\cuda\MagTenseCudaBlas.o .
 make
 
 :: Navigate to distribution script

python/README.md

@@ -111,6 +111,11 @@ conda config --env --append channels intel
 # On Windows
 # conda config --env --append channels conda-forge
 
+# Quick fix for error of nvcc during build on Windows
+# conda install -y -c nvidia/label/cuda-12.2.2 cuda-nvcc
+# cd MagTense/source/MagTenseFortranCuda/cuda/
+# nvcc -c MagTenseCudaBlas.cu -o MagTenseCudaBlas.o
+
 # Version numbers have to be set in advance in pyproject.toml
 cd MagTense/python/
 python scripts/dist_conda.py

python/scripts/dist_conda.py

@@ -10,24 +10,26 @@ def main(mt_version = '2.2.1', py_versions = ['3.11']):
     else:
         arch = "linux-64"
 
-    s_0 = "#=========================="
-    s_1 = "# Compiler names and flags"
-
     for py in py_versions:
         for cuda in ["cuda12"]:
-            if cuda == "cpu":
-                s_2 = "USE_CUDA = 0"
-            else:
-                s_2 = "USE_CUDA = 1"
-        
             with open("src/magtense/lib/Makefile", 'r') as source_file:
-                lines_to_append = source_file.readlines()[4:]
+                lines_to_append = source_file.readlines()[5:]
 
             with open("scripts/temp.txt", "w") as file:
-                file.write(s_0 + '\n')
-                file.write(s_1 + '\n')
-                file.write(s_0 + '\n')
-                file.write(s_2 + '\n')
+                file.write("#==========================\n")
+                file.write("# Compiler names and flags\n")
+                file.write("#==========================\n")
+
+                if cuda == "cpu":
+                    file.write("USE_CUDA = 0\n")
+                else:
+                    file.write("USE_CUDA = 1\n")
+
+                if platform.system() == 'Windows':
+                    file.write("USE_NVCC = 0\n")
+                else:
+                    file.write("USE_NVCC = 1\n")
+
                 file.writelines(lines_to_append)
 
             shutil.move("scripts/temp.txt", "src/magtense/lib/Makefile")

python/src/magtense/lib/Makefile

@@ -2,6 +2,7 @@
 # Compiler names and flags
 #==========================
 USE_CUDA = 1
+USE_NVCC = 1
 USE_CVODE = 0
 USE_MICROMAG = 1
 
@@ -22,6 +23,7 @@ ifeq (${F90}, gfortran)
 endif
 
 CC = gcc
+CPP = icx
 CFLAGS = -fPIC
 CU = nvcc
 PYTHON_MODN = magtensesource
@@ -62,7 +64,6 @@ ifeq ($(OS),Windows_NT)
 		LIB_OPT = -L. -llibsrc
 	endif
 
-	CPP = icl
 	CPPFLAGS = /Fo:${CUDA_WRAP}
 	CUFLAGS = -I ${OPT}
 	CUDA = -L${CONDA_PREFIX}/Lib/x64 -lcublas -lcudart -lcuda -lcusparse
@@ -93,7 +94,6 @@ else
 	endif
 
 	EXTRA_OPT = --opt='${F90FLAGS}'
-	CPP = icx
 	CPPFLAGS = ${CFLAGS} -o ${CUDA_WRAP}
 	CUFLAGS = -shared -Xcompiler -fPIC -I ${OPT}
 	CUDA = -L${CONDA_PREFIX}/lib -lcublas -lcudart -lcuda -lcusparse
@@ -153,7 +153,11 @@ LIBSRC_WRAP_FILES = $(addsuffix .f90, ${LIBSRC_WRAP_SOURCES})
 #=======================================================================
 #                 Relevant suffixes
 #=======================================================================
+ifeq ($(USE_NVCC),0)
+.SUFFIXES: .f90 .cxx
+else
 .SUFFIXES: .f90 .cu .cxx
+endif
 
 #=======================================================================
 #