Skip to content

Commit 3f978c4

Browse files
committed
Merge branch 'next_release'
2 parents bf461bb + b0e1ce3 commit 3f978c4

File tree

166 files changed

+6904
-8966
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+6904
-8966
lines changed

.github/actions/configure_and_build/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ runs:
2323
shell: ${{ inputs.shell }}
2424
run: >
2525
cmake -LA -B ${{ inputs.workspace }}/build
26+
-DBUILD_CAT=OFF
2627
-DBUILD_CTS=ON
2728
-DBUILD_EXAMPLES=ON
2829
-DBUILD_HDANARI=OFF

CMakeLists.txt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
2929
## Establish project
3030

3131
set(ANARI_SDK_VERSION_MAJOR 0)
32-
set(ANARI_SDK_VERSION_MINOR 13)
33-
set(ANARI_SDK_VERSION_PATCH 1)
32+
set(ANARI_SDK_VERSION_MINOR 14)
33+
set(ANARI_SDK_VERSION_PATCH 0)
3434
set(ANARI_SDK_VERSION
3535
${ANARI_SDK_VERSION_MAJOR}.${ANARI_SDK_VERSION_MINOR}.${ANARI_SDK_VERSION_PATCH}
3636
)
@@ -63,19 +63,27 @@ option(BUILD_SHARED_LIBS "Build shared libraries instead of static" ON)
6363

6464
option(BUILD_CTS "Build cts toolkit" OFF)
6565
cmake_dependent_option(CTS_ENABLE_GLTF "Enable glTF support for cts" ON "BUILD_CTS" OFF)
66+
option(BUILD_CAT "Build capability analysis tool" OFF)
6667
option(USE_DRACO "Use draco when loading glTF files" OFF)
6768
option(USE_WEBP "Use webp when loading glTF files" OFF)
6869
option(USE_KTX "Use ktx when loading glTF files" OFF)
70+
option(USE_KOKKOS "Use Kokkos to accelerate scene build and updates" OFF)
6971
option(BUILD_EXAMPLES "Build example applications and example device" ON)
7072
cmake_dependent_option(BUILD_VIEWER
7173
"Build interactive viewer app (requires GLFW)"
7274
OFF
7375
"BUILD_EXAMPLES"
7476
OFF
7577
)
78+
if (BUILD_CAT)
79+
# CAT requires anari::anari_viewer library
80+
set(BUILD_VIEWER ON CACHE BOOL "Build interactive viewer app (requires GLFW)" FORCE)
81+
endif ()
7682
option(INSTALL_CTS "Install CTS scripts and data" OFF)
7783
option(INSTALL_VIEWER_LIBRARY "Install anari::anari_viewer library target" ON)
7884
option(INSTALL_VIEWER "Install anariViewer app" OFF)
85+
option(INSTALL_CAT "Install anariCat app" OFF)
86+
mark_as_advanced(INSTALL_CAT)
7987
mark_as_advanced(INSTALL_VIEWER)
8088
cmake_dependent_option(VIEWER_ENABLE_GLTF
8189
"Enable glTF support in viewer"
@@ -111,6 +119,10 @@ if (BUILD_CTS)
111119
add_subdirectory(cts)
112120
endif()
113121

122+
if (BUILD_CAT)
123+
add_subdirectory(cat)
124+
endif ()
125+
114126
include(cmake/mark_cache_variables_as_advanced.cmake)
115127

116128
## Configure CMake find_package() config files ##

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@ Using a tool like `ccmake` or `cmake-gui` will let you see which options are
5151
available to enable. The following CMake options are offered:
5252

5353
- `BUILD_SHARED_LIBS` : build everything as shared libraries or static libraries
54+
- `BUILD_CAT` : build the capability analysis tool
5455
- `BUILD_CTS` : build the conformance test suite
5556
- `BUILD_TESTING` : build unit and regression test binaries
5657
- `BUILD_HELIDE_DEVICE` : build the provided example `helide` device implementation
5758
- `BUILD_REMOTE_DEVICE` : build the provided experimental `remote` device implementation
5859
- `BUILD_EXAMPLES` : build example applications
59-
- `BUILD_VIEWER` : build viewer too (needs glfw3) if building examples
60+
- `BUILD_VIEWER` : build viewer too (needs SDL3) if building examples
6061
- `BUILD_HDANARI` : build (experimental) OpenUSD Hydra delegate plugin
6162

6263
Once built, the library can be installed via the `install` target created by
@@ -181,8 +182,8 @@ variables:
181182
### (Unofficial) list of available ANARI implementations
182183

183184
- [AMD RadeonProRender](https://github.com/GPUOpen-LibrariesAndSDKs/RadeonProRenderANARI)
184-
- [Barney](https://github.com/ingowald/barney) (experimental MPI distributed renderer)
185-
- [Cycles](https://github.com/jeffamstutz/cycles)
185+
- [Barney](https://github.com/ingowald/barney) (MPI distributed renderer)
186+
- [Cycles (Blender)](https://github.com/jeffamstutz/anari-cycles)
186187
- [Intel OSPRay](https://github.com/ospray/anari-ospray)
187188
- [NVIDIA USD](https://github.com/NVIDIA-Omniverse/AnariUsdDevice)
188189
- [NVIDIA VisRTX + VisGL](https://github.com/NVIDIA/VisRTX)

0 commit comments

Comments
 (0)