Merge branch 'develop' into task/cmake_vtkm_types_check

.github/workflows/build_ascent_cuda.yml

@@ -0,0 +1,50 @@
+name: build_ascent_cuda
+
+on:
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+  build_cuda:
+    name: Build Ascent CUDA
+    runs-on: ubuntu-latest
+    container: alpinedav/ascent-ci:ubuntu-22.04-cuda-11.8.0-devel
+    env:
+      CMAKE_VERSION: 3.23.3
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+    - name: Install CMake
+      run: |
+        curl -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz -o cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz
+        tar -xzf cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz
+        cmake-${CMAKE_VERSION}-linux-x86_64/bin/cmake --version
+    - name: Build TPLs
+      run: |
+        export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
+        env enable_cuda=ON \
+            enable_mpi=OFF \
+            enable_fortran=OFF \
+            enable_tests=OFF \
+            build_ascent=OFF \
+            enable_verbose=OFF \
+            build_jobs=2 \
+            ./scripts/build_ascent/build_ascent.sh
+    - name: Configure Ascent
+      run: |
+        export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
+        cmake --version
+        echo "**** Configuring Ascent"
+        cmake -S src -B build -C ascent-config.cmake -DCMAKE_INSTALL_PREFIX=install
+    - name: Build Ascent
+      run: |
+        export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
+        echo "**** Building Ascent"
+        cmake --build  build -j2 --config Release
+    - name: Install Ascent
+      run: |
+        export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
+        echo "**** Installing Ascent"
+        cmake --install  build --config Release

.github/workflows/build_ascent_gcc.yml

@@ -1,23 +1,17 @@
-name: build_ascent
+name: build_ascent_gcc
 
 on:
   pull_request:
     branches: [ develop ]
 
 jobs:
   build_basic:
-    strategy:
-      matrix:
-        include:
-        - cc: gcc
-          cxx: g++
-          fc: gfortran
-    name: Ubuntu Build Ascent (${{ matrix.cc }})
+    name: Ubuntu Build Ascent GCC
     runs-on: ubuntu-latest
     env:
-      CC: ${{ matrix.cc }}
-      CXX: ${{ matrix.cxx }}
-      FC: ${{ matrix.fc }}
+      CC: gcc
+      CXX: g++
+      FC: gfortran
     steps:
     - name: Install System Deps
       run: |
@@ -56,28 +50,30 @@ jobs:
         env enable_mpi=ON \
             enable_fortran=ON \
             enable_tests=OFF \
-            build_ascent=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
+        cmake --build build -j2
     - name: Install Ascent
       run: |
         echo "**** Installing Ascent"
-        cmake --install  build
+        cmake --install build
     - name: Check Install
       run: |
         echo "**** Checking Ascent using-with-cmake-mpi example"
         export CC=/usr/bin/mpicc
         export CXX=/usr/bin/mpicxx
         cd install/examples/ascent/using-with-cmake-mpi
         cmake -S . -B build
-        cmake --build  build -j2
+        cmake --build build --verbose -j2
+        export LD_LIBRARY_PATH=/home/runner/work/ascent/ascent/install/vtk-m-v2.0.0/lib/:${LD_LIBRARY_PATH}
         mpiexec -n 2 ./build/ascent_mpi_render_example

.github/workflows/build_ascent_hip.yml

@@ -0,0 +1,50 @@
+name: build_ascent_hip
+
+on:
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+  build_cuda:
+    name: Build Ascent HIP
+    runs-on: ubuntu-latest
+    container: alpinedav/ascent-ci:ubuntu-20.04-rocm-5.1.3-devel
+    env:
+      CMAKE_VERSION: 3.23.2
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+    - name: Install CMake
+      run: |
+        curl -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz -o cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz
+        tar -xzf cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz
+        cmake-${CMAKE_VERSION}-linux-x86_64/bin/cmake --version
+    - name: Build TPLs
+      run: |
+        export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
+        env enable_hip=ON \
+            enable_mpi=OFF \
+            enable_fortran=OFF \
+            enable_tests=OFF \
+            build_ascent=OFF \
+            enable_verbose=OFF \
+            build_jobs=2 \
+            ./scripts/build_ascent/build_ascent.sh
+    - name: Configure Ascent
+      run: |
+        export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
+        cmake --version
+        echo "**** Configuring Ascent"
+        cmake -S src -B build -C ascent-config.cmake -DCMAKE_INSTALL_PREFIX=install
+    - name: Build Ascent
+      run: |
+        export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
+        echo "**** Building Ascent"
+        cmake --build  build -j2 --config Release
+    - name: Install Ascent
+      run: |
+        export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
+        echo "**** Installing Ascent"
+        cmake --install  build --config Release

.github/workflows/build_ascent_icc.yaml → .github/workflows/build_ascent_icc.yml

@@ -1,23 +1,17 @@
-name: build_ascent
+name: build_ascent_icx
 
 on:
   pull_request:
     branches: [ develop ]
 
 jobs:
   build_basic:
-    strategy:
-      matrix:
-        include:
-        - cc: icx
-          cxx: icpx
-          fc: ifx
-    name: Ubuntu Build Ascent (${{ matrix.cc }})
-    runs-on: ubuntu-latest
+    name: Ubuntu Build Ascent OpenAPI
+    runs-on: ubuntu-20.04
     env:
-      CC: ${{ matrix.cc }}
-      CXX: ${{ matrix.cxx }}
-      FC: ${{ matrix.fc }}
+      CC: icx
+      CXX: icpx
+      FC: ifx
     steps:
     - name: Install System Deps
       run: |
@@ -67,6 +61,7 @@ jobs:
             ./scripts/build_ascent/build_ascent.sh
     - name: Configure Ascent
       run: |
+        cmake --version
         echo "**** Configuring Ascent"
         source /opt/intel/oneapi/setvars.sh
         cmake -S src -B build -C ascent-config.cmake -DCMAKE_INSTALL_PREFIX=install

.github/workflows/build_ascent_win.yml

@@ -0,0 +1,43 @@
+name: build_ascent_windows
+
+on:
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+  build_windows_msvc_base:
+    name: MSVC Base Release
+    runs-on: windows-2019
+    steps:
+    - name: Setup MPI
+      uses: mpi4py/setup-mpi@v1
+    - name: Setup Python Env
+      run: python3 -m pip install --upgrade pip numpy mpi4py
+    - uses: actions/checkout@v2
+      with: 
+        submodules: 'recursive'
+    - name: Build TPLs
+      run: |
+        env build_ascent=false `
+            enable_tests=OFF `
+            ./scripts/build_ascent/build_ascent.sh
+    - name: Configure Ascent
+      run: |
+        cmake --version
+        echo "**** Configuring Ascent"
+        cmake -S src -B build `
+              -C ascent-config.cmake `
+              -DENABLE_TESTS=ON `
+              -DCMAKE_INSTALL_PREFIX=install
+    - name: Build Ascent
+      run: |
+        echo "**** Building Ascent"
+        cmake --build  build --config Release -j2
+    - name: Install Ascent
+      run: |
+        echo "**** Installing Ascent"
+        cmake --install  build --config Release
+    - name: Run Ascent Unit Tests
+      run: |
+        echo "**** Ascent Unit Tests"
+        cmake -E env CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --config Release --target RUN_TESTS

.readthedocs.yaml

@@ -1,19 +1,19 @@
-# .readthedocs.yml
+# .readthedocs.yaml
 # Read the Docs configuration file
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 
 # Required
 version: 2
 
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
-  configuration: src/docs/sphinx/conf.py
-
-# Optionally build your docs in additional formats such as PDF and ePub
-formats: all
-
-# Optionally set the version of Python and requirements required to build your docs
-python:
-  version: 3.7
-  install:
-    - requirements: src/docs/sphinx/requirements.txt
+   configuration: src/docs/sphinx/conf.py
+# If using Sphinx, optionally build your docs in additional formats such as PDF
+# formats:
+#    - pdf

CHANGELOG.md

@@ -5,13 +5,33 @@ 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
+## [0.9.1] - Released 2023-04-21
+### Preferred dependency versions for [email protected]
+- [email protected]
+- [email protected]
 
-### Preferred dependency versions for ascent@develop
-- [email protected]
+### 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.
+
+### Fixed
+- Ensure ghost indicator fields survive field filtering.
+
+## [0.9.0] - Released 2023-01-12
+
+### Preferred dependency versions for [email protected]
+- [email protected]
 - [email protected]
 
 ### Added
+- Added support for HIP and running on AMD GPUs
+- Added RAJA expressions infrastructure
 - Added pipeline `partition` transform from Conduit Blueprint
 - Added extract `flatten` from Conduit Blueprint
 - Added Log base 10 filter. Filter type is `log10`
@@ -22,6 +42,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 - Added CMake option `ENABLE_HIDDEN_VISIBILITY` (default=ON), which controls if hidden visibility is used for private symbols
 - Added documentation for how to use ROCm's rocprof profiler for GPUs with Ascent
 - Added support for Caliper performance annotations 
+- Added automatic slice filter that evaluates a number of slices and outputs the one with the highest entropy
 
 ### Changed
 - **The Great Amalgamation** - The VTK-h, Devil Ray, and AP Compositor projects are now developed in Ascent's source instead of separate repos. These external repos for these projects are archived. This reorg simplifies the development and support of these tightly coupled capabilities. Ascent 0.9.0 will be the first release using these internal versions.
@@ -166,7 +187,12 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 ### Fixed
 - Several minor bug fixes
 
-[Unreleased]: https://github.com/Alpine-DAV/ascent/compare/v0.6.0...HEAD
+[Unreleased]: https://github.com/Alpine-DAV/ascent/compare/v0.9.1...HEAD
+[0.9.1]: https://github.com/Alpine-DAV/ascent/compare/v0.9.0...v0.9.1
+[0.9.0]: https://github.com/Alpine-DAV/ascent/compare/v0.8.0...v0.9.0
+[0.8.0]: https://github.com/Alpine-DAV/ascent/compare/v0.7.1...v0.8.0
+[0.7.1]: https://github.com/Alpine-DAV/ascent/compare/v0.7.0...v0.7.1
+[0.7.0]: https://github.com/Alpine-DAV/ascent/compare/v0.6.0...v0.7.0
 [0.6.0]: https://github.com/Alpine-DAV/ascent/compare/v0.5.1...v0.6.0
 [0.5.1]: https://github.com/Alpine-DAV/ascent/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/Alpine-DAV/ascent/compare/v0.4.0...v0.5.0

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2022, Lawrence Livermore National Security, LLC.
+Copyright (c) 2015-2023, Lawrence Livermore National Security, LLC.
 
 Produced at the Lawrence Livermore National Laboratory