Skip to content

Commit cd99ad0

Browse files
committed
Move commands to download Intel OpenMP into GitHub Action, and use old commands rather than new ones. Also remove DOpenMP_ROOT Windows envvar from pyproject
1 parent e9349f0 commit cd99ad0

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ jobs:
2828
export CUDACXX=/usr/local/cuda-11.8/bin/nvcc
2929
# For Windows, install CUDA
3030
CIBW_BEFORE_ALL_WINDOWS: |
31+
cd src/deepwave
32+
nuget install intelopenmp.devel.win -DirectDownload -NonInteractive
33+
nuget install intelopenmp.redist.win -DirectDownload -NonInteractive
34+
cp intelopenmp.devel.win*/build/native/win-x64/libiomp5md.lib .
35+
cp intelopenmp.redist.win*/runtimes/win-x64/native/libiomp5md.dll .
3136
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
3237
chmod +x ./cuda_12.4.0_windows_network.exe
3338
./cuda_12.4.0_windows_network.exe -s nvcc_12.4 cudart_12.4

pyproject.toml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,6 @@ repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel} --exclude libcud
5454

5555
[tool.cibuildwheel.windows]
5656
test-command = "pytest {project}/tests/test_scalar.py"
57-
before-build = [
58-
"nuget install intelopenmp.devel.win -Version 2018.0.0 -DirectDownload -NonInteractive",
59-
"nuget install intelopenmp.redist.win -Version 2018.0.0 -DirectDownload -NonInteractive",
60-
"xcopy .\\intelopenmp.redist.win.2018.0.0\\runtimes\\win-x64\\native\\libiomp5md.dll src\\deepwave\\ /Y",
61-
"xcopy .\\intelopenmp.devel.win.2018.0.0\\build\\native\\lib\\x64\\libiomp5md.lib src\\deepwave\\ /Y",
62-
]
63-
environment = { CMAKE_ARGS = "-DOpenMP_ROOT={project}/intelopenmp.devel.win.2018.0.0" }
6457

6558
[tool.cibuildwheel.macos]
6659
test-command = "pytest {project}/tests/test_scalar.py"

0 commit comments

Comments
 (0)