Skip to content

Commit f77872a

Browse files
committed
Fix NanoVDB CI: nanovdb lite and on Windows: upgrade to CUDA 12.4 for Visual Studio 2022, allow use of unsecure node version, use node 16 in ax, build, docs, houdini, and weekly workflow.
Signed-off-by: apradhana <[email protected]>
1 parent 48dd8bf commit f77872a

File tree

7 files changed

+45
-9
lines changed

7 files changed

+45
-9
lines changed

.github/workflows/ax.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ jobs:
7474
- { image: '2021-clang10', cxx: 'g++', build: 'Release', cmake: '-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON' }
7575
fail-fast: false
7676
steps:
77+
- name: Enable Node 16
78+
run: |
79+
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
7780
- uses: actions/checkout@v3
7881
- name: pybind11
7982
#if: contains(matrix.config.image, '2023') == false

.github/workflows/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ jobs:
8686
- { cxx: g++, image: '2022-clang11', abi: '9', build: 'Release', cmake: '-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON' }
8787
fail-fast: false
8888
steps:
89+
- name: Enable Node 16
90+
run: |
91+
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
8992
- uses: actions/checkout@v3
9093
- name: pybind11
9194
#if: contains(matrix.config.image, '2023') == false

.github/workflows/docs.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ jobs:
4242
# need to re-write the python docs to use sphinx
4343
image: aswf/ci-openvdb:2022
4444
steps:
45+
- name: Enable Node 16
46+
run: |
47+
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
4548
- uses: actions/checkout@v3
4649
- name: install_doxygen
4750
run: ./ci/install_doxygen.sh 1_8_11
@@ -51,7 +54,10 @@ jobs:
5154
# - name: install_epydoc
5255
# run: pip install epydoc
5356
- name: install_latex
54-
run: yum -y install texlive-latex-bin texlive-dvips texlive-collection-fontsrecommended texlive-collection-latexrecommended
57+
run: |
58+
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
59+
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
60+
yum -y install texlive-latex-bin texlive-dvips texlive-collection-fontsrecommended texlive-collection-latexrecommended
5561
- name: build
5662
run: >
5763
./ci/build.sh -v

.github/workflows/houdini.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ jobs:
8383
steps:
8484
# See note on this step in the Houdini weekly.yml job
8585
# We can remove this when we no longer use < 2023 images
86+
- name: Enable Node 16
87+
run: |
88+
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
8689
- name: remove zstd
8790
run: yum -y remove zstd
8891
- uses: actions/checkout@v3

.github/workflows/nanovdb.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,14 @@ jobs:
6565
- { cxx: clang++, image: '2022-clang11', build: 'Debug' }
6666
fail-fast: false
6767
steps:
68+
- name: Enable Node 16
69+
run: |
70+
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
6871
- uses: actions/checkout@v3
6972
- name: install_cuda_11
7073
run: |
74+
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
75+
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
7176
yum -y install yum-utils
7277
yum-config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64/cuda-rhel7.repo
7378
echo "Installing cuda toolkit"
@@ -98,7 +103,7 @@ jobs:
98103
env:
99104
VCPKG_DEFAULT_TRIPLET: ${{ matrix.config.vc }}
100105
visual_studio: "Visual Studio 17 2022"
101-
cuda: "11.6.2"
106+
cuda: "12.4.0"
102107
strategy:
103108
matrix:
104109
config:
@@ -153,21 +158,21 @@ jobs:
153158
strategy:
154159
matrix:
155160
config:
156-
- { runner: 'macos-11', cxx: 'clang++', build: 'Release' }
157-
- { runner: 'macos-11', cxx: 'clang++', build: 'Debug' }
161+
- { runner: 'macos-12', cxx: 'clang++', build: 'Release' }
162+
- { runner: 'macos-12', cxx: 'clang++', build: 'Debug' }
158163
fail-fast: false
159164
steps:
160165
- uses: actions/checkout@v3
161166
- name: install_deps
162167
run: ./ci/install_macos.sh
163168
- name: build
164169
run: >
165-
./ci/build.sh -v
170+
sudo ./ci/build.sh -v
166171
--build-type=${{ matrix.config.build }}
167172
--components=core,nano,nanotest,nanoexam,nanobench,nanotool
168173
--cargs=\'-DUSE_EXPLICIT_INSTANTIATION=OFF -DNANOVDB_USE_CUDA=OFF -DNANOVDB_USE_OPENVDB=ON\'
169174
- name: test
170-
run: cd build && ctest -V -E ".*cuda.*"
175+
run: cd build && sudo ctest -V -E ".*cuda.*"
171176

172177
nanovdb-lite:
173178
if: |
@@ -186,6 +191,6 @@ jobs:
186191
cd nanovdb/nanovdb
187192
sudo mkdir .build
188193
cd .build
189-
sudo cmake -DUSE_EXPLICIT_INSTANTIATION=OFF -DNANOVDB_BUILD_UNITTESTS=ON ../
194+
sudo cmake -DUSE_EXPLICIT_INSTANTIATION=OFF -DNANOVDB_BUILD_UNITTESTS=ON -DNANOVDB_USE_OPENVDB=OFF -DNANOVDB_USE_CUDA=OFF ../
190195
sudo make -j8 install
191196
sudo ctest -V

.github/workflows/weekly.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ jobs:
7777
container:
7878
image: aswf/ci-base:2023
7979
steps:
80+
- name: Enable Node 16
81+
run: |
82+
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
8083
- uses: actions/checkout@v3
8184
# We bumped from the 2021 CI image to 2023 here to fix some OpenSSL issues
8285
# with the Houdini download script. In so doing we broke some of the caching
@@ -171,6 +174,9 @@ jobs:
171174
- { name: 'conf', build: 'Release', components: 'core,python,bin,view,render,test,axcore,axtest', cmake: '-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON' }
172175
fail-fast: false
173176
steps:
177+
- name: Enable Node 16
178+
run: |
179+
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
174180
- uses: actions/checkout@v3
175181
- name: pybind11
176182
#if: contains(container.image, '2023') == false
@@ -253,6 +259,9 @@ jobs:
253259
- { image: '2022-clang11', cxx: 'g++', build: 'Release', components: 'core', cmake: '' }
254260
fail-fast: false
255261
steps:
262+
- name: Enable Node 16
263+
run: |
264+
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
256265
- uses: actions/checkout@v3
257266
- name: pybind11
258267
#f: contains(matrix.config.image, '2023') == false
@@ -397,6 +406,9 @@ jobs:
397406
blosc: ['1.18.0','1.19.0','1.20.0','1.21.0']
398407
fail-fast: false
399408
steps:
409+
- name: Enable Node 16
410+
run: |
411+
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
400412
- uses: actions/checkout@v3
401413
- name: install_blosc
402414
run: sudo ./ci/install_blosc.sh ${{ matrix.blosc }}
@@ -423,6 +435,9 @@ jobs:
423435
# may not have this build type. See OpenVDBCXX.cmake
424436
CXXFLAGS: "-gdwarf-4 -g3 -ggdb -Og"
425437
steps:
438+
- name: Enable Node 16
439+
run: |
440+
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
426441
- uses: actions/checkout@v3
427442
with:
428443
fetch-depth: 0

ci/install_windows_cuda.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@ $CUDA_KNOWN_URLS = @{
2626
"11.2.1" = "https://developer.download.nvidia.com/compute/cuda/11.2.1/network_installers/cuda_11.2.1_win10_network.exe";
2727
"11.2.2" = "https://developer.download.nvidia.com/compute/cuda/11.2.2/network_installers/cuda_11.2.2_win10_network.exe";
2828
"11.3.0" = "https://developer.download.nvidia.com/compute/cuda/11.3.0/network_installers/cuda_11.3.0_win10_network.exe";
29-
"11.6.2" = "https://developer.download.nvidia.com/compute/cuda/11.6.2/network_installers/cuda_11.6.2_windows_network.exe"
29+
"11.6.2" = "https://developer.download.nvidia.com/compute/cuda/11.6.2/network_installers/cuda_11.6.2_windows_network.exe";
30+
"12.4.0" = "https://developer.download.nvidia.com/compute/cuda/12.4.0/network_installers/cuda_12.4.0_windows_network.exe"
3031
}
3132

3233
# @todo - change this to be based on _MSC_VER intead, or invert it to be CUDA keyed instead?
3334
$VISUAL_STUDIO_MIN_CUDA = @{
34-
"2022" = "11.6";
35+
"2022" = "12.4";
3536
"2019" = "10.1";
3637
"2017" = "10.0"; # Depends on which version of 2017! 9.0 to 10.0 depending on version
3738
"2015" = "8.0"; # might support older, unsure.

0 commit comments

Comments
 (0)