Force lib name to libdeepwave_C on Windows, pre-install CPU-only PyTorch on Linux, set more environment variables for CUDA on Windows (including CUDACXX), and add some dir commands to try to find out why it is not finding Intel OpenMP

Author: ar4

.github/workflows/build.yml

@@ -8,7 +8,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-2022, macos-13, macos-14]
+        os: [windows-2022]
+          #os: [ubuntu-latest, windows-2022, macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v5
@@ -35,27 +36,32 @@ jobs:
             nuget install intelopenmp.redist.win -DirectDownload -NonInteractive
             cp intelopenmp.devel.win*/build/native/win-x64/libiomp5md.lib .
             cp intelopenmp.redist.win*/runtimes/win-x64/native/libiomp5md.dll .
+            echo "dir lib"
+            dir libiomp5md.lib
+            echo "dir dll"
+            dir libiomp5md.dll
+            echo "dir"
+            dir
             curl https://developer.download.nvidia.com/compute/cuda/12.4.0/network_installers/cuda_12.4.0_windows_network.exe -o cuda_12.4.0_windows_network.exe
             chmod +x ./cuda_12.4.0_windows_network.exe
             ./cuda_12.4.0_windows_network.exe -s nvcc_12.4 cudart_12.4
             echo "CUDA_PATH=C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v12.4" >> $GITHUB_ENV
             echo "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v12.4\\bin" >> $GITHUB_PATH
-          CIBW_ENVIRONMENT_WINDOWS: CUDA_PATH="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v12.4" PATH="$PATH:C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v12.4\\bin"
-          CUDAToolkit_ROOT: ${{ env.CUDA_PATH }}
+          CIBW_ENVIRONMENT_WINDOWS: PATH="$PATH:C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v12.4\\bin" CUDA_PATH="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v12.4" CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v12.4" CUDACXX="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v12.4\\bin\\nvcc"
 
       - uses: actions/upload-artifact@v4
         with:
           path: ./wheelhouse/*.whl
 
-  build_sdist:
-    name: Build source distribution
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-
-      - name: Build sdist
-        run: pipx run build --sdist
-
-      - uses: actions/upload-artifact@v4
-        with:
-          path: dist/*.tar.gz
+            #  build_sdist:
+            #    name: Build source distribution
+            #    runs-on: ubuntu-latest
+            #    steps:
+            #      - uses: actions/checkout@v5
+            #
+            #      - name: Build sdist
+            #        run: pipx run build --sdist
+            #
+            #      - uses: actions/upload-artifact@v4
+            #        with:
+            #          path: dist/*.tar.gz

CMakeLists.txt

@@ -88,12 +88,16 @@ else()
 endif()
 
 # Add warning flags for GCC/Clang
+#add_compile_options(
+#    $<$<C_COMPILER_ID:GNU,Clang>:-Wall>
+#    $<$<C_COMPILER_ID:GNU,Clang>:-Wextra>
+#    $<$<C_COMPILER_ID:GNU,Clang>:-pedantic>
+#)
 add_compile_options(
-    $<$<C_COMPILER_ID:GNU,Clang>:-Wall>
-    $<$<C_COMPILER_ID:GNU,Clang>:-Wextra>
-    $<$<C_COMPILER_ID:GNU,Clang>:-pedantic>
+	$<$<C_COMPILER_ID:MSVC>:/w>
 )
 
+
 if(CMAKE_BUILD_TYPE MATCHES Release)
     if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang|Intel")
         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Ofast")
@@ -221,6 +225,9 @@ endif()
 
 # --- Final Library Build ---
 add_library(deepwave_C SHARED ${DEEPWAVE_OBJECTS})
+if(WIN32)
+    set_target_properties(deepwave_C PROPERTIES OUTPUT_NAME "libdeepwave_C")
+endif()
 set_target_properties(deepwave_C PROPERTIES
     C_VISIBILITY_PRESET default
     CUDA_VISIBILITY_PRESET default

pyproject.toml

@@ -52,6 +52,7 @@ test-requires = "pytest scipy torch"
 test-command = "pytest {project}/tests"
 # Don't bundle CUDA libraries with the wheel
 repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel} --exclude libcuda.so.1 --exclude 'libcudart.so.*'"
+before-test = "pip install torch torchvision --index-url https://download.pytorch.org/whl/cpu"
 
 [tool.cibuildwheel.windows]
 test-command = "pytest {project}/tests/test_scalar.py"