Merge branch 'improve_vdb_tool' of https://github.com/kmuseth/openvdb …

…into improve_vdb_tool

.github/workflows/ax.yml

@@ -77,9 +77,7 @@ jobs:
         #if: contains(matrix.config.image, '2023') == false
         run: ./ci/install_nanobind.sh 2.0.0
       - name: install_gtest
-        run: |
-          sudo apt-get update
-          sudo apt-get -q install -y libgtest-dev
+        run: ./ci/install_gtest.sh 1.15.2
       - name: timestamp
         id: timestamp
         run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT

.github/workflows/build.yml

@@ -90,9 +90,7 @@ jobs:
       if: contains(matrix.config.image, '2023') == true
       run: ./ci/install_glfw.sh 3.3.10
     - name: install_gtest
-      run: |
-        sudo apt-get update
-        sudo apt-get -q install -y libgtest-dev
+      run: ./ci/install_gtest.sh 1.15.2
     - name: timestamp
       id: timestamp
       run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT

.github/workflows/docs.yml

@@ -40,12 +40,9 @@ jobs:
     container:
       # @note We can't update this as epydoc doesn't support python3. We'll
       # need to re-write the python docs to use sphinx
-      image: aswf/ci-openvdb:2022
+      image: aswf/ci-openvdb:2024
     steps:
-    - name: Enable Node 16
-      run: |
-        echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install_doxygen
       run: ./ci/install_doxygen.sh 1_8_11
     - name: nanobind
@@ -55,10 +52,6 @@ jobs:
     #   run: pip install epydoc
     - name: install_latex
       run: |
-        # Fix error: Cannot prepare internal mirrorlist: No URLs in mirrorlist. CentOS 8 reached EOL means need to replace the official mirror to vault.centos.org
-        # Comment out mirrorlist and replace #baseurl=...mirror.centos.org with baseurl=...vault.centos.org in files starting with CentOS- in /etc/yum.repos.d folder
-        sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
-        sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
         yum -y install texlive-latex-bin texlive-dvips texlive-collection-fontsrecommended texlive-collection-latexrecommended
     - name: build
       run: >

.github/workflows/houdini.yml

@@ -94,9 +94,7 @@ jobs:
     - name: cppunit
       run: ./ci/install_cppunit.sh 1.15.1
     - name: install_gtest
-      run: |
-        sudo apt-get update
-        sudo apt-get -q install -y libgtest-dev
+      run: ./ci/install_gtest.sh 1.15.2
     - name: timestamp
       id: timestamp
       run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT

.github/workflows/nanovdb.yml

@@ -170,12 +170,12 @@ jobs:
       github.event.inputs.type == 'all' ||
       github.event.inputs.type == 'linux'
     runs-on: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-20.04-8c-32g-300h') || 'ubuntu-latest' }}
+    container:
+      image: aswf/ci-openvdb:2024
     steps:
       - uses: actions/checkout@v3
       - name: install_gtest
-        run: |
-          sudo apt-get update
-          sudo apt-get -q install -y libgtest-dev
+        run: ./ci/install_gtest.sh 1.15.2
       - name: build_and_test
         run: |
           cd nanovdb/nanovdb

ci/install_gtest.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -ex
+
+GTEST_VERSION="$1"
+
+
+git clone https://github.com/google/googletest.git -b v${GTEST_VERSION}
+cd googletest
+mkdir build
+cd build
+cmake ..
+
+make -j$(nproc)
+
+sudo make install

nanovdb/nanovdb/unittest/TestNanoVDB.cc

@@ -4,6 +4,7 @@
 // Uncomment to temporarily disable testing of PNanoVDB
 //#define DISABLE_PNANOVDB
 
+#include <iomanip>
 #include <iostream>
 #include <cstdlib>
 #include <sstream> // for std::stringstream