Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ascent_cuda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
matrix:
include:
- name: cuda 12.8.1
container: alpinedav/ascent-devel:ubuntu-22.04-cuda-12.8.1-x86_64-tpls_2026-08-04-sha50fcd3
container: alpinedav/ascent-devel:ubuntu-22.04-cuda-12.8.1-x86_64-tpls_2026-08-08-sha91a906
env:
cc: gcc
cxx: g++
Expand All @@ -38,7 +38,7 @@ jobs:
enable_examples: OFF
enable_utils: OFF
- name: cuda 11.8.0
container: alpinedav/ascent-devel:ubuntu-22.04-cuda-11.8.0-x86_64-tpls_2026-08-03-sha50fcd3
container: alpinedav/ascent-devel:ubuntu-22.04-cuda-11.8.0-x86_64-tpls_2026-08-09-sha91a906
env:
cc: gcc
cxx: g++
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
## Unreleased
### Preferred dependency versions for ascent@develop
- cmake@3.23 or newer
- conduit@0.9.5
- conduit@0.9.7
- viskores@1.1.1
- raja@v2025.09.0
- umpire@v2025.09.0
Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
########################

variables:
ubuntu_22_04_tag: alpinedav/ascent-devel:ubuntu-22.04-x86_64-tpls_2026-08-04-sha50fcd3
ubuntu_22_04_rocm_6_3_4_tag: alpinedav/ascent-devel:ubuntu-22.04-rocm-6.3.4-x86_64-build-ascent-tpls_2026-08-04-sha50fcd3
ubuntu_22_04_rocm_7_2_4_tag: alpinedav/ascent-devel:ubuntu-22.04-rocm-7.2.4-x86_64-build-ascent-tpls_2026-08-04-sha50fcd3

ubuntu_22_04_tag: alpinedav/ascent-devel:ubuntu-22.04-x86_64-tpls_2026-08-09-sha91a906
ubuntu_22_04_rocm_6_3_4_tag: alpinedav/ascent-devel:ubuntu-22.04-rocm-6.3.4-x86_64-build-ascent-tpls_2026-08-09-sha91a906
ubuntu_22_04_rocm_7_2_4_tag: alpinedav/ascent-devel:ubuntu-22.04-rocm-7.2.4-x86_64-build-ascent-tpls_2026-08-09-sha91a906
# only build merge target pr to develop
trigger: none
pr:
Expand Down
6 changes: 3 additions & 3 deletions scripts/build_ascent/build_ascent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ fi # build_zfp
################
# Conduit
################
conduit_version=v0.9.5
conduit_version=v0.9.7
conduit_src_dir=$(ospath ${source_dir}/conduit-${conduit_version})
conduit_build_dir=$(ospath ${build_dir}/conduit-${conduit_version}/)
conduit_install_dir=$(ospath ${install_dir}/conduit-${conduit_version}/)
Expand All @@ -530,8 +530,8 @@ if [ ! -d ${conduit_src_dir} ]; then
echo "**** Extracting ${conduit_tarball}"
# untar and avoid symlinks (which windows despises)
tar ${tar_extra_args} -xzf ${conduit_tarball} -C ${source_dir} \
--exclude="conduit-${conduit_version}/src/tests/relay/data/silo/*"

--exclude="conduit-${conduit_version}/src/tests/relay/data/silo/*" \
--exclude="conduit-${conduit_version}/AGENTS.md"
fi

#
Expand Down
4 changes: 3 additions & 1 deletion scripts/uberenv_configs/packages/conduit/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@ class Conduit(CMakePackage):
git = "https://github.com/LLNL/conduit.git"
tags = ["radiuss", "e4s"]

license("Apache-2.0")
license("BSD-3-Clause")

version("develop", branch="develop", submodules=True)
# note: the main branch in conduit was renamed to develop, this next entry
# is to bridge any spack dependencies that are still using the name master
version("master", branch="develop", submodules=True)
# note: 2021-05-05 latest tagged release is now preferred instead of develop
version("0.9.7", sha256="e207016e453dd360b2d9a5a1245e53a9aa26ed83fdfb02cc08fc7bfed664f923")
version("0.9.6", sha256="370780082f095ebcb5c43067b650c78325088df726488dc5c6d414e7037c847d")
version("0.9.5", sha256="d93294efbf0936da5a27941e13486aa1a04a74a59285786a2303eed19a24265a")
version("0.9.4", sha256="c9edfb2ff09890084313ad9c2d83bfb7c10e70b696980762d1ae1488f9f08e6c")
version("0.9.2", sha256="45d5a4eccd0fc978d153d29c440c53c483b8f29dfcf78ddcc9aa15c59b257177")
Expand Down
10 changes: 7 additions & 3 deletions src/libs/ascent/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -281,14 +281,12 @@ if(VISKORES_FOUND)
runtimes/ascent_data_object.cpp
runtimes/ascent_vtkh_data_adapter.cpp
runtimes/ascent_vtkh_collection.cpp
runtimes/flow_filters/ascent_runtime_vtkh_filters.cpp
runtimes/flow_filters/ascent_runtime_vtkh_utils.cpp
runtimes/flow_filters/ascent_runtime_rendering_filters.cpp
runtimes/flow_filters/ascent_runtime_rover_filters.cpp
runtimes/flow_filters/ascent_runtime_conduit_to_viskores_parsing.cpp
runtimes/flow_filters/ascent_runtime_gltf_extract.cpp
runtimes/flow_filters/ascent_runtime_filters.cpp
runtimes/ascent_main_runtime.cpp)
)

list(APPEND ascent_headers ${ascent_vtkh_dep_headers})
list(APPEND ascent_sources ${ascent_vtkh_dep_sources})
Expand All @@ -299,6 +297,12 @@ if(VISKORES_FOUND)

# also make sure that these are in ascent's device source list
list(APPEND ascent_device_sources ${ascent_viskores_device_sources})

# these are not device sources, they also use fmt which makes nvcc unhappy as of fmt 12
list(APPEND ascent_sources
runtimes/flow_filters/ascent_runtime_vtkh_filters.cpp
runtimes/flow_filters/ascent_runtime_gltf_extract.cpp
runtimes/ascent_main_runtime.cpp)
endif()


Expand Down