Skip to content

Commit 08142cb

Browse files
committed
Upgrade CUDA version in Windows CI
1 parent 653d38c commit 08142cb

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

.github/workflows/windows.yml

+17-13
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,20 @@ jobs:
9696
uses: actions/setup-python@v5
9797
with:
9898
python-version: 3.8
99+
100+
- name: Checkout Open3D-ML
101+
uses: actions/checkout@v4
102+
with:
103+
repository: isl-org/Open3D-ML
104+
path: open3d_ml
105+
106+
- name: Install PyTorch requirements
107+
run: |
108+
if (${{ matrix.BUILD_CUDA_MODULE == 'ON' }}) {
109+
python -m pip install -r open3d_ml/requirements-torch-cuda.txt
110+
} else {
111+
python -m pip install -r open3d_ml/requirements-torch.txt
112+
}
99113
100114
- name: Config
101115
# Move build directory to C: https://github.com/actions/virtual-environments/issues/1341
@@ -119,6 +133,7 @@ jobs:
119133
-DBUILD_WEBRTC=${{ env.BUILD_WEBRTC }} `
120134
-DBUILD_UNIT_TESTS=ON `
121135
-DBUILD_CUDA_MODULE=${{ matrix.BUILD_CUDA_MODULE }} `
136+
-DBUILD_PYTORCH_OPS=ON `
122137
${{ env.SRC_DIR }}
123138
124139
- name: Build
@@ -202,7 +217,7 @@ jobs:
202217
$ErrorActionPreference = 'Stop'
203218
mkdir build
204219
cd build
205-
cmake -G "Visual Studio 16 2019" -A x64 `
220+
cmake -G "Visual Studio 17 2022" -A x64 `
206221
-DCMAKE_INSTALL_PREFIX="C:\Program Files\Open3D" `
207222
-DSTATIC_WINDOWS_RUNTIME=${{ matrix.STATIC_RUNTIME }} `
208223
..
@@ -214,7 +229,7 @@ jobs:
214229
run: |
215230
$ErrorActionPreference = 'Stop'
216231
python -m pip install -U pip==${{ env.PIP_VER }}
217-
python -m pip install -U -c python/requirements_build.txt wheel setuptools
232+
python -m pip install -U -r python/requirements_build.txt
218233
- name: Install Python package
219234
working-directory: ${{ env.BUILD_DIR }}
220235
run: |
@@ -274,16 +289,6 @@ jobs:
274289
python -m pip install maturin==1.7.8
275290
python -m pip install -r python/requirements.txt
276291
python -m pip install -r python/requirements_jupyter_build.txt
277-
278-
- name: Checkout Open3D-ML
279-
uses: actions/checkout@v4
280-
with:
281-
repository: isl-org/Open3D-ML
282-
path: open3d_ml
283-
284-
- name: Install PyTorch requirements
285-
run: |
286-
python -m pip install -r open3d_ml/requirements-torch.txt
287292
288293
- name: Config
289294
run: |
@@ -304,7 +309,6 @@ jobs:
304309
-DBUILD_LIBREALSENSE=ON `
305310
-DBUILD_WEBRTC=ON `
306311
-DBUILD_JUPYTER_EXTENSION=ON `
307-
-DBUILD_PYTORCH_OPS=ON `
308312
${{ env.SRC_DIR }}
309313
310314
- name: Install Open3D python build requirements

CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ if(BUILD_CUDA_MODULE)
395395
# https://forums.developer.nvidia.com/t/problems-with-latest-vs2022-update/294150/12
396396
if (MSVC AND MSVC_VERSION VERSION_LESS_EQUAL "1949")
397397
# Set this before any CUDA checks
398+
add_compile_definitions(_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH)
398399
set(CMAKE_CUDA_FLAGS "--allow-unsupported-compiler" CACHE STRING "Additional flags for nvcc" FORCE)
399400
message(WARNING "Using --allow-unsupported-compiler flag for nvcc with MSVC 2022. "
400401
"Set $Env:NVCC_PREPEND_FLAGS='--allow-unsupported-compiler' if nvcc still fails.")

0 commit comments

Comments
 (0)