Skip to content

Commit

Permalink
Merge branch 'develop' into task/cmake_vtkm_types_check
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolemarsaglia committed Dec 4, 2023
2 parents 9c8e37b + 6923cfb commit dbd52c4
Show file tree
Hide file tree
Showing 194 changed files with 14,425 additions and 7,158 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build_ascent_gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ jobs:
libreadline-dev \
libsqlite3-dev \
libbz2-dev \
mpich \
libmpich-dev \
openmpi-bin \
openmpi-common \
libopenmpi-dev \
cmake
- name: Checkout
uses: actions/checkout@v2
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/build_ascent_macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: build_ascent_macos

on:
pull_request:
branches: [ develop ]

jobs:
build_basic:
name: macOS Build Ascent Clang
runs-on: macos-latest
env:
CC: clang
CXX: clang++
steps:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: 'recursive'
- name: Build TPLs
run: |
env enable_mpi=OFF \
enable_tests=OFF \
enable_verbose=OFF \
build_ascent=false \
build_jobs=2 \
./scripts/build_ascent/build_ascent.sh
- name: Configure Ascent
run: |
cmake --version
echo "**** Configuring Ascent"
cmake -S src -B build -C ascent-config.cmake -DCMAKE_INSTALL_PREFIX=install
- name: Build Ascent
run: |
echo "**** Building Ascent"
cmake --build build -j2
- name: Install Ascent
run: |
echo "**** Installing Ascent"
cmake --install build
- name: Check Install
run: |
echo "**** Checking Ascent using-with-cmake example"
cd install/examples/ascent/using-with-cmake
cmake -S . -B build
cmake --build build --verbose -j2
export DYLD_LIBRARY_PATH=/home/runner/work/ascent/ascent/install/vtk-m-v2.0.0/lib/:${DYLD_LIBRARY_PATH}
./build/ascent_render_example
6 changes: 6 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ build:
# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: src/docs/sphinx/conf.py

# If using Sphinx, optionally build your docs in additional formats such as PDF
# formats:
# - pdf

# Set requirements required to build your docs
python:
install:
- requirements: src/docs/sphinx/requirements.txt
32 changes: 30 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,47 @@ Notable changes to Ascent are documented in this file. This changelog started on
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project aspires to adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased
### Preferred dependency versions for ascent@develop
- [email protected]
- [email protected]

### Added
- Added parameters to control HDF5 compression options to the Relay Extract.
- Added check to make sure all domain IDs are unique

### Changed
- Changed the Data Binning filter to accept a `reduction_field` parameter (instead of `var`), and similarly the axis parameters to take `field` (instead of `var`). The `var` style parameters are still accepted, but deprecated and will be removed in a future release.

## [0.9.2] - Released 2023-06-30
### Preferred dependency versions for [email protected]
- [email protected]
- [email protected]

### Added
- Automatic camera placement render that uses different types of entropy (data, depth, shading).
- Scene/Render option to manually position color bars
- Added in-memory conduit extract, which allows mesh data to be accessed via ascent.info()
- Added examples that demonstrate how to use Ascent via the Catalyst Conduit Interface.

### Changed
- Updated Ascent to use VTK-m 2.0
- Added C++ `Ascent::info()` method that returns a reference to execution info in addition the existing info() method that provides copy out semantics.


### Fixed

## [0.9.1] - Released 2023-04-21
### Preferred dependency versions for [email protected]
- [email protected]
- vtk-m@2.0.0
- vtk-m@1.9.0

### Added
- Added support for building and running on Windows.
- Added runtime control option (in addition to existing compile time option) to Devil Ray stats.
- Added CI testing for building Ascent and required third-party libs on Windows.

### Changed
- Updated Ascent to use VTK-m 2.0
- Devil Ray stats are now opt in, instead of opt out to avoid accumulating memory.
- `build_ascent.sh` is now a unified script that supports non-device, CUDA, and HIP builds.

Expand Down
38 changes: 27 additions & 11 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,26 @@
#####

########################
# Container Notes:
# Container Notes:
########################
# 2023/11/10:
# - Base container names changed from alpinedav/ascent-ci to alpinedav/ascent-devel
# - Dropped Ubuntu 18.04 Cuda 11.4.0, migrated tests to Ubuntu 20.04 11.4.3
#
# 2023/04/16:
# - Dropped Ubuntu 18.04, migrated tests to Ubuntu 20.04
# - build_ascent.sh {TPLS + Ascent} x {Standard, CUDA, and HIP} are tested via Github Actions
#
########################

variables:
ubuntu_20_04_tag: alpinedav/ascent-ci:ubuntu-20.04-devel-tpls_2023-05-05-shaf57286
ubuntu_22_04_tag: alpinedav/ascent-ci:ubuntu-22.04-devel-tpls_2023-05-05-shaf57286
ubuntu_18_04_cuda_11_4_0_tag: alpinedav/ascent-ci:ubuntu-18.04-cuda-11.4.0-devel-tpls_2023-05-05-shaf57286
ubuntu_20_04_rocm_5_1_3_tag: alpinedav/ascent-ci:ubuntu-20.04-rocm-5.1.3-devel-tpls_2023-05-05-shaf57286

ubuntu_20_04_tag: alpinedav/ascent-devel:ubuntu-20.04-x86_64-tpls_2023-11-10-shacd1600
ubuntu_22_04_tag: alpinedav/ascent-devel:ubuntu-22.04-x86_64-tpls_2023-11-10-sha104429
ubuntu_20_04_cuda_11_4_3_tag: alpinedav/ascent-devel:ubuntu-20.04-cuda-11.4.3-x86_64-tpls_2023-11-10-shacd1600
ubuntu_20_04_cuda_12_1_1_tag: alpinedav/ascent-devel:ubuntu-20.04-cuda-12.1.1-x86_64-tpls_2023-11-10-sha104429
ubuntu_20_04_rocm_5_1_3_tag: alpinedav/ascent-devel:ubuntu-20.04-rocm-5.1.3-x86_64-tpls_2023-11-10-shacd1600


# only build merge target pr to develop
trigger: none
pr:
Expand Down Expand Up @@ -438,8 +443,19 @@ stages:
COMPILER_FC: gfortran
strategy:
matrix:
ubuntu_18.04_static_cuda_11.4.0:
containerImage: ${{ variables.ubuntu_18_04_cuda_11_4_0_tag }}
ubuntu_20.04_static_cuda_12.1.1:
containerImage: ${{ variables.ubuntu_20_04_cuda_12_1_1_tag }}
BUILD_SHARED_LIBS: OFF
CMAKE_BUILD_TYPE: Release
ENABLE_DRAY: ON
ENABLE_MFEM: ON
BLT_CXX_STD: c++14
# static linking unit tests eats up alot of disk space,
# so skip building tests in CI to keep us away from clif
ENABLE_TESTS: OFF

ubuntu_20.04_static_cuda_11.4.3:
containerImage: ${{ variables.ubuntu_20_04_cuda_11_4_3_tag }}
BUILD_SHARED_LIBS: OFF
CMAKE_BUILD_TYPE: Release
ENABLE_DRAY: ON
Expand All @@ -448,8 +464,8 @@ stages:
# static linking unit tests eats up alot of disk space,
# so skip building tests in CI to keep us away from clif
ENABLE_TESTS: OFF
ubuntu_18.04_static_cuda_11.4.0_no_mfem:
containerImage: ${{ variables.ubuntu_18_04_cuda_11_4_0_tag }}
ubuntu_20.04_static_cuda_11.4.3_no_mfem:
containerImage: ${{ variables.ubuntu_20_04_cuda_11_4_3_tag }}
BUILD_SHARED_LIBS: OFF
CMAKE_BUILD_TYPE: Release
ENABLE_DRAY: ON
Expand Down Expand Up @@ -597,7 +613,7 @@ stages:
${CMAKE_EXE} --version
cat /ascent-config.cmake
# configure
${CMAKE_EXE} -S src -B build -C /ascent-config.cmake -DCMAKE_INSTALL_PREFIX=install
${CMAKE_EXE} -S src -B build -C /ascent-config.cmake -DENABLE_TESTS=ON -DCMAKE_INSTALL_PREFIX=install
displayName: 'Configure with CMake'
- script: |
Expand Down
2 changes: 1 addition & 1 deletion package.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def create_package(output_file=None):
suffix = "tar"
t = datetime.datetime.now()
output_file = "%s.%04d.%02d.%02d.%s" % (repo_name,t.year,t.month,t.day,suffix)
cmd = "python " + pkg_script + " --prefix=ascent " + output_file
cmd = "python3 " + pkg_script + " --prefix=ascent " + output_file
print("[exe: {}]".format(cmd))
subprocess.call(cmd,shell=True)

Expand Down
Loading

0 comments on commit dbd52c4

Please sign in to comment.