Sync in 11.0 by Merge tag 'v11.0.0'

sideeffects · Apr 3, 2024 · 1ad2266 · 1ad2266
2 parents d842370 + 6c044e6
commit 1ad2266
Show file tree

Hide file tree

Showing 153 changed files with 23,605 additions and 13,563 deletions.
diff --git a/.github/workflows/ax.yml b/.github/workflows/ax.yml
@@ -43,6 +43,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   linux-ax:
     if: |
@@ -63,7 +67,7 @@ jobs:
         config:
           - { image: '2023-clang15', cxx: 'clang++', build: 'Release', cmake: '' }
           - { image: '2023-clang15', cxx: 'g++',     build: 'Release', cmake: '' }
-          - { image: '2022-clang11', cxx: 'clang++', build: 'Debug',   cmake: '' }
+          - { image: '2023-clang15', cxx: 'clang++', build: 'Debug',   cmake: '' }
           - { image: '2022-clang11', cxx: 'clang++', build: 'Release', cmake: '' }
           - { image: '2022-clang11', cxx: 'g++',     build: 'Release', cmake: '' }
           - { image: '2021-clang10', cxx: 'clang++', build: 'Release', cmake: '-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON' }
@@ -76,13 +80,12 @@ jobs:
         run: ./ci/install_pybind11.sh 2.10.0
       - name: timestamp
         id: timestamp
-        shell: bash
-        run: echo "::set-output name=timestamp::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+        run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
       - name: ccache
         # don't use ccache for debug builds
         if: matrix.config.build == 'Release'
         id: ccache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/ccache
           key: linux-ax${{ matrix.config.image }}-${{ matrix.config.cxx }}-${{ steps.timestamp.outputs.timestamp }}
@@ -105,7 +108,6 @@ jobs:
       # Keep ccache light by stripping out any caches not accessed in the last day
       - name: ccache_clean
         if: matrix.config.build == 'Release'
-        shell: bash
         run: ccache --evict-older-than 1d
 
   macos-ax:
@@ -121,14 +123,14 @@ jobs:
       matrix:
         config:
           #@note llvm10 never got its own brew formula...
-          - { runner: 'macos-11', cxx: 'clang++', build: 'Release', llvm: '11' }
-          - { runner: 'macos-11', cxx: 'clang++', build: 'Release', llvm: '12' }
-          - { runner: 'macos-11', cxx: 'clang++', build: 'Release', llvm: '13' }
+          - { runner: 'macos-latest', cxx: 'clang++', build: 'Release', llvm: '11' }
+          - { runner: 'macos-latest', cxx: 'clang++', build: 'Release', llvm: '12' }
+          - { runner: 'macos-latest', cxx: 'clang++', build: 'Release', llvm: '13' }
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
       - name: install_deps
-        run: ./ci/install_macos_ax.sh ${{ matrix.config.llvm }}
+        run: ./ci/install_macos.sh ${{ matrix.config.llvm }}
       - name: build
         run: >
           ./ci/build.sh -v

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -77,15 +77,13 @@ jobs:
           # @note  we specifically use clang15.0 (not clang15) here as the newest
           #  versions of the clang15.X containers have some issues with the GLFW
           #  installation
-          - { cxx: clang++, image: '2023-clang15.0', abi: '10', build: 'Release', cmake: '' }
-          - { cxx: g++,     image: '2023-clang15.0', abi: '10', build: 'Release', cmake: '' }
+          - { cxx: clang++, image: '2023-clang15.0', abi: '11', build: 'Release', cmake: '' }
+          - { cxx: g++,     image: '2023-clang15.0', abi: '11', build: 'Release', cmake: '' }
+          - { cxx: clang++, image: '2022-clang11',   abi: '11', build: 'Debug',   cmake: '' }
           - { cxx: clang++, image: '2022-clang11',   abi: '10', build: 'Release', cmake: '' }
-          - { cxx: clang++, image: '2022-clang11',   abi: '10', build: 'Debug'  , cmake: '' }
           - { cxx: g++,     image: '2022-clang11',   abi: '10', build: 'Release', cmake: '' }
-          - { cxx: clang++, image: '2022-clang11',   abi: '9',  build: 'Release', cmake: '' }
-          - { cxx: g++,     image: '2022-clang11',   abi: '9',  build: 'Release', cmake: '' }
-          - { cxx: clang++, image: '2021',           abi: '8',  build: 'Release', cmake: '-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON' }
-          - { cxx: g++,     image: '2021',           abi: '8',  build: 'Release', cmake: '-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON' }
+          - { cxx: clang++, image: '2022-clang11',   abi: '9',  build: 'Release', cmake: '-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON' }
+          - { cxx: g++,     image: '2022-clang11',   abi: '9',  build: 'Release', cmake: '-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON' }
       fail-fast: false
     steps:
     - uses: actions/checkout@v3
@@ -94,12 +92,12 @@ jobs:
       run: ./ci/install_pybind11.sh 2.10.0
     - name: timestamp
       id: timestamp
-      run: echo "::set-output name=timestamp::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
     - name: ccache
       # don't use ccache for debug builds
       if: matrix.config.build == 'Release'
       id: ccache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: /tmp/ccache
         key: linux-vfx${{ matrix.config.image }}-abi${{ matrix.config.abi }}-${{ matrix.config.cxx }}-${{ steps.timestamp.outputs.timestamp }}
@@ -188,24 +186,17 @@ jobs:
       github.event_name != 'workflow_dispatch' ||
       github.event.inputs.type == 'all' ||
       github.event.inputs.type == 'mac'
-    runs-on: macos-11
+    runs-on: macos-latest
     env:
       CXX: clang++
     steps:
     - uses: actions/checkout@v3
     - name: install
-      # brew boost-python3 installs a "Keg-only" version of python which is
-      # not installed to PATH. We must manually provide the location of the
-      # required python installation to CMake through a hint variable which
-      # is exported in install_macos.sh
       run: ./ci/install_macos.sh
     - name: build
-      # Also need to disable compiler warnings for ABI 6 and above due to
-      # the version of clang installed
       run: >
         ./ci/build.sh -v
         --build-type=Release
         --components=\"core,python,bin,view,render,test\"
-        --cargs=\"-DOPENVDB_CXX_STRICT=OFF -DOPENVDB_ABI_VERSION_NUMBER=10 -DOPENVDB_SIMD=SSE42\"
     - name: test
       run: cd build && ctest -V
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -105,13 +105,11 @@ jobs:
       github.event.inputs.deploy == 'coverage'
     runs-on: ubuntu-latest
     container:
-      image: aswf/ci-openvdb:2022
+      image: aswf/ci-openvdb:2023
     env:
       CXX: g++
     steps:
     - uses: actions/checkout@v3
-    - name: install_gtest
-      run: ./ci/install_gtest.sh 1.10.0
     - name: install_gcovr
       run: pip install gcovr
     - name: build

diff --git a/.github/workflows/houdini.yml b/.github/workflows/houdini.yml
@@ -36,6 +36,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   checksecret:
     # Check that valid github secrets have been set. This isn't needed to retrieve
@@ -49,7 +53,7 @@ jobs:
         env:
             HOUDINI_CLIENT_ID: ${{ secrets.HOUDINI_CLIENT_ID }}
             HOUDINI_SECRET_KEY: ${{ secrets.HOUDINI_SECRET_KEY }}
-        run: echo "::set-output name=HOUDINI_SECRETS::${{ env.HOUDINI_CLIENT_ID != '' && env.HOUDINI_SECRET_KEY != '' }}"
+        run: echo "HOUDINI_SECRETS=${{ env.HOUDINI_CLIENT_ID != '' && env.HOUDINI_SECRET_KEY != '' }}" >> $GITHUB_OUTPUT
       - name: Skip Next Jobs
         if: steps.check.outputs.HOUDINI_SECRETS != 'true'
         run: echo "HOUDINI_CLIENT_ID and HOUDINI_SECRET_KEY GitHub Action Secrets needs to be set to install Houdini builds"
@@ -69,11 +73,10 @@ jobs:
     strategy:
       matrix:
         config:
-          - { cxx: clang++, image: '2021', hou: '19_5', j: '8', build: 'Release', components: 'core,hou,bin,view,render,python,test,axcore,axbin,axtest', disable_checks: 'OFF' }
-          # Houdini 19 is technically on VFX 2020, but we need 2021 dependencies for VDB 10
-          - { cxx: clang++, image: '2021', hou: '19_0', j: '8', build: 'Release', components: 'core,hou,bin,view,render,python,test,axcore,axbin,axtest', disable_checks: 'ON' }
-          - { cxx: clang++, image: '2021', hou: '19_5', j: '8', build: 'Debug',   components: 'core,hou', disable_checks: 'OFF' }
-          - { cxx: g++,     image: '2021', hou: '19_5', j: '8', build: 'Release', components: 'core,hou', disable_checks: 'OFF' }
+          #- { cxx: clang++, image: '2022', hou: '20_0', build: 'Release', components: 'core,hou,bin,view,render,python,test,axcore,axbin,axtest' }
+          - { cxx: clang++, image: '2021', hou: '19_5', build: 'Release', components: 'core,hou,bin,view,render,python,test,axcore,axbin,axtest' }
+          #- { cxx: clang++, image: '2022', hou: '20_0', build: 'Debug',   components: 'core,hou' }
+          #- { cxx: g++,     image: '2022', hou: '20_0', build: 'Release', components: 'core,hou' }
       fail-fast: false
     steps:
     - uses: actions/checkout@v3
@@ -82,19 +85,18 @@ jobs:
       run: ./ci/install_pybind11.sh 2.10.0
     - name: timestamp
       id: timestamp
-      shell: bash
-      run: echo "::set-output name=timestamp::`date -u +'%Y-%m-%dT%H:%M:%SZ'`"
+      run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
     - name: ccache
       # don't use ccache for debug builds
       if: matrix.config.build == 'Release'
       id: ccache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: /tmp/ccache
         key: linux-vfx-hou${{ matrix.config.hou }}-${{ matrix.config.image }}-${{ matrix.config.cxx }}-${{ steps.timestamp.outputs.timestamp }}
         restore-keys: linux-vfx-hou${{ matrix.config.hou }}-${{ matrix.config.image }}-${{ matrix.config.cxx }}-
     - name: fetch_houdini
-      uses: actions/cache@v2
+      uses: actions/cache/restore@v3
       with:
         path: hou
         key: dummy-houdini${{ matrix.config.hou }}-${{ steps.timestamp.outputs.timestamp }}
@@ -110,7 +112,6 @@ jobs:
         cp hou/hou.tar.gz $HOME/houdini_install/hou.tar.gz
         cd $HOME/houdini_install && tar -xzf hou.tar.gz && cd -
     - name: build
-      shell: bash
       run: |
         export HFS="$HOME/houdini_install/hou"
         export HDSO="${HFS}/dsolib"
@@ -121,7 +122,6 @@ jobs:
     # Keep ccache light by stripping out any caches not accessed in the last day
     - name: ccache_clean
       if: matrix.config.build == 'Release'
-      shell: bash
       run: ccache --evict-older-than 1d
       # Delete the houdini tarball so that this dummy cache occupies no space
     - name: delete_hou

diff --git a/.github/workflows/nanovdb.yml b/.github/workflows/nanovdb.yml
@@ -53,16 +53,16 @@ jobs:
     name: >
       linux-nanovdb:cxx:${{ matrix.config.cxx }}-${{ matrix.config.build }}
     container:
-      image: aswf/ci-base:2022
+      image: aswf/ci-openvdb:${{ matrix.config.image }}
     env:
       CXX: ${{ matrix.config.cxx }}
     strategy:
       matrix:
         config:
-          - { cxx: g++,     build: 'Release' }
-          - { cxx: g++,     build: 'Debug' }
-          - { cxx: clang++, build: 'Release' }
-          - { cxx: clang++, build: 'Debug' }
+          - { cxx: g++,     image: '2022-clang11', build: 'Release' }
+          - { cxx: g++,     image: '2022-clang11', build: 'Debug' }
+          - { cxx: clang++, image: '2022-clang11', build: 'Release' }
+          - { cxx: clang++, image: '2022-clang11', build: 'Debug' }
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
@@ -71,9 +71,9 @@ jobs:
           yum -y install yum-utils
           yum-config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64/cuda-rhel7.repo
           echo "Installing cuda toolkit"
-          yum --enablerepo=epel -y install cuda-toolkit-11-0
-          echo "/usr/local/cuda-11.0/bin" >> $GITHUB_PATH
-          echo "LD_LIBRARY_PATH=/usr/local/cuda-11.0/lib64:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+          yum --enablerepo=epel -y install cuda-toolkit-11-6
+          echo "/usr/local/cuda-11.6/bin" >> $GITHUB_PATH
+          echo "LD_LIBRARY_PATH=/usr/local/cuda-11.6/lib64:$LD_LIBRARY_PATH" >> $GITHUB_ENV
       - name: build
         run: >
           ./ci/build.sh -v
@@ -87,7 +87,7 @@ jobs:
           -DUSE_BLOSC=OFF
           \'
       - name: test
-        run: cd build && sudo ctest -V
+        run: cd build && sudo ctest -V -E ".*cuda.*"
 
   windows-nanovdb:
     if: |
@@ -105,8 +105,8 @@ jobs:
           # static build of blosc from vcpkg does not build internal sources.
           # USE_STATIC_DEPENDENCIES is required for IlmBase/OpenEXR defines and
           # Boost as both shared and static libs are installed.
-          - { 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' }
-          - { 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' }
+          - { 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' }
+          - { 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' }
           - { vc: 'x64-windows',        build: 'Release', cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_STATIC=OFF' }
           - { vc: 'x64-windows',        build: 'Debug',   cmake: '-A x64 -G \"Visual Studio 17 2022\" -DOPENVDB_CORE_STATIC=OFF' }
       fail-fast: false
@@ -142,7 +142,7 @@ jobs:
         \'
     - name: test
       shell: bash
-      run: cd build && ctest -V
+      run: cd build && ctest -V -E ".*cuda.*"
 
   macos-nanovdb:
     if: |
@@ -169,7 +169,7 @@ jobs:
           --components=core,nano,nanotest,nanoexam,nanobench,nanotool
           --cargs=\'-DUSE_EXPLICIT_INSTANTIATION=OFF -DNANOVDB_USE_CUDA=OFF -DNANOVDB_USE_OPENVDB=ON\'
       - name: test
-        run: cd build && ctest -V
+        run: cd build && ctest -V -E ".*cuda.*"
 
   nanovdb-lite:
     if: |