mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-10-05 01:49:02 +00:00
Merge topic 'anari_sdk_upgrade'
f4a781769 update baseline images ea6136ede better strategy for collecting incoming ANARI-SDK namespaces 383ec8399 update image name 24da5da20 update minimum ANARI-SDK version required Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3180
This commit is contained in:
commit
9d1c86c3c3
@ -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
|
||||
|
||||
|
@ -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 \
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:567eee6acf70a06c58d42afed6c1fa93761ae1a556846c5a9296ef9fd57f98f6
|
||||
size 306635
|
||||
oid sha256:99fffa4661fd02ef7efe416a95335da855691c8235074c242b57006c59a810db
|
||||
size 364656
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:69d625670cdbf38490b7ba2a72d18c5ac57387ca85d5e34d6008ba67d80395f7
|
||||
size 152115
|
||||
oid sha256:1e8cea0e74f405bd9d5b4e0f25fad786c06c6015f89380db1afc8f8b8d49c10d
|
||||
size 137092
|
||||
|
@ -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
|
||||
|
@ -17,15 +17,19 @@
|
||||
#include <anari/anari_cpp.hpp>
|
||||
#include <anari/anari_cpp/ext/linalg.h>
|
||||
|
||||
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.
|
||||
|
Loading…
Reference in New Issue
Block a user