-
Notifications
You must be signed in to change notification settings - Fork 71
Develop Anari #1539
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
nicolemarsaglia
wants to merge
38
commits into
develop
Choose a base branch
from
task/2025_05_develop_anari
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Develop Anari #1539
Changes from all commits
Commits
Show all changes
38 commits
Select commit
Hold shift + click to select a range
067e2b3
add fields from other domains
nicolemarsaglia 79c5273
conflict
nicolemarsaglia 9c2880a
push before switching
nicolemarsaglia ead1f45
let's put this here for now
nicolemarsaglia eda9808
blt_mpi_deps
nicolemarsaglia c660409
add logic for if vtkm has mpi on
nicolemarsaglia d147e00
Update SetupMFEM.cmake
nicolemarsaglia 1e4f93f
try it this way?
nicolemarsaglia 9d856da
Merge branch 'task/2025_03_warpx_unit_test' of https://github.com/Alp…
nicolemarsaglia d64682a
idk this is weird
nicolemarsaglia f0f43e2
lets see this pass the ci then I'll fix the cmakelists
nicolemarsaglia f72e4b1
Merge branch 'task/2025_03_warpx_unit_test' of https://github.com/Alp…
nicolemarsaglia 013d572
lets try this cmake flag again for if mpi is not found
nicolemarsaglia cbed1c1
Merge branch 'task/2025_03_warpx_unit_test' of https://github.com/Alp…
nicolemarsaglia e5c7d92
t- => t_
nicolemarsaglia 2034ffe
Merge branch 'develop' into task/2025_03_warpx_unit_test
nicolemarsaglia 9bf1064
Merge branch 'develop' into task/2025_03_warpx_unit_test
nicolemarsaglia bf6cfb6
remove comment
nicolemarsaglia 80c4ac7
Develop anari (#1538)
nicolemarsaglia 278aa8a
remove cerr statments
nicolemarsaglia a0ddd85
Merge branch 'develop' into task/2025_05_develop_anari
nicolemarsaglia 8581de7
revert this change
nicolemarsaglia 76f5529
remove print statements
nicolemarsaglia 2fe2f40
add anari as rendering option
nicolemarsaglia 9ea2811
remove encoder
nicolemarsaglia f2adc76
Merge branch 'develop' into task/2025_05_develop_anari
nicolemarsaglia fc3ef11
kokkos typo
nicolemarsaglia eeb820f
remove anari as IsVolume in Scene.cpp
nicolemarsaglia 1c5fabb
add triangle renderer
nicolemarsaglia 256a5c9
start to get color map working
nicolemarsaglia 7d7b944
update
nicolemarsaglia 09c2d54
combine anari to a single renderer
nicolemarsaglia 522b555
move device initializion from constructor to execture so we only do i…
nicolemarsaglia ff293bb
add anari mapper triangles patch
nicolemarsaglia 264a73c
add ptc to build script
nicolemarsaglia 59b4e62
add build scripts
nicolemarsaglia a248b33
add tests
nicolemarsaglia b050a2c
add stuff
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
13 changes: 13 additions & 0 deletions
13
scripts/build_ascent/2025_07_07_vtkm_anari_mapper_triangles_parameter_fix.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/vtkm/interop/anari/ANARIMapperTriangles.cxx b/vtkm/interop/anari/ANARIMapperTriangles.cxx | ||
| index 9cd86ced1..ece8e809b 100644 | ||
| --- a/vtkm/interop/anari/ANARIMapperTriangles.cxx | ||
| +++ b/vtkm/interop/anari/ANARIMapperTriangles.cxx | ||
| @@ -379,7 +379,7 @@ anari_cpp::Surface ANARIMapperTriangles::GetANARISurface() | ||
| colors[2] = vtkm::Vec4f_32(0.f, 0.f, 1.f, 1.f); | ||
| anari_cpp::unmap(d, colorArray); | ||
| anari_cpp::setAndReleaseParameter(d, s, "image", colorArray); | ||
| - anari_cpp::setParameter(d, s, "filter", "nearest"); | ||
| + anari_cpp::setParameter(d, s, "filter", "linear"); | ||
| anari_cpp::setParameter(d, s, "wrapMode", "clampToEdge"); | ||
| anari_cpp::setParameter(d, s, "name", this->MakeObjectName("colormap")); | ||
| anari_cpp::setParameter(d, s, "inTransform", anari_cpp::mat4(anari_cpp::identity)); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| #!/bin/bash | ||
|
|
||
| ############################################################################## | ||
| # Demonstrates how to manually build Ascent and its dependencies, including: | ||
| # | ||
| # hdf5, conduit, vtk-m, mfem, raja, anari and umpire | ||
| # | ||
| # usage example: | ||
| # env enable_mpi=ON enable_openmp=ON ./build_ascent.sh | ||
| # | ||
| # | ||
| # Assumes: | ||
| # - cmake is in your path | ||
| # - selected compilers (including nvcc) are in your path or set via env vars | ||
| # - [when enabled] MPI and Python (+numpy and mpi4py), are in your path | ||
| # | ||
| ############################################################################## | ||
| set -eu -o pipefail | ||
|
|
||
| # 2024-10-14 ANARI support is handled by our unified script | ||
| env build_anari=true build_barney=true build_ptc=true enable_mpi=ON ./build_ascent.sh |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,13 +43,17 @@ option(ENABLE_HIDDEN_VISIBILITY "Build with hidden visibility for private symbol | |
| option(DRAY_ENABLE_STATS "Enable stats" ON) | ||
| option(DRAY_USE_DOUBLE_PRECISION "Build Devil Ray with double precision" OFF) | ||
|
|
||
|
|
||
| # VTK-h Specific Options | ||
|
|
||
| option(VTKH_ENABLE_FILTER_CONTOUR_TREE "Build VTK-h contour tree support" ON) | ||
|
|
||
| # Cuda Specific Options | ||
| option(ENABLE_CUDA_DEBUG_CPU_ONLY "Enable CUDA CPU debugging" OFF) | ||
|
|
||
| # support ANARI rendering backend | ||
| option(ENABLE_ANARI "Build ANARI Support" OFF) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we dont need addtional option, just key off ANARI_DIR |
||
|
|
||
| ##################################################### | ||
| # Note: Third party libs like MFEM, FIDES, etc are | ||
| # enabled when you provide MFEM_DIR, etc | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| ############################################################################### | ||
| # Copyright (c) Lawrence Livermore National Security, LLC and other Ascent | ||
| # Project developers. See top-level LICENSE AND COPYRIGHT files for dates and | ||
| # other details. No copyright assignment is required to contribute to Ascent. | ||
| ############################################################################### | ||
|
|
||
| ############################################################################### | ||
| # Setup ANARI | ||
| ############################################################################### | ||
|
|
||
| if(NOT ANARI_DIR) | ||
| MESSAGE(FATAL_ERROR "ANARI support needs explicit ANARI_DIR") | ||
| endif() | ||
|
|
||
| MESSAGE(STATUS "Looking for ANARI using ANARI_DIR = ${ANARI_DIR}") | ||
|
|
||
| set(ANARI_DIR_ORIG ${ANARI_DIR}) | ||
| set(ANARI_FOUND TRUE) | ||
|
|
||
| file(GLOB ANARI_DIR "${ANARI_DIR}/lib/cmake/anari-*") | ||
| if(NOT EXISTS ${ANARI_DIR}/anariConfig.cmake) | ||
| MESSAGE(FATAL_ERROR "Could not find ANARI CMake at (${ANARI_DIR}/lib/cmake/anari-*)") | ||
| endif() | ||
|
|
||
| ############################################################################### | ||
| # Import ANARI CMake targets | ||
| ############################################################################### | ||
| #find_package(anari REQUIRED) | ||
| find_package(anari REQUIRED | ||
| NO_DEFAULT_PATH | ||
| PATHS ${ANARI_DIR}) | ||
| if(NOT TARGET vtkm::anari) | ||
| message(FATAL_ERROR "vtkm::anari not found, check your VTK-m install") | ||
| endif() | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should only key off of
ANARI_DIR, we don't need an extra switch to enable to disable anari.