From 8ec62f4ce384611b22ad90b9fe66a516ce6b1caa Mon Sep 17 00:00:00 2001
From: Alan Dayton <6393677+adayton1@users.noreply.github.com>
Date: Tue, 5 Mar 2024 10:38:18 -0800
Subject: [PATCH 1/8] V2024.02.0 RC (#252) (#253)

* main mergeback to develop after v2024.02.0 release
---
 CMakeLists.txt                  | 2 +-
 README.md                       | 2 +-
 RELEASE_NOTES.md                | 2 +-
 docs/sphinx/conf.py             | 4 ++--
 docs/sphinx/conf.py.in          | 4 ++--
 scripts/make_release_tarball.sh | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22d3e583..a21c5518 100644
--- 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 2023.06.0)
+project(Chai LANGUAGES C CXX VERSION 2024.02.0)
 cmake_minimum_required(VERSION 3.14)
 
 include(cmake/SetupChaiOptions.cmake)
diff --git a/README.md b/README.md
index d1446b34..44762dc7 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 [comment]: # (# SPDX-License-Identifier: BSD-3-Clause)
 [comment]: # (#################################################################)
 
-# CHAI v2023.06.0
+# CHAI v2024.02.0
 
 [![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
index f0e02399..9dc23c2f 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -13,7 +13,7 @@ in this file.
 
 The format of this file is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
-## [Unreleased] - Release date yyyy-mm-dd
+## [Version 2024.02.0] - Release date 2024-03-04
 
 ### Added
 - Support for APUs with a single memory space. To use, configure with -DCHAI\_DISABLE\_RM=ON -DCHAI\_GPU\_THIN\_ALLOCATE=ON.
diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
index 4351ebb8..eeba20ee 100644
--- a/docs/sphinx/conf.py
+++ b/docs/sphinx/conf.py
@@ -61,9 +61,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2023.06'
+version = u'2024.02'
 # The full version, including alpha/beta/rc tags.
-release = u'2023.06.0'
+release = u'2024.02.0'
 
 # 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
index 36ff9e64..6905e91f 100644
--- a/docs/sphinx/conf.py.in
+++ b/docs/sphinx/conf.py.in
@@ -60,9 +60,9 @@ author = u''
 # built documents.
 #
 # The short X.Y version.
-version = u'2023.06'
+version = u'2024.02'
 # The full version, including alpha/beta/rc tags.
-release = u'2023.06.0'
+release = u'2024.02.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/scripts/make_release_tarball.sh b/scripts/make_release_tarball.sh
index 7554184f..ebad11cc 100755
--- a/scripts/make_release_tarball.sh
+++ b/scripts/make_release_tarball.sh
@@ -7,7 +7,7 @@
 ##############################################################################
 
 TAR_CMD=gtar
-VERSION=2023.06.0
+VERSION=2024.02.0
 
 git archive --prefix=chai-${VERSION}/ -o chai-${VERSION}.tar HEAD 2> /dev/null
 

From 3dd098a7c7a7cc609ecd6f2b357de84ce1e1b384 Mon Sep 17 00:00:00 2001
From: Adrien Bernede <51493078+adrienbernede@users.noreply.github.com>
Date: Tue, 26 Mar 2024 23:23:41 +0100
Subject: [PATCH 2/8] Update radiuss-shared-ci, fix reproducer, update spack,
 update RSC (#254)

---
 .gitlab-ci.yml                | 4 ++--
 .gitlab/jobs/corona.yml       | 3 ++-
 .gitlab/jobs/lassen.yml       | 3 ++-
 .gitlab/jobs/poodle.yml       | 3 ++-
 .gitlab/jobs/ruby.yml         | 3 ++-
 .gitlab/jobs/tioga.yml        | 3 ++-
 .uberenv_config.json          | 5 ++---
 scripts/radiuss-spack-configs | 2 +-
 8 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9908db90..12ff2585 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,7 +73,7 @@ stages:
     include:
       - local: '.gitlab/custom-jobs-and-variables.yml'
       - project: 'radiuss/radiuss-shared-ci'
-        ref: 'v2023.12.0'
+        ref: 'v2023.12.3'
         file: 'pipelines/${CI_MACHINE}.yml'
       - artifact: '${CI_MACHINE}-jobs.yml'
         job: 'generate-job-lists'
@@ -84,7 +84,7 @@ stages:
 include:
   # [Optional] checks preliminary to running the actual CI test
   #- project: 'radiuss/radiuss-shared-ci'
-  #  ref: 'v2023.12.0'
+  #  ref: 'v2023.12.3'
   #  file: 'preliminary-ignore-draft-pr.yml'
   # pipelines subscribed by the project
   - local: '.gitlab/subscribed-pipelines.yml'
diff --git a/.gitlab/jobs/corona.yml b/.gitlab/jobs/corona.yml
index 390ce1fc..74b766a4 100644
--- a/.gitlab/jobs/corona.yml
+++ b/.gitlab/jobs/corona.yml
@@ -6,7 +6,8 @@
 ##############################################################################
 
 # Override reproducer section to define project specific variables.
-.corona_reproducer_vars: &corona_reproducer_vars
+.corona_reproducer_vars:
+  script:
     - |
       echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
       echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
diff --git a/.gitlab/jobs/lassen.yml b/.gitlab/jobs/lassen.yml
index d8003b1d..adcd4728 100644
--- a/.gitlab/jobs/lassen.yml
+++ b/.gitlab/jobs/lassen.yml
@@ -6,7 +6,8 @@
 ##############################################################################
 
 # Override reproducer section to define project specific variables.
-.lassen_reproducer_vars: &lassen_reproducer_vars
+.lassen_reproducer_vars:
+  script:
     - |
       echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
       echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
diff --git a/.gitlab/jobs/poodle.yml b/.gitlab/jobs/poodle.yml
index 848cf125..2d0f63b5 100644
--- a/.gitlab/jobs/poodle.yml
+++ b/.gitlab/jobs/poodle.yml
@@ -6,7 +6,8 @@
 ###############################################################################
 
 # Override reproducer section to define projet specific variables.
-.poodle_reproducer_vars: &poodle_reproducer_vars
+.poodle_reproducer_vars:
+  script:
     - |
       echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
       echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
diff --git a/.gitlab/jobs/ruby.yml b/.gitlab/jobs/ruby.yml
index 8e26fa3c..d680ba28 100644
--- a/.gitlab/jobs/ruby.yml
+++ b/.gitlab/jobs/ruby.yml
@@ -6,7 +6,8 @@
 ###############################################################################
 
 # Override reproducer section to define project specific variables.
-.ruby_reproducer_vars: &ruby_reproducer_vars
+.ruby_reproducer_vars:
+  script:
     - |
       echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
       echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml
index 27eb3c99..b9fcaebc 100644
--- a/.gitlab/jobs/tioga.yml
+++ b/.gitlab/jobs/tioga.yml
@@ -6,7 +6,8 @@
 ##############################################################################
 
 # Override reproducer section to define project specific variables.
-.tioga_reproducer_vars: &tioga_reproducer_vars
+.tioga_reproducer_vars:
+  script:
     - |
       echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
       echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
diff --git a/.uberenv_config.json b/.uberenv_config.json
index 3792b3ad..1dd88926 100644
--- a/.uberenv_config.json
+++ b/.uberenv_config.json
@@ -4,11 +4,10 @@
 "package_final_phase" : "initconfig",
 "package_source_dir" : "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_branch": "develop-2024-01-21",
+"spack_branch": "develop-2024-02-18",
 "spack_activate" : {},
 "spack_configs_path": "scripts/radiuss-spack-configs",
 "spack_packages_path": "scripts/radiuss-spack-configs/packages",
 "spack_concretizer": "clingo",
-"spack_setup_clingo": false,
-"debug": true
+"spack_setup_clingo": false
 }
diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index 12fd9cfd..8938041f 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit 12fd9cfd57c11ed0c961234833a4a8a89cefd491
+Subproject commit 8938041fb20dde5e55ae2014aa71333076d139c9

From 28a5763b945adb94707eea8899a5ecd2b059bc5e Mon Sep 17 00:00:00 2001
From: Alan Dayton <dayton8@llnl.gov>
Date: Tue, 16 Apr 2024 08:41:18 -0700
Subject: [PATCH 3/8] Update to BLT v0.6.2

---
 blt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blt b/blt
index 058b312f..9ff77344 160000
--- a/blt
+++ b/blt
@@ -1 +1 @@
-Subproject commit 058b312f8a5ef305e12a4380deaa13d618eff54e
+Subproject commit 9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35

From f9818f17c8c27630e788b5125d433d7b1f8b1601 Mon Sep 17 00:00:00 2001
From: Alan Dayton <dayton8@llnl.gov>
Date: Tue, 16 Apr 2024 08:43:00 -0700
Subject: [PATCH 4/8] Update to RAJA v2024.02.1

---
 src/tpl/raja | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tpl/raja b/src/tpl/raja
index 82d1b926..3ada0950 160000
--- a/src/tpl/raja
+++ b/src/tpl/raja
@@ -1 +1 @@
-Subproject commit 82d1b926ada0fbb15a4a6e0adadc30c715cfda7b
+Subproject commit 3ada0950b0774ec907d30a9eceaf6af7478b833b

From e9da4938f3ee66e262505c20d6122489acc450f9 Mon Sep 17 00:00:00 2001
From: Alan Dayton <dayton8@llnl.gov>
Date: Tue, 16 Apr 2024 08:43:54 -0700
Subject: [PATCH 5/8] Update to Umpire v2024.02.1

---
 src/tpl/umpire | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tpl/umpire b/src/tpl/umpire
index 1db3fef9..3058d562 160000
--- a/src/tpl/umpire
+++ b/src/tpl/umpire
@@ -1 +1 @@
-Subproject commit 1db3fef913a70d8882ca510a4830c77c388873e0
+Subproject commit 3058d562fc707650e904f9321b1ee9bcebad3ae2

From 6c545d95427d23f69d374486b4e67ef4d7419da9 Mon Sep 17 00:00:00 2001
From: Alan Dayton <dayton8@llnl.gov>
Date: Tue, 16 Apr 2024 08:47:38 -0700
Subject: [PATCH 6/8] Update version number and release notes

---
 CMakeLists.txt                  | 2 +-
 README.md                       | 2 +-
 RELEASE_NOTES.md                | 5 +++++
 docs/sphinx/conf.py             | 2 +-
 docs/sphinx/conf.py.in          | 2 +-
 scripts/make_release_tarball.sh | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a21c5518..3c90a514 100644
--- 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 2024.02.0)
+project(Chai LANGUAGES C CXX VERSION 2024.02.1)
 cmake_minimum_required(VERSION 3.14)
 
 include(cmake/SetupChaiOptions.cmake)
diff --git a/README.md b/README.md
index 44762dc7..3ebebc27 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 [comment]: # (# SPDX-License-Identifier: BSD-3-Clause)
 [comment]: # (#################################################################)
 
-# CHAI v2024.02.0
+# CHAI v2024.02.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
index 9dc23c2f..83958c06 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -13,6 +13,11 @@ in this file.
 
 The format of this file is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [Version 2024.02.1] - Release date 2024-04-16
+
+### Changed
+- Updated to BLT v0.6.2, Umpire v2024.02.1, and RAJA v2024.02.1
+
 ## [Version 2024.02.0] - Release date 2024-03-04
 
 ### Added
diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
index eeba20ee..42dbe9ce 100644
--- a/docs/sphinx/conf.py
+++ b/docs/sphinx/conf.py
@@ -63,7 +63,7 @@
 # The short X.Y version.
 version = u'2024.02'
 # The full version, including alpha/beta/rc tags.
-release = u'2024.02.0'
+release = u'2024.02.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
index 6905e91f..7d0ce34a 100644
--- 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'2024.02'
 # The full version, including alpha/beta/rc tags.
-release = u'2024.02.0'
+release = u'2024.02.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/scripts/make_release_tarball.sh b/scripts/make_release_tarball.sh
index ebad11cc..d5c8176e 100755
--- a/scripts/make_release_tarball.sh
+++ b/scripts/make_release_tarball.sh
@@ -7,7 +7,7 @@
 ##############################################################################
 
 TAR_CMD=gtar
-VERSION=2024.02.0
+VERSION=2024.02.1
 
 git archive --prefix=chai-${VERSION}/ -o chai-${VERSION}.tar HEAD 2> /dev/null
 

From b9881b001d2528eb9583c277f70765e622a9992d Mon Sep 17 00:00:00 2001
From: Alan Dayton <dayton8@llnl.gov>
Date: Thu, 18 Apr 2024 10:03:27 -0700
Subject: [PATCH 7/8] Update release date

---
 RELEASE_NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 83958c06..6a188b09 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -13,7 +13,7 @@ in this file.
 
 The format of this file is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
-## [Version 2024.02.1] - Release date 2024-04-16
+## [Version 2024.02.1] - Release date 2024-04-18
 
 ### Changed
 - Updated to BLT v0.6.2, Umpire v2024.02.1, and RAJA v2024.02.1

From 3d339e28042f5dbaefc0801454415c7e2a93b638 Mon Sep 17 00:00:00 2001
From: Alan Dayton <dayton8@llnl.gov>
Date: Fri, 19 Apr 2024 10:06:34 -0700
Subject: [PATCH 8/8] Update release date

---
 RELEASE_NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 6a188b09..04b00e66 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -13,7 +13,7 @@ in this file.
 
 The format of this file is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
-## [Version 2024.02.1] - Release date 2024-04-18
+## [Version 2024.02.1] - Release date 2024-04-19
 
 ### Changed
 - Updated to BLT v0.6.2, Umpire v2024.02.1, and RAJA v2024.02.1