ps - bash - ps - cmd

cmt-dtu-energy · Jan 25, 2025 · 3e73325 · 3e73325
1 parent 4dc6517
commit 3e73325
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 34 deletions.
diff --git a/.github/workflows/customized-win-shells.yml b/.github/workflows/customized-win-shells.yml
@@ -33,20 +33,11 @@ jobs:
         .\Launch-VsDevShell.ps1
         cd ${{ github.workspace }}/source/MagTenseFortranCuda/cuda
         make wrap
-        ls -al
+        ls
 
     - name: Run x64 Native Tools Command Prompt for VS 2022
       shell: cmd /k "{0}" -arch=amd64 -host_arch=x64
       working-directory: ${{ github.workspace }}/source/MagTenseFortranCuda/cuda
       run: |
         call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
         nvcc && make cuda
-
-    # - name: Run 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/
-    #     ls
-    #     LIB /VERBOSE
diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
@@ -16,33 +16,38 @@ jobs:
         python-version: 3.12
         auto-activate-base: false
 
-    - name: Compile Fortran source code and build Python wrapper
-      shell: bash -el {0}
-      working-directory: ${{ github.workspace }}/python/src/magtense/lib/
-      run: make
+    # - name: Compile Fortran source code and build Python wrapper
+    #   shell: bash -el {0}
+    #   working-directory: ${{ github.workspace }}/python/src/magtense/lib/
+    #   run: make
 
-    # - name: Compile Fortran files 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 ps
+    - name: Compile Fortran files 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 ps
     
-    # - name: Compile with nvcc in Bash
-    #   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
-    #     "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/Common7/Tools/VsDevCmd.bat"
-    #     make wrap
+    - name: Compile with nvcc in Bash
+      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
 
-    # - name: Build Python wrapper in x64 Native Tools Command Prompt for VS 2022
-    #   shell: cmd /k "{0}" -arch=amd64 -host_arch=x64
-    #   working-directory: ${{ github.workspace }}/python/src/magtense/lib/
-    #   run: |
-    #     call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
-    #     make cmdx64
+    - name: Link Cuda wrapper with 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 }}/source/MagTenseFortranCuda/cuda
+        make wrap
+
+    - name: Build Python wrapper in x64 Native Tools Command Prompt for VS 2022
+      shell: cmd /k "{0}" -arch=amd64 -host_arch=x64
+      working-directory: ${{ github.workspace }}/python/src/magtense/lib/
+      run: |
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        make cmdx64
 
     - name: Install local magtense package with pip
       run: python -m pip install -e ${{ github.workspace }}/python