w

cmt-dtu-energy · Jan 25, 2025 · 65ac3ad · 65ac3ad
1 parent 3459848
commit 65ac3ad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/customized-win-shells.yml b/.github/workflows/customized-win-shells.yml
@@ -12,30 +12,28 @@ jobs:
       with:
         activate-environment: magtense-env
         python-version: 3.12
-        channels: conda-forge,nvidia/label/cuda-12.6.3
+        channels: conda-forge,nvidia/label/cuda-12.6.3,https://software.repos.intel.com/python/conda/
         auto-activate-base: false
 
     - name: Install minimal packages
       shell: bash -el {0}
       run: |
-        conda install cuda-nvcc libcusparse-dev libcublas-dev cuda-cudart-dev make vs2022_win-64
+        conda install cuda-nvcc libcusparse-dev libcublas-dev cuda-cudart-dev make vs2022_win-64 "dpcpp_win-64"
 
     - name: Run Command Prompt
       shell: bash -el {0}
       working-directory: ${{ github.workspace }}/source/MagTenseFortranCuda/cuda
       run: |
         nvcc -c MagTenseCudaBlas.cu -ccbin "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.42.34433\bin\Hostx64\x64" -o MagTenseCudaBlas.o
-        ls -al
-        make clean
 
     - name: Run Command Prompt with VS activation
       shell: bash -el {0}
       working-directory: ${{ github.workspace }}/source/MagTenseFortranCuda/cuda
       run: |
         "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/Common7/Tools/VsDevCmd.bat"
-        make cuda
+        LIB /VERBOSE
+        make wrap
         ls -al
-        make clean
 
     - name: Run x64 Native Tools Command Prompt for VS 2022
       shell: cmd /k "{0}" -arch=amd64 -host_arch=x64

diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
@@ -28,13 +28,14 @@ jobs:
     #     .\Launch-VsDevShell.ps1
     #     cd ${{ github.workspace }}/python/src/magtense/lib/
     #     make ps
-
-    # - name: Compile with nvcc in x64 Native Tools Command Prompt for VS 2022
-    #   shell: cmd /k "{0}" -arch=amd64 -host_arch=x64
+    
+    # - name: Compile with nvcc in Bash
+    #   shell: bash -el {0}
     #   working-directory: ${{ github.workspace }}/source/MagTenseFortranCuda/cuda
     #   run: |
-    #     call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
-    #     make
+    #     nvcc -c MagTenseCudaBlas.cu -ccbin "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.42.34433\bin\Hostx64\x64" -o MagTenseCudaBlas.o
+    #     "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/Common7/Tools/VsDevCmd.bat"
+    #     make wrap
 
     # - name: Build Python wrapper in x64 Native Tools Command Prompt for VS 2022
     #   shell: cmd /k "{0}" -arch=amd64 -host_arch=x64