From f16b258333f2136146bd55578ba571eb734529d2 Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Thu, 27 Jun 2024 15:57:06 -0700 Subject: [PATCH 01/15] Changes for documenting 2024.06.0 release. --- RELEASE_NOTES.md | 8 ++++---- cmake/SpheralVersion.cmake | 2 +- docs/conf.py | 4 ++-- docs/conf.py.in | 4 ++-- docs/developer/dev/continuous_deployment.rst | 3 +-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 55b8d4ed6..231bbd7d9 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,13 +1,13 @@ -Version vYYYY.MM.p -- Release date YYYY-MM-DD +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 index 0e62b972d..d894dfec7 100644 --- a/cmake/SpheralVersion.cmake +++ b/cmake/SpheralVersion.cmake @@ -1 +1 @@ -set(SPHERAL_VERSION 2024.01.1) +set(SPHERAL_VERSION 2024.06.0) diff --git a/docs/conf.py b/docs/conf.py index c6b2d7ed4..ac0e4fea6 100644 --- 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.0' # The full version, including alpha/beta/rc tags -release = '2024.01.1' +release = '2024.06.0' # -- General configuration --------------------------------------------------- diff --git a/docs/conf.py.in b/docs/conf.py.in index 5c6b055e1..312a41083 100644 --- 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.0' # The full version, including alpha/beta/rc tags -release = '2024.01.1' +release = '2024.06.0' # -- General configuration --------------------------------------------------- diff --git a/docs/developer/dev/continuous_deployment.rst b/docs/developer/dev/continuous_deployment.rst index dca78ad2d..623d6cbaf 100644 --- 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.0`` * ``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 ============= From ed61f3a30f54863bfbf3fc283a5c3e58e988468c Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Thu, 4 Jul 2024 13:51:26 -0700 Subject: [PATCH 02/15] Adding script for generating buildcache / dev-pkg tarball w/ spack buildcache fixes; buildcache fixes in install script; gitlab build_dev_pkg job uses new script for generating build_cache. --- .gitlab/scripts.yml | 63 ++++++++++++++++-------------- scripts/lc/generate-buildcache.sh | 47 ++++++++++++++++++++++ scripts/lc/install-from-dev-pkg.sh | 3 +- 3 files changed, 82 insertions(+), 31 deletions(-) create mode 100644 scripts/lc/generate-buildcache.sh diff --git a/.gitlab/scripts.yml b/.gitlab/scripts.yml index 4b3612395..f1205e46f 100644 --- a/.gitlab/scripts.yml +++ b/.gitlab/scripts.yml @@ -77,39 +77,42 @@ extends: [.spheral_rev_str] 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 + #- 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 + - 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 + ## *** 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/scripts/lc/generate-buildcache.sh b/scripts/lc/generate-buildcache.sh new file mode 100644 index 000000000..b3051912c --- /dev/null +++ b/scripts/lc/generate-buildcache.sh @@ -0,0 +1,47 @@ +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 + +UPSTREAM_DIR=${UPSTREAM_DIR:-/usr/WS2/sduser/Spheral/spack_upstream/0.22} +SCRIPT_DIR=${SCRIPT_DIR:-'scripts'} +SPHERAL_REV_STRING=${SPHERAL_REV_STRING:-undefined} +INSTALL_DIR=${INSTALL_DIR:-$PWD/../$SYS_TYPE/spheral-cache} +DEV_PKG_NAME=$SYS_TYPE-spheral-dev-pkg-$SPHERAL_REV_STRING +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 --fresh -f + +spack mirror create -a -d $RESOURCE_DIR/mirror --exclude-specs "llnlspheral spheral" +spack mirror set --unsigned $RESOURCE_DIR/mirror + +spack buildcache push -auf $RESOURCE_DIR/mirror $(spack find --format /{hash}) + +spack bootstrap mirror --binary-packages $RESOURCE_DIR + +tar -czvf $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 index 95eba9812..cd082b7ab 100644 --- a/scripts/lc/install-from-dev-pkg.sh +++ b/scripts/lc/install-from-dev-pkg.sh @@ -22,6 +22,7 @@ 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 @@ -31,7 +32,7 @@ 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 buildcache update-index $PWD/resources/mirror $BUILD_ALLOC spack install --fresh --deprecated --no-check-signature --only dependencies $SPACK_PKG_NAME@develop%$SPEC From 52384f3f4f8efeed1512486ead07fbfcfd909df7 Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Thu, 4 Jul 2024 13:55:39 -0700 Subject: [PATCH 03/15] Missing changes to buildcache script. --- scripts/lc/generate-buildcache.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/lc/generate-buildcache.sh b/scripts/lc/generate-buildcache.sh index b3051912c..adbf23300 100644 --- a/scripts/lc/generate-buildcache.sh +++ b/scripts/lc/generate-buildcache.sh @@ -2,15 +2,16 @@ 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'} -SPHERAL_REV_STRING=${SPHERAL_REV_STRING:-undefined} -INSTALL_DIR=${INSTALL_DIR:-$PWD/../$SYS_TYPE/spheral-cache} -DEV_PKG_NAME=$SYS_TYPE-spheral-dev-pkg-$SPHERAL_REV_STRING +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} From 2cb00291ab15290bfd3fafca453a3da72f20cc88 Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Fri, 5 Jul 2024 14:10:21 -0700 Subject: [PATCH 04/15] Add mirrors as unsigned during install script; No verbose on dev-pkg zip. --- scripts/lc/generate-buildcache.sh | 4 +--- scripts/lc/install-from-dev-pkg.sh | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/lc/generate-buildcache.sh b/scripts/lc/generate-buildcache.sh index adbf23300..bbb35747d 100644 --- a/scripts/lc/generate-buildcache.sh +++ b/scripts/lc/generate-buildcache.sh @@ -38,11 +38,9 @@ spack add $SPHERAL_SPEC spack concretize --fresh -f spack mirror create -a -d $RESOURCE_DIR/mirror --exclude-specs "llnlspheral spheral" -spack mirror set --unsigned $RESOURCE_DIR/mirror - spack buildcache push -auf $RESOURCE_DIR/mirror $(spack find --format /{hash}) spack bootstrap mirror --binary-packages $RESOURCE_DIR -tar -czvf $DEV_PKG_DIR.tar.gz -C $INSTALL_DIR $DEV_PKG_NAME +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 index cd082b7ab..b79ef22cb 100644 --- a/scripts/lc/install-from-dev-pkg.sh +++ b/scripts/lc/install-from-dev-pkg.sh @@ -30,8 +30,8 @@ mkdir -p $INSTALL_DIR 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 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 From 5a521cbc85f565b86e4905a22ea7209360e2c7cc Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Mon, 8 Jul 2024 10:47:38 -0700 Subject: [PATCH 05/15] Generating host-config unsing spack install; Syncing scripts.yaml; Turning off non CD jobs. --- .gitlab-ci.yml | 10 ++++----- .gitlab/scripts.yml | 33 ++---------------------------- scripts/lc/install-from-dev-pkg.sh | 6 +++--- 3 files changed, 10 insertions(+), 39 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8a89d492..f1cf2a137 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,9 +16,9 @@ variables: - SPHERAL_REV_STR="$SPHERAL_REV" stages: - - build_and_install - - run_ats - - update_tpls + # - build_and_install + # - run_ats + # - update_tpls - generate_buildcache - install_production - update_permissions @@ -29,6 +29,6 @@ include: - local: .gitlab/machines.yml - local: .gitlab/scripts.yml - local: .gitlab/specs.yml - - local: .gitlab/jobs-mpi.yml - - local: .gitlab/jobs-seq.yml + # - local: .gitlab/jobs-mpi.yml + # - local: .gitlab/jobs-seq.yml - local: .gitlab/jobs-prod.yml diff --git a/.gitlab/scripts.yml b/.gitlab/scripts.yml index f1205e46f..7dea9688e 100644 --- a/.gitlab/scripts.yml +++ b/.gitlab/scripts.yml @@ -77,42 +77,13 @@ extends: [.spheral_rev_str] 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 + - DEV_PKG_NAME=$SYS_TYPE-spheral-dev-pkg-$SPHERAL_REV_STR - 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/scripts/lc/install-from-dev-pkg.sh b/scripts/lc/install-from-dev-pkg.sh index b79ef22cb..60698f2a6 100644 --- a/scripts/lc/install-from-dev-pkg.sh +++ b/scripts/lc/install-from-dev-pkg.sh @@ -30,13 +30,13 @@ mkdir -p $INSTALL_DIR 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 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 - -$BUILD_ALLOC ./$SCRIPT_DIR/devtools/tpl-manager.py --spack-url $SPACK_URL --no-upstream --spheral-spack-dir $INSTALL_DIR/spheral-spack-tpls --spec $SPEC +$BUILD_ALLOC spack install --fresh --deprecated --no-check-signature -u initconfig "$SPACK_PKG_NAME@develop%$SPEC dev_path=$PWD" HOST_CONFIG_FILE=$(ls -t | grep -E "*\.cmake" | head -1) $BUILD_ALLOC ./$SCRIPT_DIR/devtools/host-config-build.py --host-config $HOST_CONFIG_FILE -i $INSTALL_DIR --build --no-clean From 71145e5934cf25a073041be56ecbe5aa88d1f13a Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Mon, 8 Jul 2024 10:53:03 -0700 Subject: [PATCH 06/15] Turn on update-tpl stage --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1cf2a137..0b5b4df71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: stages: # - build_and_install # - run_ats - # - update_tpls + - update_tpls - generate_buildcache - install_production - update_permissions From a5b18de08508801b9b5232ede34e0c880b77bab3 Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Mon, 8 Jul 2024 11:51:37 -0700 Subject: [PATCH 07/15] try installing dependecies first --- scripts/lc/install-from-dev-pkg.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/lc/install-from-dev-pkg.sh b/scripts/lc/install-from-dev-pkg.sh index 60698f2a6..71f30828f 100644 --- a/scripts/lc/install-from-dev-pkg.sh +++ b/scripts/lc/install-from-dev-pkg.sh @@ -36,6 +36,7 @@ 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 $BUILD_ALLOC spack install --fresh --deprecated --no-check-signature -u initconfig "$SPACK_PKG_NAME@develop%$SPEC dev_path=$PWD" HOST_CONFIG_FILE=$(ls -t | grep -E "*\.cmake" | head -1) From 762981cfe99c3c5eaf0debbddde59c7fe7e212a4 Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Mon, 8 Jul 2024 14:26:38 -0700 Subject: [PATCH 08/15] --deprecated when concretizing TPLs for buildcache --- scripts/lc/generate-buildcache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lc/generate-buildcache.sh b/scripts/lc/generate-buildcache.sh index bbb35747d..f613f2682 100644 --- a/scripts/lc/generate-buildcache.sh +++ b/scripts/lc/generate-buildcache.sh @@ -35,7 +35,7 @@ spack env rm -y -f $INSTALL_DIR spack env create -d $INSTALL_DIR spack env activate $INSTALL_DIR spack add $SPHERAL_SPEC -spack concretize --fresh -f +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}) From 968f6f4b850e085e6819f5531b890e9116fc03d1 Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Mon, 8 Jul 2024 16:14:12 -0700 Subject: [PATCH 09/15] libjpeg as the jpeg provider. --- scripts/spack/configs/toss_4_x86_64_ib/packages.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/spack/configs/toss_4_x86_64_ib/packages.yaml b/scripts/spack/configs/toss_4_x86_64_ib/packages.yaml index d843aae97..5ed6fb6c2 100644 --- 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] From 02a29444b058ef589ef15a31853c64b65e583896 Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Mon, 8 Jul 2024 17:59:05 -0700 Subject: [PATCH 10/15] Revert back to using tpl-manager to generate the host-config. dev_path doesn't seem to work on CZ?? --- scripts/lc/install-from-dev-pkg.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/lc/install-from-dev-pkg.sh b/scripts/lc/install-from-dev-pkg.sh index 71f30828f..a2161b7e4 100644 --- a/scripts/lc/install-from-dev-pkg.sh +++ b/scripts/lc/install-from-dev-pkg.sh @@ -37,7 +37,9 @@ 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 -$BUILD_ALLOC spack install --fresh --deprecated --no-check-signature -u initconfig "$SPACK_PKG_NAME@develop%$SPEC dev_path=$PWD" + +$BUILD_ALLOC ./$SCRIPT_DIR/devtools/tpl-manager.py --spack-url $SPACK_URL --no-upstream --spheral-spack-dir $INSTALL_DIR/spheral-spack-tpls --spec $SPEC +#$BUILD_ALLOC spack install --fresh --deprecated --no-check-signature -u initconfig "$SPACK_PKG_NAME@develop%$SPEC dev_path=$PWD" HOST_CONFIG_FILE=$(ls -t | grep -E "*\.cmake" | head -1) $BUILD_ALLOC ./$SCRIPT_DIR/devtools/host-config-build.py --host-config $HOST_CONFIG_FILE -i $INSTALL_DIR --build --no-clean From f58a2fe84175bdb7bb457056627af135af3d2cbd Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Mon, 8 Jul 2024 20:46:59 -0700 Subject: [PATCH 11/15] Restore full CI pipeline --- .gitlab-ci.yml | 8 ++++---- scripts/lc/install-from-dev-pkg.sh | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b5b4df71..c8a89d492 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,8 +16,8 @@ variables: - SPHERAL_REV_STR="$SPHERAL_REV" stages: - # - build_and_install - # - run_ats + - build_and_install + - run_ats - update_tpls - generate_buildcache - install_production @@ -29,6 +29,6 @@ include: - local: .gitlab/machines.yml - local: .gitlab/scripts.yml - local: .gitlab/specs.yml - # - local: .gitlab/jobs-mpi.yml - # - local: .gitlab/jobs-seq.yml + - local: .gitlab/jobs-mpi.yml + - local: .gitlab/jobs-seq.yml - local: .gitlab/jobs-prod.yml diff --git a/scripts/lc/install-from-dev-pkg.sh b/scripts/lc/install-from-dev-pkg.sh index a2161b7e4..b4b6a1c6f 100644 --- a/scripts/lc/install-from-dev-pkg.sh +++ b/scripts/lc/install-from-dev-pkg.sh @@ -39,7 +39,6 @@ spack buildcache update-index $PWD/resources/mirror $BUILD_ALLOC spack install --fresh --deprecated --no-check-signature --only dependencies $SPACK_PKG_NAME@develop%$SPEC $BUILD_ALLOC ./$SCRIPT_DIR/devtools/tpl-manager.py --spack-url $SPACK_URL --no-upstream --spheral-spack-dir $INSTALL_DIR/spheral-spack-tpls --spec $SPEC -#$BUILD_ALLOC spack install --fresh --deprecated --no-check-signature -u initconfig "$SPACK_PKG_NAME@develop%$SPEC dev_path=$PWD" HOST_CONFIG_FILE=$(ls -t | grep -E "*\.cmake" | head -1) $BUILD_ALLOC ./$SCRIPT_DIR/devtools/host-config-build.py --host-config $HOST_CONFIG_FILE -i $INSTALL_DIR --build --no-clean From a244938b7000c481008ff6baa55f7bc0de8bfcbf Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Mon, 8 Jul 2024 21:12:13 -0700 Subject: [PATCH 12/15] Release notes for v2024.06.1. --- RELEASE_NOTES.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 231bbd7d9..a8c870544 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,12 @@ +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. + Version v2024.06.0 -- Release date 2024-06-27 ============================================== * Important Notes: From b1dd8b5e6b213d70d6f559ad6ee60a32e30cf615 Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Tue, 9 Jul 2024 11:58:35 -0700 Subject: [PATCH 13/15] GeomPolyhedron Axom API bug. --- src/Geometry/GeomPolyhedron.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Geometry/GeomPolyhedron.cc b/src/Geometry/GeomPolyhedron.cc index ec368a723..868f61e8f 100644 --- 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 } //------------------------------------------------------------------------------ From 961700c8eb855b58990df3f2ecca929e5f795795 Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Tue, 9 Jul 2024 12:00:35 -0700 Subject: [PATCH 14/15] Adding release note on axom SignedDistance API bug. --- RELEASE_NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index a8c870544..f3d0df693 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -6,6 +6,7 @@ Version v2024.06.1 -- Release date 2024-07-09 * 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 ============================================== From 1945b9e6d1e32e5ac9dd77221168982488a6f860 Mon Sep 17 00:00:00 2001 From: mdavis36 Date: Wed, 10 Jul 2024 11:03:46 -0700 Subject: [PATCH 15/15] 2024.06.1 version information. --- cmake/SpheralVersion.cmake | 2 +- docs/conf.py | 4 ++-- docs/conf.py.in | 4 ++-- docs/developer/dev/continuous_deployment.rst | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/SpheralVersion.cmake b/cmake/SpheralVersion.cmake index d894dfec7..aef46be38 100644 --- a/cmake/SpheralVersion.cmake +++ b/cmake/SpheralVersion.cmake @@ -1 +1 @@ -set(SPHERAL_VERSION 2024.06.0) +set(SPHERAL_VERSION 2024.06.1) diff --git a/docs/conf.py b/docs/conf.py index ac0e4fea6..df9b1060e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -26,9 +26,9 @@ author = 'J. Michael Owen' # The short X.Y version -version = '2024.06.0' +version = '2024.06.1' # The full version, including alpha/beta/rc tags -release = '2024.06.0' +release = '2024.06.1' # -- General configuration --------------------------------------------------- diff --git a/docs/conf.py.in b/docs/conf.py.in index 312a41083..b7d23f29a 100644 --- 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.06.0' +version = '2024.06.1' # The full version, including alpha/beta/rc tags -release = '2024.06.0' +release = '2024.06.1' # -- General configuration --------------------------------------------------- diff --git a/docs/developer/dev/continuous_deployment.rst b/docs/developer/dev/continuous_deployment.rst index 623d6cbaf..aa8843e7b 100644 --- a/docs/developer/dev/continuous_deployment.rst +++ b/docs/developer/dev/continuous_deployment.rst @@ -9,7 +9,7 @@ to their environment. On LC systems we maintain: * ``Spheral/risky`` - * ``Spheral/2024.06.0`` + * ``Spheral/2024.06.1`` * ``Spheral/2024.01.1`` * ``Spheral/2023.06.0`` * ``Spheral/2023.03.1``