Skip to content

Commit e0479ce

Browse files
authored
Merge pull request #1695 from apradhana/vdb11_nanovdb_ci
Prepare NanoVDB CI for the massive NanoVDB update for VDB11.
2 parents b38c916 + e36bedb commit e0479ce

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.github/workflows/nanovdb.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ jobs:
5353
name: >
5454
linux-nanovdb:cxx:${{ matrix.config.cxx }}-${{ matrix.config.build }}
5555
container:
56-
image: aswf/ci-base:2022
56+
image: aswf/ci-openvdb:${{ matrix.config.image }}
5757
env:
5858
CXX: ${{ matrix.config.cxx }}
5959
strategy:
6060
matrix:
6161
config:
62-
- { cxx: g++, build: 'Release' }
63-
- { cxx: g++, build: 'Debug' }
64-
- { cxx: clang++, build: 'Release' }
65-
- { cxx: clang++, build: 'Debug' }
62+
- { cxx: g++, image: '2022-clang11', build: 'Release' }
63+
- { cxx: g++, image: '2022-clang11', build: 'Debug' }
64+
- { cxx: clang++, image: '2022-clang11', build: 'Release' }
65+
- { cxx: clang++, image: '2022-clang11', build: 'Debug' }
6666
fail-fast: false
6767
steps:
6868
- uses: actions/checkout@v3
@@ -71,9 +71,9 @@ jobs:
7171
yum -y install yum-utils
7272
yum-config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64/cuda-rhel7.repo
7373
echo "Installing cuda toolkit"
74-
yum --enablerepo=epel -y install cuda-toolkit-11-0
75-
echo "/usr/local/cuda-11.0/bin" >> $GITHUB_PATH
76-
echo "LD_LIBRARY_PATH=/usr/local/cuda-11.0/lib64:$LD_LIBRARY_PATH" >> $GITHUB_ENV
74+
yum --enablerepo=epel -y install cuda-toolkit-11-6
75+
echo "/usr/local/cuda-11.6/bin" >> $GITHUB_PATH
76+
echo "LD_LIBRARY_PATH=/usr/local/cuda-11.6/lib64:$LD_LIBRARY_PATH" >> $GITHUB_ENV
7777
- name: build
7878
run: >
7979
./ci/build.sh -v
@@ -87,7 +87,7 @@ jobs:
8787
-DUSE_BLOSC=OFF
8888
\'
8989
- name: test
90-
run: cd build && sudo ctest -V
90+
run: cd build && sudo ctest -V -E ".*cuda.*"
9191

9292
windows-nanovdb:
9393
if: |
@@ -105,8 +105,8 @@ jobs:
105105
# static build of blosc from vcpkg does not build internal sources.
106106
# USE_STATIC_DEPENDENCIES is required for IlmBase/OpenEXR defines and
107107
# Boost as both shared and static libs are installed.
108-
- { vc: 'x64-windows-static', build: 'Release', cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_SHARED=OFF -DUSE_STATIC_DEPENDENCIES=ON -DBLOSC_USE_EXTERNAL_SOURCES=ON' }
109-
- { vc: 'x64-windows-static', build: 'Debug', cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_SHARED=OFF -DUSE_STATIC_DEPENDENCIES=ON -DBLOSC_USE_EXTERNAL_SOURCES=ON' }
108+
- { vc: 'x64-windows-static', build: 'Release', cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_SHARED=OFF -DUSE_STATIC_DEPENDENCIES=ON -DBLOSC_USE_EXTERNAL_SOURCES=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded' }
109+
- { vc: 'x64-windows-static', build: 'Debug', cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_SHARED=OFF -DUSE_STATIC_DEPENDENCIES=ON -DBLOSC_USE_EXTERNAL_SOURCES=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug' }
110110
- { vc: 'x64-windows', build: 'Release', cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_STATIC=OFF' }
111111
- { vc: 'x64-windows', build: 'Debug', cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_STATIC=OFF' }
112112
fail-fast: false
@@ -142,7 +142,7 @@ jobs:
142142
\'
143143
- name: test
144144
shell: bash
145-
run: cd build && ctest -V
145+
run: cd build && ctest -V -E ".*cuda.*"
146146

147147
macos-nanovdb:
148148
if: |
@@ -169,7 +169,7 @@ jobs:
169169
--components=core,nano,nanotest,nanoexam,nanobench,nanotool
170170
--cargs=\'-DUSE_EXPLICIT_INSTANTIATION=OFF -DNANOVDB_USE_CUDA=OFF -DNANOVDB_USE_OPENVDB=ON\'
171171
- name: test
172-
run: cd build && ctest -V
172+
run: cd build && ctest -V -E ".*cuda.*"
173173

174174
nanovdb-lite:
175175
if: |

0 commit comments

Comments
 (0)