From bdf1ac1e4646be1905f3b4c1b9f79fd41006045e Mon Sep 17 00:00:00 2001
From: Dan Bailey <danbailey@ilm.com>
Date: Wed, 9 Oct 2024 10:17:02 -0700
Subject: [PATCH 1/3] Update NanoVDB to 2024 OS Image

Signed-off-by: Dan Bailey <danbailey@ilm.com>
---
 .github/workflows/nanovdb.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/nanovdb.yml b/.github/workflows/nanovdb.yml
index ed98499aaf..a85ad04e21 100644
--- a/.github/workflows/nanovdb.yml
+++ b/.github/workflows/nanovdb.yml
@@ -61,10 +61,10 @@ jobs:
     strategy:
       matrix:
         config:
-          - { 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' }
+          - { cxx: g++,     image: '2024', build: 'Release' }
+          - { cxx: g++,     image: '2024', build: 'Debug' }
+          - { cxx: clang++, image: '2024', build: 'Release' }
+          - { cxx: clang++, image: '2024', build: 'Debug' }
       fail-fast: false
     steps:
       - name: Enable Node 16

From 1a2e3377dbcb55d1bd83d1824b82ab7d3ce81670 Mon Sep 17 00:00:00 2001
From: Jonathan Swartz <jonathan@jswartz.info>
Date: Mon, 21 Oct 2024 16:15:00 +1300
Subject: [PATCH 2/3] Update CUDA paths

Signed-off-by: Jonathan Swartz <jonathan@jswartz.info>
---
 .github/workflows/nanovdb.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/nanovdb.yml b/.github/workflows/nanovdb.yml
index a85ad04e21..d95f722e41 100644
--- a/.github/workflows/nanovdb.yml
+++ b/.github/workflows/nanovdb.yml
@@ -72,18 +72,11 @@ jobs:
         run: |
           echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
       - uses: actions/checkout@v3
-      - name: install_cuda_11
+      - name: setup_cuda_12
         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 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-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
+          echo "/usr/local/cuda-12/bin" >> $GITHUB_PATH
+          echo "LD_LIBRARY_PATH=/usr/local/cuda-12/lib64:$LD_LIBRARY_PATH" >> $GITHUB_ENV
       - name: build
         run: >
           ./ci/build.sh -v

From 764638fa90f4b074f3d6cdac695c1cf7d3d69729 Mon Sep 17 00:00:00 2001
From: Jonathan Swartz <jonathan@jswartz.info>
Date: Tue, 22 Oct 2024 19:48:03 +1300
Subject: [PATCH 3/3] Added CMAKE_POSITION_INDEPENDENT_CODE flag to
 linux-nanovdb CI job to fix clang default behaviour change

Signed-off-by: Jonathan Swartz <jonathan@jswartz.info>
---
 .github/workflows/nanovdb.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/nanovdb.yml b/.github/workflows/nanovdb.yml
index d95f722e41..61b230450d 100644
--- a/.github/workflows/nanovdb.yml
+++ b/.github/workflows/nanovdb.yml
@@ -78,6 +78,8 @@ jobs:
           echo "/usr/local/cuda-12/bin" >> $GITHUB_PATH
           echo "LD_LIBRARY_PATH=/usr/local/cuda-12/lib64:$LD_LIBRARY_PATH" >> $GITHUB_ENV
       - name: build
+      # NOTE: CMAKE_POSITION_INDEPENDENT_CODE set to fix default behaviour change in clang 14
+      #   https://github.com/AcademySoftwareFoundation/aswf-docker/issues/228
         run: >
           ./ci/build.sh -v
           --build-type=${{ matrix.config.build }}
@@ -88,6 +90,7 @@ jobs:
           -DNANOVDB_USE_OPENVDB=ON
           -DCMAKE_INSTALL_PREFIX=`pwd`
           -DUSE_BLOSC=OFF
+          -DCMAKE_POSITION_INDEPENDENT_CODE=ON
           \'
       - name: test
         run: cd build && sudo ctest -V -E ".*cuda.*"