Merge pull request #319 from LLNL/v2025.03.1-RC

adayton1 · web-flow · commit 2e83ca803ec8 · 2025-06-23T15:50:15.000-07:00
v2025.03.1 RC
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -34,8 +34,11 @@ variables:
 # Use the service user workspace. Solves permission issues, stores everything
 # at the same location whoever triggers a pipeline.
   CUSTOM_CI_BUILDS_DIR: /usr/workspace/umdev/gitlab-runner
-# Tells Gitlab to recursively update the submodules when cloning the project.
-  GIT_SUBMODULE_STRATEGY: recursive
+# Submodules: We don't need to fetch dependencies handled by Spack.
+  GIT_SUBMODULE_STRATEGY: normal
+  GIT_SUBMODULE_DEPTH: 1
+  GIT_SUBMODULE_UPDATE_FLAGS: --jobs 2
+  GIT_SUBMODULE_PATHS: scripts/radiuss-spack-configs scripts/uberenv
 
 ##### PROJECT VARIABLES
 # We build the projects in the CI clone directory (used in
diff --git a/.uberenv_config.json b/.uberenv_config.json
@@ -4,9 +4,8 @@
 "package_final_phase" : "initconfig",
 "package_source_dir" : "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_branch": "develop-2025-02-09",
+"spack_commit": "280017a9ba3f6a969743deca0eebc96e7c0e5cfd",
 "spack_configs_path": "scripts/radiuss-spack-configs",
 "spack_packages_path": "scripts/radiuss-spack-configs/packages",
-"spack_concretizer": "clingo",
 "spack_setup_clingo": false
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ cmake_policy(SET CMP0025 NEW)
 include(CMakeDependentOption)
 include(CMakePackageConfigHelpers)
 
-project(Chai LANGUAGES C CXX VERSION 2025.03.0)
+project(Chai LANGUAGES C CXX VERSION 2025.03.1)
 cmake_minimum_required(VERSION 3.23)
 
 include(cmake/SetupChaiOptions.cmake)
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [comment]: # (# SPDX-License-Identifier: BSD-3-Clause)
 [comment]: # (#################################################################)
 
-# CHAI v2025.03.0
+# CHAI v2025.03.1
 
 [![Azure Build Status](https://dev.azure.com/davidbeckingsale/CHAI/_apis/build/status/LLNL.CHAI?branchName=develop)](https://dev.azure.com/davidbeckingsale/CHAI/_build/latest?definitionId=2&branchName=develop)
 [![Build Status](https://travis-ci.org/LLNL/CHAI.svg?branch=develop)](https://travis-ci.org/LLNL/CHAI)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -13,6 +13,16 @@ in this file.
 
 The format of this file is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [Version 2025.03.1] - Release date 2025-06-23
+
+### Changed
+- Updated to RAJA v2025.03.2
+- Use memcpy instead of umpire copy for CPU-only thin managed array realloc (allows tracking to be disabled).
+
+### Fixed
+- Fixed ManagedArray::set when CHAI\_DISABLE\_RM=OFF and the initial space is not CPU.
+- Fixed memory leaks in ArrayManager.
+
 ## [Version 2025.03.0] - Release date 2025-03-19
 
 ### Added
diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
@@ -63,7 +63,7 @@
 # The short X.Y version.
 version = u'2025.03'
 # The full version, including alpha/beta/rc tags.
-release = u'2025.03.0'
+release = u'2025.03.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/sphinx/conf.py.in b/docs/sphinx/conf.py.in
@@ -62,7 +62,7 @@ author = u''
 # The short X.Y version.
 version = u'2025.03'
 # The full version, including alpha/beta/rc tags.
-release = u'2025.03.0'
+release = u'2025.03.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/scripts/gitlab/build_and_test.sh b/scripts/gitlab/build_and_test.sh
@@ -33,9 +33,9 @@ push_to_registry=${PUSH_TO_REGISTRY:-true}
 # REGISTRY_TOKEN allows you to provide your own personal access token to the CI
 # registry. Be sure to set the token with at least read access to the registry.
 registry_token=${REGISTRY_TOKEN:-""}
-ci_registry_user=${CI_REGISTRY_USER:-"${USER}"}
 ci_registry_image=${CI_REGISTRY_IMAGE:-"czregistry.llnl.gov:5050/radiuss/chai"}
-ci_registry_token=${CI_JOB_TOKEN:-"${registry_token}"}
+export ci_registry_user=${CI_REGISTRY_USER:-"${USER}"}
+export ci_registry_token=${CI_JOB_TOKEN:-"${registry_token}"}
 
 timed_message ()
 {
@@ -62,9 +62,7 @@ fi
 
 if [[ -n ${module_list} ]]
 then
-    echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-    echo "~~~~~ Modules to load: ${module_list}"
-    echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+    timed_message "Modules to load: ${module_list}"
     module load ${module_list}
 fi
 
@@ -84,7 +82,7 @@ then
     prefix="${prefix}-${job_unique_id}"
 else
     # We set the prefix in the parent directory so that spack dependencies are not installed inside the source tree.
-    prefix="$(pwd)/../spack-and-build-root"
+    prefix="${project_dir}/../spack-and-build-root"
 fi
 
 echo "Creating directory ${prefix}"
@@ -146,7 +144,7 @@ then
     if [[ -n ${ci_registry_token} ]]
     then
         timed_message "GitLab registry as Spack Buildcache"
-        ${spack_cmd} -D ${spack_env_path} mirror add --unsigned --oci-username ${ci_registry_user} --oci-password ${ci_registry_token} gitlab_ci oci://${ci_registry_image}
+        ${spack_cmd} -D ${spack_env_path} mirror add --unsigned --oci-username-variable ci_registry_user --oci-password-variable ci_registry_token gitlab_ci oci://${ci_registry_image}
     fi
 
     timed_message "Spack build of dependencies"
@@ -222,8 +220,18 @@ then
     mkdir -p ${build_dir} && cd ${build_dir}
 
     timed_message "Building CHAI"
+    # We set the MPI tests command to allow overlapping.
+    # Shared allocation: Allows build_and_test.sh to run within a sub-allocation (see CI config).
+    # Use /dev/shm: Prevent MPI tests from running on a node where the build dir doesn't exist.
+    cmake_options=""
+    if [[ "${truehostname}" == "ruby" || "${truehostname}" == "poodle" ]]
+    then
+        cmake_options="-DBLT_MPI_COMMAND_APPEND:STRING=--overlap"
+    fi
+
     $cmake_exe \
       -C ${hostconfig_path} \
+      ${cmake_options} \
       -DCMAKE_INSTALL_PREFIX=${install_dir} \
       ${project_dir}
     if ! $cmake_exe --build . -j ${core_counts[$truehostname]}
@@ -259,9 +267,9 @@ then
         echo "[Error]: No tests were found" && exit 1
     fi
 
-    timed_message "Preparing testing xml reports for export"
+    timed_message "Preparing tests xml reports for export"
     tree Testing
-    xsltproc -o junit.xml ${project_dir}/blt/tests/ctest-to-junit.xsl Testing/*/Test.xml
+    xsltproc -o junit.xml ${project_dir}/scripts/radiuss-spack-configs/utilities/ctest-to-junit.xsl Testing/*/Test.xml
     mv junit.xml ${project_dir}/junit.xml
 
     if grep -q "Errors while running CTest" ./tests_output.txt
diff --git a/scripts/make_release_tarball.sh b/scripts/make_release_tarball.sh
@@ -7,7 +7,7 @@
 ##############################################################################
 
 TAR_CMD=gtar
-VERSION=2025.03.0
+VERSION=2025.03.1
 
 git archive --prefix=chai-${VERSION}/ -o chai-${VERSION}.tar HEAD 2> /dev/null
 
diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit 5d16f366c1ee1e0db4491f856e82c3c600fef0a1
+Subproject commit 7b3c95ac17b6fb692bc7712da37d7ef0fc33fa45
diff --git a/src/chai/ArrayManager.cpp b/src/chai/ArrayManager.cpp
@@ -80,6 +80,13 @@ ArrayManager::ArrayManager() :
 #endif
 }
 
+ArrayManager::~ArrayManager() {
+  for (size_t i = 0; i < NUM_EXECUTION_SPACES; ++i) {
+    if (m_allocators[i])
+      delete m_allocators[i];
+  }
+}
+
 void ArrayManager::registerPointer(
    PointerRecord* record,
    ExecutionSpace space,
diff --git a/src/chai/ArrayManager.hpp b/src/chai/ArrayManager.hpp
@@ -447,6 +447,12 @@ class ArrayManager
    */
   ArrayManager();
 
+  /*!
+   * \brief Destruct a new ArrayManager.
+   *
+   * The destructor is a protected member.
+   */
+  ~ArrayManager();
 
 
 private:
diff --git a/src/chai/ManagedArray.inl b/src/chai/ManagedArray.inl
@@ -363,7 +363,13 @@ CHAI_HOST_DEVICE void ManagedArray<T>::set(size_t i, T val) const {
     #endif
 
     if (m_pointer_record->m_last_space == NONE) {
-       m_pointer_record->m_last_space = CPU;
+       // Use the first non-null pointer if managed array was not used yet
+       for (int s = CPU; s < NUM_EXECUTION_SPACES; ++s) {
+          if (m_pointer_record->m_pointers[s] != nullptr) {
+             m_pointer_record->m_last_space = static_cast<ExecutionSpace>(s);
+             break;
+          }
+       }
     }
 
     m_pointer_record->m_touched[m_pointer_record->m_last_space] = true;
diff --git a/src/chai/ManagedArray_thin.inl b/src/chai/ManagedArray_thin.inl
@@ -242,7 +242,11 @@ CHAI_HOST void ManagedArray<T>::reallocate(size_t new_elems)
        if (new_elems > 0) {
            new_ptr = (T*) allocator.allocate(sizeof(T) * new_elems);
            arrayManager->syncIfNeeded();
+#if !defined(CHAI_THIN_GPU_ALLOCATE)
+           std::memcpy(new_ptr, m_active_pointer, std::min(m_size, new_elems*sizeof(T)));
+#else
            arrayManager->copy(new_ptr, m_active_pointer, std::min(m_size, new_elems*sizeof(T)));
+#endif
            registerTouch(chai::GPU);
        }
 
diff --git a/src/tpl/raja b/src/tpl/raja
@@ -1 +1 @@
-Subproject commit 1d70abf171474d331f1409908bdf1b1c3fe19222
+Subproject commit 6e36a94380adbe88fed11a3213fc08461428ece0
