From 24da5da20235aecc5a4ff5eb8ff2194e7920a413 Mon Sep 17 00:00:00 2001 From: Jefferson Amstutz Date: Wed, 17 Jan 2024 09:58:14 -0600 Subject: [PATCH] update minimum ANARI-SDK version required --- .gitlab/ci/docker/ubuntu2004/kokkos/Dockerfile | 2 +- vtkm/interop/anari/CMakeLists.txt | 2 +- vtkm/interop/anari/VtkmANARITypes.h | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) 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/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..2070589ca 100644 --- a/vtkm/interop/anari/VtkmANARITypes.h +++ b/vtkm/interop/anari/VtkmANARITypes.h @@ -22,10 +22,6 @@ namespace anari_cpp = ::anari; 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.