diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2aa9d9a27..f39abf86e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,7 +65,7 @@ - .docker_image .ubuntu2004_kokkos: &ubuntu2004_kokkos - image: "kitware/vtkm:ci-ubuntu2004_kokkos-20230906" + image: "kitware/vtkm:ci-ubuntu2004_kokkos-20240119" extends: - .docker_image diff --git a/.gitlab/ci/docker/ubuntu2004/kokkos/Dockerfile b/.gitlab/ci/docker/ubuntu2004/kokkos/Dockerfile index 1c6681a90..1f8dca7db 100644 --- a/.gitlab/ci/docker/ubuntu2004/kokkos/Dockerfile +++ b/.gitlab/ci/docker/ubuntu2004/kokkos/Dockerfile @@ -57,7 +57,7 @@ RUN mkdir -p /opt/kokkos/build && \ # Build and install ANARI SDK WORKDIR /opt/anari/src -ARG ANARI_VERSION=0.7.1 +ARG ANARI_VERSION=0.8.0 RUN curl -L https://github.com/KhronosGroup/ANARI-SDK/archive/refs/tags/v$ANARI_VERSION.tar.gz | tar xzv && \ cmake -GNinja \ -S ANARI-SDK-$ANARI_VERSION \ diff --git a/data/baseline/interop/anari/scene.png b/data/baseline/interop/anari/scene.png index 2179c03c1..5060da48d 100644 --- a/data/baseline/interop/anari/scene.png +++ b/data/baseline/interop/anari/scene.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:567eee6acf70a06c58d42afed6c1fa93761ae1a556846c5a9296ef9fd57f98f6 -size 306635 +oid sha256:99fffa4661fd02ef7efe416a95335da855691c8235074c242b57006c59a810db +size 364656 diff --git a/data/baseline/interop/anari/volume.png b/data/baseline/interop/anari/volume.png index ff40cb7e9..70a4888c3 100644 --- a/data/baseline/interop/anari/volume.png +++ b/data/baseline/interop/anari/volume.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69d625670cdbf38490b7ba2a72d18c5ac57387ca85d5e34d6008ba67d80395f7 -size 152115 +oid sha256:1e8cea0e74f405bd9d5b4e0f25fad786c06c6015f89380db1afc8f8b8d49c10d +size 137092 diff --git a/vtkm/interop/anari/CMakeLists.txt b/vtkm/interop/anari/CMakeLists.txt index 5cb2a8696..6a933d05d 100644 --- a/vtkm/interop/anari/CMakeLists.txt +++ b/vtkm/interop/anari/CMakeLists.txt @@ -8,7 +8,7 @@ ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -find_package(anari 0.7.0 REQUIRED) +find_package(anari 0.8.0 REQUIRED) set(headers ANARIActor.h diff --git a/vtkm/interop/anari/VtkmANARITypes.h b/vtkm/interop/anari/VtkmANARITypes.h index 375471322..66557b0ba 100644 --- a/vtkm/interop/anari/VtkmANARITypes.h +++ b/vtkm/interop/anari/VtkmANARITypes.h @@ -17,15 +17,19 @@ #include #include -namespace anari_cpp = ::anari; +namespace anari_cpp +{ + +/// Put everything from the ANARI-SDK in a single namespace to de-clutter things + +using namespace ::anari; +using namespace ::anari::math; + +} // namespace anari_cpp namespace anari { -#if ANARI_SDK_VERSION_MINOR >= 8 -using namespace ::anari::math; -#endif - /// These declarations let ANARI C++ bindings infer the correct `ANARIDataType` /// enum value from VTK-m's C++ math types. This header should be included /// before any code which needs this type inference to function.