update to a blt 0.6.2

.github/workflows/build_ascent_cuda.yml

@@ -13,7 +13,7 @@ jobs:
       CMAKE_VERSION: 3.23.3
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - name: Install CMake

.github/workflows/build_ascent_gcc.yml

@@ -43,7 +43,7 @@ jobs:
                                 libopenmpi-dev \
                                 cmake
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - name: Build TPLs

.github/workflows/build_ascent_hip.yml

@@ -13,7 +13,7 @@ jobs:
       CMAKE_VERSION: 3.23.2
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - name: Install CMake

.github/workflows/build_ascent_icc.yml

@@ -49,7 +49,7 @@ jobs:
         sudo apt install -y intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-2023.1.0 \
                        intel-oneapi-compiler-fortran-2023.1.0
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - name: Build TPLs

.github/workflows/build_ascent_macos.yml

@@ -13,7 +13,7 @@ jobs:
       CXX: clang++
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - name: Build TPLs

.github/workflows/build_ascent_win.yml

@@ -13,7 +13,7 @@ jobs:
       uses: mpi4py/setup-mpi@v1
     - name: Setup Python Env
       run: python3 -m pip install --upgrade pip numpy mpi4py
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with: 
         submodules: 'recursive'
     - name: Build TPLs
@@ -40,4 +40,16 @@ jobs:
     - 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
+        cmake -E env CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --config Release --target RUN_TESTS
+    # NOT READY FOR THIS ON WINDOWS YET
+    # - name: Create Unit Test Report
+    #   if: always()
+    #   run: |
+    #     echo "**** Ascent Unit Tests Report Ggen"
+    #     cmake --build  build --target gen_report
+    # - name: Archive Test Results
+    #   if: always()
+    #   uses: actions/upload-artifact@v1
+    #   with:
+    #     name: test-results
+    #     path: build/tests/_output/

azure-pipelines.yml

@@ -22,11 +22,11 @@
 ########################
 
 variables:
-  ubuntu_20_04_tag: alpinedav/ascent-devel:ubuntu-20.04-x86_64-tpls_2023-12-06-sha497882
-  ubuntu_22_04_tag: alpinedav/ascent-devel:ubuntu-22.04-x86_64-tpls_2023-12-06-sha9574c7
-  ubuntu_20_04_cuda_11_4_3_tag: alpinedav/ascent-devel:ubuntu-20.04-cuda-12.1.1-x86_64-tpls_2023-12-09-sha5d53a0
-  ubuntu_20_04_cuda_12_1_1_tag: alpinedav/ascent-devel:ubuntu-20.04-cuda-11.4.3-x86_64-tpls_2023-12-09-sha5d53a0
-  ubuntu_20_04_rocm_5_1_3_tag:  alpinedav/ascent-devel:ubuntu-20.04-rocm-5.1.3-x86_64-tpls_2023-12-09-sha5d53a0
+  ubuntu_20_04_tag: alpinedav/ascent-devel:ubuntu-20.04-x86_64-tpls_2024-04-29-sha3234b3
+  ubuntu_22_04_tag: alpinedav/ascent-devel:ubuntu-22.04-x86_64-tpls_2024-04-29-sha3234b3
+  ubuntu_20_04_cuda_11_4_3_tag: alpinedav/ascent-devel:ubuntu-20.04-cuda-11.4.3-x86_64-tpls_2024-04-30-shad5b6a9
+  ubuntu_20_04_cuda_12_1_1_tag: alpinedav/ascent-devel:ubuntu-20.04-cuda-12.1.1-x86_64-tpls_2024-04-30-shad5b6a9
+  ubuntu_20_04_rocm_6_0_0_tag:  alpinedav/ascent-devel:ubuntu-20.04-rocm-6.0.0--x86_64-build-ascent-tpls_2024-04-19-shaee18b8
 
 
 # only build merge target pr to develop
@@ -594,8 +594,8 @@ stages:
       CMAKE_EXE: /cmake-3.23.2-linux-x86_64/bin/cmake
     strategy:
       matrix:
-        ubuntu_20.04_rocm_5.1.3_build_ascent:
-          containerImage: ${{ variables.ubuntu_20_04_rocm_5_1_3_tag }}
+        ubuntu_20.04_rocm_6.0.0_build_ascent:
+          containerImage: ${{ variables.ubuntu_20_04_rocm_6_0_0_tag }}
           BUILD_SHARED_LIBS: ON
           CMAKE_BUILD_TYPE: Release
           BLT_CXX_STD: c++14

hashes.txt

@@ -1,2 +1,2 @@
 vtkm branch='master' commit='982e965536b41b334bd2bbb765373e6503c823ec'
-blt  branch='main' commit='84fe0d15d841a79d923e97a9105b86b59147bfed'
+blt  branch='main' commit='9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35'

scripts/build_ascent/build_ascent.sh

@@ -242,7 +242,7 @@ fi # build_hdf5
 ################
 # Conduit
 ################
-conduit_version=v0.8.8
+conduit_version=v0.9.1
 conduit_src_dir=$(ospath ${root_dir}/conduit-${conduit_version}/src)
 conduit_build_dir=$(ospath ${root_dir}/build/conduit-${conduit_version}/)
 conduit_install_dir=$(ospath ${root_dir}/install/conduit-${conduit_version}/)
@@ -254,7 +254,7 @@ if ${build_conduit}; then
 if [ ! -d ${conduit_src_dir} ]; then
   echo "**** Downloading ${conduit_tarball}"
   curl -L https://github.com/LLNL/conduit/releases/download/${conduit_version}/${conduit_tarball} -o ${conduit_tarball}
-  tar -xzf ${conduit_tarball}
+  tar --exclude="conduit-${conduit_version}/src/tests/relay/data/silo/*" -x -v -f ${conduit_tarball}
 fi
 
 echo "**** Configuring Conduit ${conduit_version}"
@@ -399,21 +399,20 @@ fi # build_vtkm
 ################
 # Camp
 ################
-camp_version=2022.10.1
+camp_version=v2024.02.1
 camp_src_dir=$(ospath ${root_dir}/camp-${camp_version})
 camp_build_dir=$(ospath ${root_dir}/build/camp-${camp_version})
 camp_install_dir=$(ospath ${root_dir}/install/camp-${camp_version}/)
 camp_tarball=camp-${camp_version}.tar.gz
 
+
 # build only if install doesn't exist
 if [ ! -d ${camp_install_dir} ]; then
 if ${build_camp}; then
 if [ ! -d ${camp_src_dir} ]; then
-  echo "**** Cloning Camp ${camp_version}"
-  # clone since camp releases don't contain submodules
-  git clone --recursive --depth 1 --branch v${camp_version} https://github.com/LLNL/camp.git camp-${camp_version}
-  # curl -L https://github.com/LLNL/camp/archive/refs/tags/v${camp_version}.tar.gz -o ${camp_tarball} 
-  # tar -xzf ${camp_tarball} 
+  echo "**** Downloading ${camp_tarball}"
+  curl -L https://github.com/LLNL/camp/releases/download/${camp_version}/${camp_tarball} -o ${camp_tarball}
+  tar -xzf ${camp_tarball} 
 fi
 
 camp_extra_cmake_args=""
@@ -451,7 +450,7 @@ fi # build_camp
 ################
 # RAJA
 ################
-raja_version=v2022.10.4
+raja_version=v2024.02.1
 raja_src_dir=$(ospath ${root_dir}/RAJA-${raja_version})
 raja_build_dir=$(ospath ${root_dir}/build/raja-${raja_version})
 raja_install_dir=$(ospath ${root_dir}/install/raja-${raja_version}/)
@@ -463,12 +462,8 @@ if [ ! -d ${raja_install_dir} ]; then
 if ${build_raja}; then
 if [ ! -d ${raja_src_dir} ]; then
   echo "**** Downloading ${raja_tarball}"
-  curl -L https://github.com/LLNL/RAJA/releases/download/${raja_version}/${raja_tarball} -o ${raja_tarball} 
+  curl -L https://github.com/LLNL/RAJA/releases/download/${raja_version}/${raja_tarball} -o ${raja_tarball}
   tar -xzf ${raja_tarball}
-  # apply raja patch
-  cd  ${raja_src_dir}
-  patch -p1 < ${script_dir}/2023_01_30_raja.patch
-  cd ${root_dir}
 fi
 
 raja_extra_cmake_args=""
@@ -510,7 +505,7 @@ fi # build_raja
 ################
 # Umpire
 ################
-umpire_version=2022.10.0
+umpire_version=2024.02.1
 umpire_src_dir=$(ospath ${root_dir}/umpire-${umpire_version})
 umpire_build_dir=$(ospath ${root_dir}/build/umpire-${umpire_version})
 umpire_install_dir=$(ospath ${root_dir}/install/umpire-${umpire_version}/)
@@ -567,7 +562,7 @@ fi # build_umpire
 ################
 # MFEM
 ################
-mfem_version=4.5.2
+mfem_version=4.6
 mfem_src_dir=$(ospath ${root_dir}/mfem-${mfem_version})
 mfem_build_dir=$(ospath ${root_dir}/build/mfem-${mfem_version})
 mfem_install_dir=$(ospath ${root_dir}/install/mfem-${mfem_version}/)
@@ -614,7 +609,7 @@ fi # build_mfem
 ################
 # Catalyst
 ################
-catalyst_version=2.0.0-rc3
+catalyst_version=2.0.0-rc4
 catalyst_src_dir=$(ospath ${root_dir}/catalyst-v${catalyst_version})
 catalyst_build_dir=$(ospath ${root_dir}/build/catalyst-v${catalyst_version})
 catalyst_install_dir=$(ospath ${root_dir}/install/catalyst-v${catalyst_version}/)

scripts/ci/docker/alpinedav_ubuntu_20.04_rocm_6.0.0_devel/Dockerfile

@@ -0,0 +1,75 @@
+# 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.
+
+FROM ubuntu:20.04
+# add sudo to base ubuntu container
+# so we can install additional packages as
+# non-root, but admin default user on azure pipelines
+RUN apt-get update && apt-get -y install sudo
+RUN apt-get update && apt-get -y install wget gnupg
+# tzdata install wants to ask questions, so handled as sep case
+RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
+
+
+#
+# install rocm (recipe from warpx)
+# https://github.com/ECP-WarpX/WarpX/blob/development/.github/workflows/dependencies/hip.sh
+#
+# Ref.: https://rocmdocs.amd.com/en/latest/Installation_Guide/Installation-Guide.html#ubuntu
+RUN wget -q -O - http://repo.radeon.com/rocm/rocm.gpg.key \
+  | sudo apt-key add -
+
+RUN echo 'deb [arch=amd64] http://repo.radeon.com/rocm/apt/6.0/ ubuntu main' \
+  | sudo tee /etc/apt/sources.list.d/rocm.list
+
+RUN echo 'export PATH=/opt/rocm/llvm/bin:/opt/rocm/bin:/opt/rocm/profiler/bin:/opt/rocm/opencl/bin:$PATH' \
+  | sudo tee -a /etc/profile.d/rocm.sh
+
+
+
+# install std packages
+# Notes:
+# kmod -- hip requires lsmod
+# liblocale-codes-perl  -- hip uses perl, if locale bad, life isn't good
+# language-pack-en  -- hip uses perl, if locale bad, life isn't good
+# for 6.0, `rocm` - new meta package
+RUN apt-get update && apt-get -y install \
+             binutils \
+             gcc \
+             g++ \
+             gfortran \
+             python \
+             perl \
+             git \
+             git-lfs \
+             curl \
+             wget \
+             tar \
+             unzip \
+             build-essential \
+             libncurses-dev \
+             libssl-dev \
+             libblas-dev \
+             liblapack-dev \
+             liblapacke-dev \
+             zlib1g-dev \
+             libgdbm-dev \
+             libreadline-dev \
+             libsqlite3-dev \
+             libbz2-dev \
+             mpich \
+             libmpich-dev \
+             libnuma-dev \
+             rocm-dev        \
+             rocfft-dev      \
+             rocprim-dev     \
+             rocrand-dev     \
+             hiprand-dev     \
+             openssh-server \
+             language-pack-en \
+             liblocale-codes-perl \
+             vim
+
+#RUN apt-get update && apt-get -y install --no-install-recommends 
+# rocm-hip-sdk, vs all of these packages?

scripts/ci/docker/alpinedav_ubuntu_20.04_rocm_6.0.0_devel/build.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+# 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.
+set -ev
+
+export TAG_ARCH=`uname -m`
+export TAG_NAME=alpinedav/ascent-devel:ubuntu-20.04-rocm-6.0.0-${TAG_ARCH}
+
+# exec docker build to create image
+echo "docker build -t ${TAG_NAME} ."
+docker build -t ${TAG_NAME} .

scripts/ci/docker/alpinedav_ubuntu_20.04_rocm_6.0.0_devel_build_ascent_tpls/Dockerfile

@@ -0,0 +1,20 @@
+# 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.
+
+ARG ARCH_TAG="x86_64"
+FROM alpinedav/ascent-devel:ubuntu-20.04-rocm-6.0.0-${ARCH_TAG}
+
+# obtain a copy of ascent source from host env,
+# which we use to call uberenv
+COPY ascent.docker.src.tar.gz /
+# extract 
+RUN tar -xzf ascent.docker.src.tar.gz
+
+# copy spack build script in
+COPY docker_uberenv_build.sh docker_env_setup.sh /
+RUN chmod -R a+x /*.sh
+
+RUN /docker_uberenv_build.sh
+
+RUN /docker_env_setup.sh

scripts/ci/docker/alpinedav_ubuntu_20.04_rocm_6.0.0_devel_build_ascent_tpls/build.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# 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.
+set -ev
+
+export REPO_NAME="ascent"
+export TAG_ARCH=`uname -m`
+export TAG_BASE=alpinedav/ascent-devel:ubuntu-20.04-rocm-6.0.0--${TAG_ARCH}-build-ascent-tpls
+
+date
+
+python3 ../../../docker_build_and_tag.py ${REPO_NAME} ${TAG_ARCH} ${TAG_BASE}
+
+date

scripts/ci/docker/alpinedav_ubuntu_20.04_rocm_6.0.0_devel_build_ascent_tpls/docker_env_setup.sh

@@ -0,0 +1,7 @@
+# create some helper scripts
+python ascent/scripts/gen_spack_env_script.py cmake mpi
+echo "git clone --recursive https://github.com/Alpine-DAV/ascent.git" > clone.sh
+chmod +x clone.sh
+
+# delete copy of source from host (ci will fetch new from repo)
+rm -rf ascent

scripts/ci/docker/alpinedav_ubuntu_20.04_rocm_6.0.0_devel_build_ascent_tpls/docker_uberenv_build.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+set -ev
+
+cmake_install_dir=/cmake-3.23.2-linux-x86_64
+if [ ! -d ${cmake_install_dir} ]; then
+  echo "**** Downloading ${hdf5_tarball}"
+  # setup cmake in container
+  curl -L https://github.com/Kitware/CMake/releases/download/v3.23.2/cmake-3.23.2-linux-x86_64.tar.gz -o cmake-3.23.2-linux-x86_64.tar.gz
+  tar -xzf cmake-3.23.2-linux-x86_64.tar.gz
+fi
+
+export PATH=$PATH:/${cmake_install_dir}/bin/
+
+# build rocm tpls with helper script
+chmod +x ascent/scripts/build_ascent/build_ascent.sh
+# enable tests is of b/c one of the vtk-m tests fails to link
+env enable_tests=OFF build_ascent=false enable_hip=ON ascent/scripts/build_ascent/build_ascent.sh
+
+############################
+# TODO: get spack working
+############################
+# variants
+# TODO:
+# (+genten) genten currently disabled, wait for genten master to gain cokurt
+# (+dray+raja+umpire) (can't get raja or umpire to build with rocm)
+#export SPACK_SPEC="%clang+mpi+vtkh~dray~raja~umpire+mfem+occa+rocm~genten~python~openmp~fortran"
+# constraints
+#export SPACK_SPEC="${SPACK_SPEC} ^hdf5~mpi ^mfem~rocm ^hypre~rocm ^conduit~fortran"
+# config
+#export SPACK_CONFIG="scripts/uberenv_configs/spack_configs/configs/alpinedav/ubuntu_20.04_rocm_5.1.3_devel/"
+
+#cd ascent && python scripts/uberenv/uberenv.py \
+#     -k \
+#     --spec="${SPACK_SPEC}" \
+#     --spack-config-dir="${SPACK_CONFIG}" \
+#     --prefix="/uberenv_libs"
+
+# cleanup the spack build stuff to free up space
+#/uberenv_libs/spack/bin/spack clean --all
+
+# change perms
+# chmod -R a+rX /uberenv_libs
+
+# back to where we started
+#cd ../