Merge pull request #281 from LLNL/main

Merge v2024.06.1 Release Changes back to develop
LLNL · Jul 15, 2024 · a5dde1d · a5dde1d
2 parents 858faca + 8f20d80
commit a5dde1d
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 47 deletions.
diff --git a/.gitlab/scripts.yml b/.gitlab/scripts.yml
@@ -78,38 +78,12 @@
   script:
     - INSTALL_DIR=/usr/gapps/Spheral/$SYS_TYPE/spheral-$SPHERAL_REV_STR
     - DEV_PKG_NAME=$SYS_TYPE-spheral-dev-pkg-$SPHERAL_REV_STR
-    - DEV_PKG_PATH=$INSTALL_DIR/$DEV_PKG_NAME
+
+    - env SPHERAL_REV_STR=$SPHERAL_REV_STR INSTALL_DIR=$INSTALL_DIR SPEC=$SPEC SPACK_PKG_NAME=$SPACK_PKG_NAME BUILD_ALLOC="$BUILD_ALLOC" SCRIPT_DIR=$SCRIPT_DIR
+      bash ./$SCRIPT_DIR/lc/generate-buildcache.sh
+
     - echo $INSTALL_DIR &> install-dir.txt
     - echo $DEV_PKG_NAME &> dev-pkg-name.txt
-
-    # *** Copy spheral src and all submodules. ***
-    - mkdir -p $DEV_PKG_PATH/resources && cp -a $CI_PROJECT_DIR/. $DEV_PKG_PATH
-
-    ### Initialize the upstream spack instance for this platform.
-    ###   - We do this to load system configs / externals for this machine.
-    - ./$SCRIPT_DIR/devtools/tpl-manager.py --init-only --spheral-spack-dir=$UPSTREAM_DIR --spec=none
-    - source $UPSTREAM_DIR/spack/share/spack/setup-env.sh
-
-    ### Installation Directory w/ Spheral rev numbers.
-
-    ### Create a temporary spack environement with only the TPL specs for this specific commit of Spheral
-    - spack env create -d $INSTALL_DIR
-    - spack env activate $INSTALL_DIR
-    - spack add $SPACK_PKG_NAME@develop%$SPEC
-    - spack concretize --fresh -f
-
-    # *** Pre-built binaries for $SYS_TYPE. ***
-    - spack buildcache create -auf -d $DEV_PKG_PATH/resources $(spack find --format /{hash})
-    # *** All TPL tar files. ***
-    - spack mirror create -a -d $DEV_PKG_PATH/resources/mirror --exclude-specs "llnlspheral spheral"
-    # *** Spack bootstrapping resources. ***
-    - spack bootstrap mirror --binary-packages $DEV_PKG_PATH/resources
-
-    ### Wrap it all up. 
-    - tar -czvf "$DEV_PKG_PATH".tar.gz -C $INSTALL_DIR $DEV_PKG_NAME
-
-    ### Cleanup
-    - rm -rf $DEV_PKG_PATH
 
   artifacts:
     paths:

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,13 +1,23 @@
-Version vYYYY.MM.p -- Release date YYYY-MM-DD
+Version v2024.06.1 -- Release date 2024-07-09
+==============================================
+
+  * Important Notes:
+    * This is a patch release for v2024.06.0.
+
+  * Bug Fixes / improvements:
+    * CD pipeline hotfix for installing release builds on LC machines.
+    * Fixes an issue with the use of the axom::quest::SignedDistance interface. 
+
+Version v2024.06.0 -- Release date 2024-06-27
 ==============================================
   * Important Notes:
     * External users of the code will need to supply config files for tpl-manager to find system libraries correctly. Steps to do this are detailed in the external user build guide. 
 
 Notable changes include:
 
-  * New features/ API changes:
-    * added MFV hydro from Hopkins 2015 with extension for ALE options
-    * Adding optional user specified smoothing scale method for SPH, FSISPH, and CRKSPH
+  * New features / API changes:
+    * Added MFV hydro from Hopkins 2015 with extension for ALE options.
+    * Adding optional user specified smoothing scale method for SPH, FSISPH, and CRKSPH.
 
   * Build changes / improvements:
     * PYBind11 libraries no longer depend on the structure of the PYB11 source directory.

diff --git a/cmake/SpheralVersion.cmake b/cmake/SpheralVersion.cmake
@@ -1 +1 @@
-set(SPHERAL_VERSION 2024.01.1)
+set(SPHERAL_VERSION 2024.06.1)
diff --git a/docs/conf.py b/docs/conf.py
@@ -26,9 +26,9 @@
 author = 'J. Michael Owen'
 
 # The short X.Y version
-version = '2024.01.1'
+version = '2024.06.1'
 # The full version, including alpha/beta/rc tags
-release = '2024.01.1'
+release = '2024.06.1'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/docs/conf.py.in b/docs/conf.py.in
@@ -26,9 +26,9 @@ copyright = '2012, LLNS'
 author = 'J. Michael Owen'
 
 # The short X.Y version
-version = '2024.01.1'
+version = '2024.06.1'
 # The full version, including alpha/beta/rc tags
-release = '2024.01.1'
+release = '2024.06.1'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/docs/developer/dev/continuous_deployment.rst b/docs/developer/dev/continuous_deployment.rst
@@ -9,11 +9,10 @@ to their environment.
 
 On LC systems we maintain:
   * ``Spheral/risky``
+  * ``Spheral/2024.06.1``
   * ``Spheral/2024.01.1``
   * ``Spheral/2023.06.0``
   * ``Spheral/2023.03.1``
-  * ``Spheral/2023.03.0`` (deprecated as of TOSS4 upgrade)
-  * ``Spheral/2022.06.0`` (deprecated as of TOSS4 upgrade)
 
 Spheral/risky
 =============

diff --git a/scripts/lc/generate-buildcache.sh b/scripts/lc/generate-buildcache.sh
@@ -0,0 +1,46 @@
+trap 'echo "# $BASH_COMMAND"' DEBUG
+
+SPEC=${SPEC:-gcc@10.3.1}
+SPACK_PKG_NAME=${SPACK_PKG_NAME:-spheral}
+SPHERAL_SPEC=$SPACK_PKG_NAME@develop%$SPEC
+echo $SPHERAL_SPEC
+
+INSTALL_DIR=${INSTALL_DIR:-$PWD/../$SYS_TYPE/spheral-cache}
+SPHERAL_REV_STR=${SPHERAL_REV_STR:-undefined}
+
+
+UPSTREAM_DIR=${UPSTREAM_DIR:-/usr/WS2/sduser/Spheral/spack_upstream/0.22}
+SCRIPT_DIR=${SCRIPT_DIR:-'scripts'}
+DEV_PKG_NAME=$SYS_TYPE-spheral-dev-pkg-$SPHERAL_REV_STR
+DEV_PKG_DIR=$INSTALL_DIR/$DEV_PKG_NAME
+
+CI_PROJECT_DIR=${CI_PROJECT_DIR:-$PWD}
+
+RESOURCE_DIR=$DEV_PKG_DIR/resources
+echo $RESOURCE_DIR
+
+echo $INSTALL_DIR
+#echo $INSTALL_DIR &> install-dir.txt
+
+echo $DEV_PKG_DIR
+#echo $DEV_PKG_NAME &> dev-pkg-name.txt
+
+rm -rf $INSTALL_DIR
+mkdir -p $RESOURCE_DIR && cp -a $CI_PROJECT_DIR/. $DEV_PKG_DIR
+
+./$SCRIPT_DIR/devtools/tpl-manager.py --init-only --spheral-spack-dir=$UPSTREAM_DIR --spec=none
+source $UPSTREAM_DIR/spack/share/spack/setup-env.sh
+
+spack env rm -y -f $INSTALL_DIR
+spack env create -d $INSTALL_DIR
+spack env activate $INSTALL_DIR
+spack add $SPHERAL_SPEC
+spack concretize -f --fresh --deprecated
+
+spack mirror create -a -d $RESOURCE_DIR/mirror --exclude-specs "llnlspheral spheral"
+spack buildcache push -auf $RESOURCE_DIR/mirror $(spack find --format /{hash})
+
+spack bootstrap mirror --binary-packages $RESOURCE_DIR
+
+tar -czf $DEV_PKG_DIR.tar.gz -C $INSTALL_DIR $DEV_PKG_NAME
+
diff --git a/scripts/lc/install-from-dev-pkg.sh b/scripts/lc/install-from-dev-pkg.sh
@@ -22,16 +22,19 @@ echo $INSTALL_DIR
 echo $SCRIPT_DIR
 echo $BUILD_ALLOC
 
+rm -rf $INSTALL_DIR
 mkdir -p $INSTALL_DIR
 
 ./$SCRIPT_DIR/devtools/tpl-manager.py --spack-url $SPACK_URL --init-only --spec=none --no-upstream --spheral-spack-dir $INSTALL_DIR/spheral-spack-tpls
 
 source $INSTALL_DIR/spheral-spack-tpls/spack/share/spack/setup-env.sh
 spack bootstrap add --trust local-sources $PWD/resources/metadata/sources
 spack bootstrap add --trust local-binaries $PWD/resources/metadata/binaries
-spack mirror add spheral-mirror $PWD/resources/mirror
-spack mirror add spheral-cache $PWD/resources
-spack buildcache update-index -d $PWD/resources
+spack mirror rm spheral-mirror
+spack mirror rm spheral-cache
+spack mirror add --unsigned spheral-mirror $PWD/resources/mirror
+spack mirror add --unsigned spheral-cache $PWD/resources
+spack buildcache update-index $PWD/resources/mirror
 
 $BUILD_ALLOC spack install --fresh --deprecated --no-check-signature --only dependencies $SPACK_PKG_NAME@develop%$SPEC
 

diff --git a/scripts/spack/configs/toss_4_x86_64_ib/packages.yaml b/scripts/spack/configs/toss_4_x86_64_ib/packages.yaml
@@ -10,6 +10,7 @@ packages:
       mpi: [mvapich2]
       pkgconfig: [pkg-config]
       pil: [py-pillow]
+      jpeg: [libjpeg]
       zlib-api: [zlib]
   cmake:
     version: [3.23.1]

diff --git a/src/Geometry/GeomPolyhedron.cc b/src/Geometry/GeomPolyhedron.cc
@@ -984,9 +984,7 @@ buildAxomData() const {
   mSurfaceMeshQueryPtr = new AxOctree(bb, mSurfaceMeshPtr);
   mSurfaceMeshQueryPtr->generateIndex();
   mSignedDistancePtr = new AxDistance(mSurfaceMeshPtr,
-                                      true,               // is_watertight
-                                      25,                 // max_objects
-                                      10);                // max_levels
+                                      true);               // is_watertight
 }
 
 //------------------------------------------------------------------------------