Skip to content

Commit 88e72ea

Browse files
committed
Merge branch 'next_release'
2 parents 911ae7c + 00a4ced commit 88e72ea

File tree

358 files changed

+2204
-1413
lines changed

Some content is hidden

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

358 files changed

+2204
-1413
lines changed

.github/actions/configure_and_build/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright 2021-2024 The Khronos Group
1+
## Copyright 2021-2025 The Khronos Group
22
## SPDX-License-Identifier: Apache-2.0
33

44
name: "Configure, build, and test ANARI-SDK"
@@ -23,11 +23,11 @@ runs:
2323
shell: ${{ inputs.shell }}
2424
run: >
2525
cmake -LA -B ${{ inputs.workspace }}/build
26-
-DBUILD_CTS=${{ inputs.os != 'ubuntu-20.04' }}
26+
-DBUILD_CTS=ON
2727
-DBUILD_EXAMPLES=ON
2828
-DBUILD_HDANARI=OFF
2929
-DBUILD_HELIDE_DEVICE=ON
30-
-DBUILD_REMOTE_DEVICE=${{ inputs.os == 'ubuntu-20.04' }}
30+
-DBUILD_REMOTE_DEVICE=OFF
3131
-DBUILD_TESTING=ON
3232
-DBUILD_VIEWER=OFF
3333
-DCMAKE_BUILD_TYPE=${{ inputs.config }}

.github/workflows/anari_sdk_ci.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright 2021-2024 The Khronos Group
1+
## Copyright 2021-2025 The Khronos Group
22
## SPDX-License-Identifier: Apache-2.0
33

44
name: ANARI-SDK CI
@@ -17,15 +17,9 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818
strategy:
1919
matrix:
20-
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
20+
os: [ubuntu-22.04, ubuntu-24.04]
2121
config: [Release, Debug]
22-
exclude:
23-
- os: ubuntu-20.04
24-
config: Debug
2522
steps:
26-
- name: Install Packages
27-
if: ${{ matrix.os == 'ubuntu-20.04' }}
28-
run: sudo apt install -y libboost-system-dev libpython3-dev
2923
- name: Check out code
3024
uses: actions/checkout@v4
3125
- name: Build and test
@@ -36,10 +30,10 @@ jobs:
3630
os: ${{ matrix.os }}
3731
shell: bash
3832
- name: Upload install
39-
if: ${{ matrix.config == 'Release' && matrix.os == 'ubuntu-20.04' }}
33+
if: ${{ matrix.config == 'Release' && matrix.os == 'ubuntu-22.04' }}
4034
uses: actions/upload-artifact@v4
4135
with:
42-
name: ANARI-SDK_ubuntu-20.04
36+
name: ANARI-SDK_ubuntu-22.04
4337
path: ${{ github.workspace }}/build/install
4438

4539
build-windows:

CMakeLists.txt

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright 2021-2024 The Khronos Group
1+
## Copyright 2021-2025 The Khronos Group
22
## SPDX-License-Identifier: Apache-2.0
33

44
cmake_minimum_required(VERSION 3.11)
@@ -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 12)
33-
set(ANARI_SDK_VERSION_PATCH 1)
32+
set(ANARI_SDK_VERSION_MINOR 13)
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
)
@@ -83,15 +83,6 @@ cmake_dependent_option(VIEWER_ENABLE_GLTF
8383
"BUILD_VIEWER"
8484
OFF
8585
)
86-
cmake_dependent_option(VIEWER_ENABLE_KTX
87-
"Enable KTX support in viewer"
88-
OFF
89-
"BUILD_VIEWER"
90-
OFF
91-
)
92-
if (VIEWER_ENABLE_KTX)
93-
set(USE_KTX ON)
94-
endif()
9586

9687
## The generate_all targets collects all offline code generation targets
9788

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,13 @@ list!
201201
- [HayStack](https://github.com/ingowald/hayStack)
202202
- [OVITO](https://www.ovito.org/)
203203
- [OpenUSD](https://openusd.org/release/index.html) (via [hdAnari](src/hdanari) plugin)
204-
- [pynari](https://github.com/ingowald/pynari)
204+
- [pynari](https://github.com/ingowald/pynari) (Python language bindings)
205205
- [TSD](https://github.com/NVIDIA/VisRTX/tree/next_release/tsd)
206206
- [Vistle](https://vistle.io/)
207207
- [VMD](https://www.ks.uiuc.edu/Research/vmd/)
208208
- [VTK](https://vtk.org/)
209209
- [VTK-m](https://m.vtk.org/)
210+
- [ANARI-Java](https://bitbucket.org/Eclesia/anari-java/src/main/) (Java language bindings)
210211

211212
### Integrations in-progress
212213

cmake/Findanari.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright 2022-2024 The Khronos Group
1+
## Copyright 2021-2025 The Khronos Group
22
## SPDX-License-Identifier: Apache-2.0
33

44
## NOTE: DO NOT USE THIS MODULE FILE!!! This CMake module sets up fake imported

cmake/anariConfig.cmake.in

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright 2021-2024 The Khronos Group
1+
## Copyright 2021-2025 The Khronos Group
22
## SPDX-License-Identifier: Apache-2.0
33

44
@PACKAGE_INIT@
@@ -8,11 +8,13 @@ include(CMakeFindDependencyMacro)
88
set(THREADS_PREFER_PTHREAD_FLAG ON)
99
find_dependency(Threads)
1010

11-
if (@CTS_ENABLE_GLTF@ OR @VIEWER_ENABLE_GLTF@)
11+
if (@USE_DRACO@)
1212
find_dependency(draco)
13+
endif()
14+
if (@USE_WEBP@)
1315
find_dependency(WebP)
1416
endif()
15-
if (@VIEWER_ENABLE_KTX@)
17+
if (@USE_KTX@)
1618
find_dependency(Ktx)
1719
endif()
1820

cmake/anari_generate_codegen.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright 2023-2024 The Khronos Group
1+
## Copyright 2023-2025 The Khronos Group
22
## SPDX-License-Identifier: Apache-2.0
33

44
function(anari_generate_queries)

cmake/anari_generate_frontend.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright 2021-2024 The Khronos Group
1+
## Copyright 2021-2025 The Khronos Group
22
## SPDX-License-Identifier: Apache-2.0
33

44
function(anari_generate_frontend)

cmake/anari_sdk_fetch_project.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright 2023-2024 The Khronos Group
1+
## Copyright 2023-2025 The Khronos Group
22
## SPDX-License-Identifier: Apache-2.0
33

44
include(FetchContent)

cmake/cmake_project_commands.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright 2022-2024 The Khronos Group
1+
## Copyright 2021-2025 The Khronos Group
22
## SPDX-License-Identifier: Apache-2.0
33

44
function(project_add_executable)

0 commit comments

Comments
 (0)