From 861dec0e8f479a62b73153645275618e78c88dd0 Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger Date: Wed, 17 Jan 2024 12:38:23 -0800 Subject: [PATCH 01/27] use earthshot slurm account [deception-rebuild] [incline-rebuild] [newell-rebuild] --- .gitlab/pnnl/base.gitlab-ci.yml | 2 +- buildsystem/spack/deception/env.sh | 2 +- buildsystem/spack/deception/sbatch.sh | 4 ++-- buildsystem/spack/incline/env.sh | 2 +- buildsystem/spack/incline/sbatch.sh | 4 ++-- buildsystem/spack/newell/env.sh | 2 +- buildsystem/spack/newell/sbatch.sh | 4 ++-- tpl/spack | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitlab/pnnl/base.gitlab-ci.yml b/.gitlab/pnnl/base.gitlab-ci.yml index 89c31d5c7..7e060df3a 100644 --- a/.gitlab/pnnl/base.gitlab-ci.yml +++ b/.gitlab/pnnl/base.gitlab-ci.yml @@ -173,7 +173,7 @@ stages: # jobid used in pnnl_after_script_template to cancel job if cancelled or # timed out by gitlab through the UI - jobid=$(sbatch --export=ALL -A EXASGD $SLURM_ARGS -p $SLURM_Q -o $output -e $output -t 1:00:00 $WORKDIR/buildsystem/build.sh $SCRIPT_ARGS) + jobid=$(sbatch --export=ALL -A earthshot $SLURM_ARGS -p $SLURM_Q -o $output -e $output -t 1:00:00 $WORKDIR/buildsystem/build.sh $SCRIPT_ARGS) export jobid=$(echo $jobid | cut -f4 -d' ') partition=$(squeue -j $jobid -h --format="%P") diff --git a/buildsystem/spack/deception/env.sh b/buildsystem/spack/deception/env.sh index 3cfb361a1..0ed982abf 100644 --- a/buildsystem/spack/deception/env.sh +++ b/buildsystem/spack/deception/env.sh @@ -15,7 +15,7 @@ module load openmpi/4.1.0mlx5.0 # Define environment variables for where spack stores key files # For now, SPACK_INSTALL is the path where everything spack related is installed # If you want to modify the module install path, edit the spack.yaml manually -BASE=/qfs/projects/exasgd/src/deception-ci +BASE=/qfs/projects/earthshot/src/deception-ci export SPACK_INSTALL=$BASE/install export SPACK_MODULES=ci-modules export SPACK_CACHE=$BASE/../$(whoami)/spack-cache diff --git a/buildsystem/spack/deception/sbatch.sh b/buildsystem/spack/deception/sbatch.sh index 0a72215aa..1702544ef 100755 --- a/buildsystem/spack/deception/sbatch.sh +++ b/buildsystem/spack/deception/sbatch.sh @@ -1,5 +1,5 @@ #!/bin/bash -#SBATCH -A exasgd +#SBATCH -A earthshot #SBATCH -p slurm #SBATCH -N 1 #SBATCH -n 64 @@ -42,7 +42,7 @@ cleanup() { # Assuming that you already have a binary mirror configured export MY_CLUSTER=deception -cp /qfs/projects/exasgd/src/coinhsl-archive-2019.05.21.tar.gz . && +cp /qfs/projects/earthshot/src/coinhsl-archive-2019.05.21.tar.gz . && . buildsystem/spack/load_spack.sh && # spack clean -abm && # shouldn't run this everytime... spack develop --no-clone --path=$(pwd) exago@develop && diff --git a/buildsystem/spack/incline/env.sh b/buildsystem/spack/incline/env.sh index 61430aa66..1772ff473 100644 --- a/buildsystem/spack/incline/env.sh +++ b/buildsystem/spack/incline/env.sh @@ -24,7 +24,7 @@ module load python/3.7.0 export SPACK_CC=$(which gcc) export SPACK_CXX=$(which g++) -BASE=/qfs/projects/exasgd/src/ci-incline +BASE=/qfs/projects/earthshot/src/incline-ci export SPACK_INSTALL=$BASE/install export SPACK_MODULES=modules diff --git a/buildsystem/spack/incline/sbatch.sh b/buildsystem/spack/incline/sbatch.sh index b324e340b..6fb59ba95 100755 --- a/buildsystem/spack/incline/sbatch.sh +++ b/buildsystem/spack/incline/sbatch.sh @@ -1,6 +1,6 @@ #!/bin/bash -#SBATCH -A exasgd +#SBATCH -A earthshot #SBATCH -p incline #SBATCH -N 1 #SBATCH --exclusive @@ -43,7 +43,7 @@ cleanup() { # Assuming that you already have a binary mirror configured (if you need it) export MY_CLUSTER=incline -cp /qfs/projects/exasgd/src/coinhsl-archive-2019.05.21.tar.gz . && +cp /qfs/projects/earthshot/src/coinhsl-archive-2019.05.21.tar.gz . && . buildsystem/spack/load_spack.sh && spack develop --no-clone --path=$(pwd) exago@develop && mkdir hiop_dev diff --git a/buildsystem/spack/newell/env.sh b/buildsystem/spack/newell/env.sh index 0a74dead7..40a77b052 100644 --- a/buildsystem/spack/newell/env.sh +++ b/buildsystem/spack/newell/env.sh @@ -14,7 +14,7 @@ module load openmpi/4.1.4 # Define environment variables for where spack stores key files # For now, SPACK_INSTALL is the path where everything spack related is installed # If you want to modify the module install path, edit the spack.yaml manually -BASE=/qfs/projects/exasgd/src/ci-newll +BASE=/qfs/projects/earthshot/src/newell-ci export SPACK_INSTALL=$BASE/spack-install export SPACK_MODULES=ci-modules export SPACK_CACHE=$BASE/../$(whoami)/spack-cache diff --git a/buildsystem/spack/newell/sbatch.sh b/buildsystem/spack/newell/sbatch.sh index 6df9a87ae..0dc8bd28d 100644 --- a/buildsystem/spack/newell/sbatch.sh +++ b/buildsystem/spack/newell/sbatch.sh @@ -1,5 +1,5 @@ #!/bin/bash -#SBATCH -A exasgd +#SBATCH -A earthshot #SBATCH -p newell8 #SBATCH -N 1 #SBATCH -n 128 @@ -42,7 +42,7 @@ cleanup() { # Assuming that you already have a binary mirror configured export MY_CLUSTER=newell -cp /qfs/projects/exasgd/src/coinhsl-archive-2019.05.21.tar.gz . && +cp /qfs/projects/earthshot/src/coinhsl-archive-2019.05.21.tar.gz . && . buildsystem/spack/load_spack.sh && # spack clean -abm && # shouldn't run this everytime... spack develop --no-clone --path=$(pwd) exago@develop && diff --git a/tpl/spack b/tpl/spack index e3b6d2c3c..f16e29559 160000 --- a/tpl/spack +++ b/tpl/spack @@ -1 +1 @@ -Subproject commit e3b6d2c3c7abf933d36adee1aa729230f40c05d5 +Subproject commit f16e29559ee3095a95b5e64f0d973c2646ad6571 From f6ba1bee43a6b5b1d935d7fb1296d4d0bfee5936 Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:54:47 -0800 Subject: [PATCH 02/27] update gitlab remote --- .github/workflows/pnnl_mirror.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pnnl_mirror.yaml b/.github/workflows/pnnl_mirror.yaml index 5bd5cd376..03f9ae2ee 100644 --- a/.github/workflows/pnnl_mirror.yaml +++ b/.github/workflows/pnnl_mirror.yaml @@ -28,7 +28,7 @@ jobs: # Give actions access to some secrets with: GIT_PUSH_ARGS: '--tags --force --push-option=ci.skip' - REMOTE: 'https://gitlab.pnnl.gov/exasgd/frameworks/exago-github-mirror' + REMOTE: 'https://gitlab.pnnl.gov/earthshot-exago/exago-github-mirror' GIT_USERNAME: ${{ secrets.GIT_USER }} GIT_PASSWORD: ${{ secrets.GIT_PASSWORD }} From f93522ddb301dbef505d2e1914ef1a7847b32eb8 Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Mon, 19 Feb 2024 11:07:59 -0800 Subject: [PATCH 03/27] update pipeline url --- .github/workflows/pnnl_mirror.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pnnl_mirror.yaml b/.github/workflows/pnnl_mirror.yaml index 03f9ae2ee..e5a35addb 100644 --- a/.github/workflows/pnnl_mirror.yaml +++ b/.github/workflows/pnnl_mirror.yaml @@ -34,4 +34,4 @@ jobs: # Trigger CI pipeline since it was skipped in the above push - name: Trigger Pipeline - run: curl -X POST -F token=${{ secrets.PNNL_PIPELINE_TRIGGER }} -F ref=${{ steps.extract_branch.outputs.branch }} https://gitlab.pnnl.gov/api/v4/projects/1619/trigger/pipeline + run: curl -X POST -F token=${{ secrets.PNNL_PIPELINE_TRIGGER }} -F ref=${{ steps.extract_branch.outputs.branch }} https://gitlab.pnnl.gov/api/v4/projects/1719/trigger/pipeline From a2645b3ac4389941fed10fc44090239b329f0c01 Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Wed, 21 Feb 2024 10:56:06 -0800 Subject: [PATCH 04/27] add initial CI notes [deception-rebuild] --- .gitlab/pnnl/README.md | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .gitlab/pnnl/README.md diff --git a/.gitlab/pnnl/README.md b/.gitlab/pnnl/README.md new file mode 100644 index 000000000..51f9c4b92 --- /dev/null +++ b/.gitlab/pnnl/README.md @@ -0,0 +1,38 @@ +# How to connect GitHub to a PNNL GitLab (push) Mirror + +CI runners + +path to ci.yml + +in pnnl_mirror.yaml +- generate + GIT_PASSWORD (done in gitLAB under settings>access tokens - give it write_repository perms + developer) + PNNL_PIPELINE_TRIGGER (done in gitLAB under CI/CD pipeline trigger) +- paste as variable in gitHUB + + +then github token for pnnl to push back results +GITHUB_CURL_HEADER + + +personal github settings - fine-grained tokens + resource owner = pnnl + select repositories = ppnl/exago + permissions > repository permissions > commit statuses (read and write) + copy this token + go to gitLAB > settings > cicd > variables + add variable + type = file + do not protect/mask/expand + key = GITHUB_CURL_HEADER + Value = Authorization: token +https://ecp-ci.gitlab.io/docs/guides/build-status-gitlab.html + + again for commit token + permissions > repository permissions > contents (read and write) + go to gitLAB > settings > cicd > variables + add variable + type = variable + do not protect + key = SPACK_GIT_TOKEN + paste in value field \ No newline at end of file From 62d5b0e827d5f68e50b3cf7ed944d53d09b2582e Mon Sep 17 00:00:00 2001 From: jaelynlitz Date: Wed, 21 Feb 2024 18:56:41 +0000 Subject: [PATCH 05/27] Apply pre-commmit fixes --- .gitlab/pnnl/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/pnnl/README.md b/.gitlab/pnnl/README.md index 51f9c4b92..70366dad1 100644 --- a/.gitlab/pnnl/README.md +++ b/.gitlab/pnnl/README.md @@ -35,4 +35,4 @@ https://ecp-ci.gitlab.io/docs/guides/build-status-gitlab.html type = variable do not protect key = SPACK_GIT_TOKEN - paste in value field \ No newline at end of file + paste in value field From d2cdce24c58e9844600c969441ac9fc3772d2ed4 Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Wed, 21 Feb 2024 12:20:38 -0800 Subject: [PATCH 06/27] set up mirror [deception-rebuild] --- buildsystem/spack/deception/sbatch.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildsystem/spack/deception/sbatch.sh b/buildsystem/spack/deception/sbatch.sh index 1702544ef..e61c23484 100755 --- a/buildsystem/spack/deception/sbatch.sh +++ b/buildsystem/spack/deception/sbatch.sh @@ -43,7 +43,8 @@ cleanup() { # Assuming that you already have a binary mirror configured export MY_CLUSTER=deception cp /qfs/projects/earthshot/src/coinhsl-archive-2019.05.21.tar.gz . && -. buildsystem/spack/load_spack.sh && +#. buildsystem/spack/load_spack.sh && +. buildsystem/spack/binary_mirror.sh && # spack clean -abm && # shouldn't run this everytime... spack develop --no-clone --path=$(pwd) exago@develop && mkdir hiop_dev From 657c23c97f370f875b6f8156881f380aeb60fcc1 Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Wed, 21 Feb 2024 13:34:49 -0800 Subject: [PATCH 07/27] [deception-rebuild] --- buildsystem/spack/deception/sbatch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildsystem/spack/deception/sbatch.sh b/buildsystem/spack/deception/sbatch.sh index e61c23484..b09efd46b 100755 --- a/buildsystem/spack/deception/sbatch.sh +++ b/buildsystem/spack/deception/sbatch.sh @@ -43,7 +43,7 @@ cleanup() { # Assuming that you already have a binary mirror configured export MY_CLUSTER=deception cp /qfs/projects/earthshot/src/coinhsl-archive-2019.05.21.tar.gz . && -#. buildsystem/spack/load_spack.sh && +. buildsystem/spack/load_spack.sh && . buildsystem/spack/binary_mirror.sh && # spack clean -abm && # shouldn't run this everytime... spack develop --no-clone --path=$(pwd) exago@develop && From e0d76fd8e92e06c16ce9dce2c58da55c71a8c045 Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Wed, 21 Feb 2024 13:41:39 -0800 Subject: [PATCH 08/27] [deception-rebuild] --- buildsystem/spack/binary_mirror.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildsystem/spack/binary_mirror.sh b/buildsystem/spack/binary_mirror.sh index 7bccc9b94..4c5fcc604 100755 --- a/buildsystem/spack/binary_mirror.sh +++ b/buildsystem/spack/binary_mirror.sh @@ -11,6 +11,6 @@ spack mirror list res=$? -chmod -R ugo+wrx $SPACK_MIRROR & +chmod -R ugo+wrx $SPACK_MIRROR/* & exit $res From c042403eedde8e68a6097f8fbee0f49c4cd4a309 Mon Sep 17 00:00:00 2001 From: Cameron Rutherford Date: Fri, 23 Feb 2024 14:46:30 -0500 Subject: [PATCH 09/27] Attempt to fix spack environment issue with new syntax and no copy. (#122) [deception-rebuild] --- buildsystem/spack/load_spack.sh | 87 +++++++++++++++------------------ 1 file changed, 39 insertions(+), 48 deletions(-) diff --git a/buildsystem/spack/load_spack.sh b/buildsystem/spack/load_spack.sh index 9e76ca41a..4348dac47 100755 --- a/buildsystem/spack/load_spack.sh +++ b/buildsystem/spack/load_spack.sh @@ -2,79 +2,70 @@ # Enforce running from ExaGO root dir if [[ ! -f $PWD/buildsystem/build.sh ]]; then - echo 'Please run this script from the top-level ExaGO source directory.' - exit 1 + echo 'Please run this script from the top-level ExaGO source directory.' + exit 1 fi # Need to know which platform we are configuring for MY_CLUSTER="${MY_CLUSTER:?MY_CLUSTER is unset. Please set manually.}" -[[ -z $MY_CLUSTER ]] && return 1 +[[ -z $MY_CLUSTER ]] && return 1 echo "$MY_CLUSTER" | awk '{print tolower($0)}' # Use ${var,,} to convert to lower case # There must be an existing folder for the cluster -if [ ! -d "./buildsystem/spack/${MY_CLUSTER}" ] -then - echo "${MY_CLUSTER} did not match any directories in /buildsystem/spack/" - echo "Try one of the following platforms: " - echo $(ls -d ./buildsystem/spack/*/ | tr '\n' '\0' | xargs -0 -n 1 basename ) - return +if [ ! -d "./buildsystem/spack/${MY_CLUSTER}" ]; then + echo "${MY_CLUSTER} did not match any directories in /buildsystem/spack/" + echo "Try one of the following platforms: " + echo $(ls -d ./buildsystem/spack/*/ | tr '\n' '\0' | xargs -0 -n 1 basename) + return fi base="./buildsystem/spack/${MY_CLUSTER}" # There needs to be an existing spack.yaml -if [ ! -f "$base/spack.yaml" ] -then - echo "No spack.yaml in $base/spack.yaml. Add this and try again." - return +if [ ! -f "$base/spack.yaml" ]; then + echo "No spack.yaml in $base/spack.yaml. Add this and try again." + return fi # We must configure with platform specific environment before loading spack -if [ ! -f "$base/env.sh" ] -then - echo "No environment (env.sh) script detected in $base." - echo "Please add a script that creates a compatible shell environment." - echo "You must set the following variables that affect your spack configuration." - echo "TODO - add updated description of all spack platform variables" # TODO - return +if [ ! -f "$base/env.sh" ]; then + echo "No environment (env.sh) script detected in $base." + echo "Please add a script that creates a compatible shell environment." + echo "You must set the following variables that affect your spack configuration." + echo "TODO - add updated description of all spack platform variables" # TODO + return fi - # Source base platform environment -source $base/env.sh && \ - -# Make sure SPACK_INSTALL is set, so we aren't installing somewhere undesired -SPACK_INSTALL="${SPACK_INSTALL:?SPACK_INSTALL is unset. $base/env.sh should be edited to configure this}" && \ -SPACK_MIRROR="${SPACK_MIRROR:?SPACK_MIRROR is unset. $base/env.sh should be edited to configure this}" && \ - -# Load spack -source ./tpl/spack/share/spack/setup-env.sh && \ - -# Create directory for environment -SPACKENV=$(pwd)/spack-env-$MY_CLUSTER && \ -mkdir -p $SPACKENV && \ -# Remove old config -(rm -f $SPACKENV/spack.yaml || true) && \ -(rm -f $SPACKENV/spack.lock || true) && \ +source $base/env.sh && -# Use a directory based environment, and decorate command line -spack env create -d $SPACKENV && \ + # Make sure SPACK_INSTALL is set, so we aren't installing somewhere undesired + SPACK_INSTALL="${SPACK_INSTALL:?SPACK_INSTALL is unset. $base/env.sh should be edited to configure this}" && + SPACK_MIRROR="${SPACK_MIRROR:?SPACK_MIRROR is unset. $base/env.sh should be edited to configure this}" && -# Use git version of config -cp $base/spack.yaml $SPACKENV && \ -spack env activate -p $SPACKENV && \ + # Load spack + source ./tpl/spack/share/spack/setup-env.sh && -# Print relevant spack config for sanity check of environment. -echo "spack configuration will be installed into $SPACK_INSTALL" && \ -mkdir -p $SPACK_INSTALL && \ -mkdir -p $SPACK_CACHE && \ + # Create directory for environment + SPACKENV=$(pwd)/spack-env-$MY_CLUSTER && + mkdir -p $SPACKENV && + # Remove old config if present + (rm -f $SPACKENV/spack.yaml || true) && + (rm -f $SPACKENV/spack.lock || true) && + # Use a directory based environment, and decorate command line + spack env create -d $SPACKENV $base/spack.yaml && + spack env activate -p $SPACKENV && -echo "spack mirror will be in $SPACK_MIRROR" && \ -mkdir -p $SPACK_MIRROR + # Print relevant spack config for sanity check of environment. + echo "spack configuration will be installed into $SPACK_INSTALL" && + mkdir -p $SPACK_INSTALL && + mkdir -p $SPACK_CACHE && + echo "spack mirror will be in $SPACK_MIRROR" && + mkdir -p $SPACK_MIRROR # Print config if configured successfully if [ $? -eq 0 ] && [ "$1" = "-v" ]; then - spack config get config + spack config get config fi From 5f801ce28b550327e60c9e9ae6e7b6f5a30f6d3a Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Fri, 23 Feb 2024 12:13:57 -0800 Subject: [PATCH 10/27] run each spack command with -e instead of activating the env [deception-rebuild] --- buildsystem/spack/load_spack.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildsystem/spack/load_spack.sh b/buildsystem/spack/load_spack.sh index 4348dac47..fa5f403c4 100755 --- a/buildsystem/spack/load_spack.sh +++ b/buildsystem/spack/load_spack.sh @@ -56,7 +56,7 @@ source $base/env.sh && # Use a directory based environment, and decorate command line spack env create -d $SPACKENV $base/spack.yaml && - spack env activate -p $SPACKENV && + #spack env activate -p $SPACKENV && # Print relevant spack config for sanity check of environment. echo "spack configuration will be installed into $SPACK_INSTALL" && @@ -67,5 +67,5 @@ source $base/env.sh && # Print config if configured successfully if [ $? -eq 0 ] && [ "$1" = "-v" ]; then - spack config get config + spack -e $SPACKENV config get config fi From 6f11564ce1e0053ba37d48e6d1a8299be9389c1e Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Fri, 23 Feb 2024 12:20:50 -0800 Subject: [PATCH 11/27] add spack env flags [deception-rebuild] --- buildsystem/spack/binary_mirror.sh | 12 ++++++------ buildsystem/spack/deception/sbatch.sh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/buildsystem/spack/binary_mirror.sh b/buildsystem/spack/binary_mirror.sh index 4c5fcc604..c817c1fca 100755 --- a/buildsystem/spack/binary_mirror.sh +++ b/buildsystem/spack/binary_mirror.sh @@ -2,12 +2,12 @@ source buildsystem/spack/load_spack.sh && SPACK_MIRROR="${SPACK_MIRROR:?SPACK_MIRROR is unset. Please use the load_spack script first.}" && -spack develop --path=$(pwd) exago@develop && -spack bootstrap now && -spack concretize -f && -(spack mirror create -a --directory $SPACK_MIRROR || true) && -spack mirror add local file://$SPACK_MIRROR && -spack mirror list +spack -e $SPACKENV develop --path=$(pwd) exago@develop && +spack -e $SPACKENV bootstrap now && +spack -e $SPACKENV concretize -f && +(spack -e $SPACKENV mirror create -a --directory $SPACK_MIRROR || true) && +spack -e $SPACKENV mirror add local file://$SPACK_MIRROR && +spack -e $SPACKENV mirror list res=$? diff --git a/buildsystem/spack/deception/sbatch.sh b/buildsystem/spack/deception/sbatch.sh index b09efd46b..8fc43b843 100755 --- a/buildsystem/spack/deception/sbatch.sh +++ b/buildsystem/spack/deception/sbatch.sh @@ -46,9 +46,9 @@ cp /qfs/projects/earthshot/src/coinhsl-archive-2019.05.21.tar.gz . && . buildsystem/spack/load_spack.sh && . buildsystem/spack/binary_mirror.sh && # spack clean -abm && # shouldn't run this everytime... -spack develop --no-clone --path=$(pwd) exago@develop && +spack -e $SPACKENV develop --no-clone --path=$(pwd) exago@develop && mkdir hiop_dev -spack develop --clone --force FORCE --path=$(pwd)/hiop_dev hiop@develop && +spack -e $SPACKENV develop --clone --force FORCE --path=$(pwd)/hiop_dev hiop@develop && cd hiop_dev && git submodule update --init --recursive && #git checkout develop && #test out patch From 426f1931ae90298cb255b530993879ac15a9775d Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Fri, 23 Feb 2024 12:42:59 -0800 Subject: [PATCH 12/27] remove call to binary_mirror and add more -e spack flags [deception-rebuild] --- buildsystem/spack/configure_modules.sh | 8 ++++---- buildsystem/spack/deception/sbatch.sh | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/buildsystem/spack/configure_modules.sh b/buildsystem/spack/configure_modules.sh index b3a294f78..96f893d3e 100755 --- a/buildsystem/spack/configure_modules.sh +++ b/buildsystem/spack/configure_modules.sh @@ -12,13 +12,13 @@ module list # This assumes that we are installing from a binary mirror, and don't want to fetch files # Make sure to use binary_mirror.sh if this is failing -spack install -j $1 && \ +spack -e $SPACKENV install -j $1 && \ # This deletes the previous modules that are installed # Either use a different module path than other users, or deal with frequent updates # To use a different module path, you must update the variable $SPACK_MODULES # This is configured for the default for the branch in /buildsystem/spack/platform/env.sh -spack module tcl refresh -y && \ +spack -e $SPACKENV module tcl refresh -y && \ # We will create a new modules file, with the first line being the module path mkdir -p $base/modules && \ @@ -35,10 +35,10 @@ echo module use -a $SPACK_INSTALL/$SPACK_MODULES/$arch &> $base/modules/dependen echo module use -a $SPACK_INSTALL/$SPACK_MODULES/$arch &> $base/modules/exago.sh && \ # Now we can append to the files -spack module tcl loads -r -x exago -x openssl exago &>> $base/modules/dependencies.sh && \ +spack -e $SPACKENV module tcl loads -r -x exago -x openssl exago &>> $base/modules/dependencies.sh && \ # spack module tcl loads -r -x exago -x openssl exago &>> $base/modules/optimized-dependencies.sh && \ # spack module tcl loads exago &>> $base/modules/exago-optimized.sh && \ -spack module tcl loads exago &>> $base/modules/exago.sh +spack -e $SPACKENV module tcl loads exago &>> $base/modules/exago.sh exit_code=$? diff --git a/buildsystem/spack/deception/sbatch.sh b/buildsystem/spack/deception/sbatch.sh index 8fc43b843..f055b5cee 100755 --- a/buildsystem/spack/deception/sbatch.sh +++ b/buildsystem/spack/deception/sbatch.sh @@ -44,7 +44,6 @@ cleanup() { export MY_CLUSTER=deception cp /qfs/projects/earthshot/src/coinhsl-archive-2019.05.21.tar.gz . && . buildsystem/spack/load_spack.sh && -. buildsystem/spack/binary_mirror.sh && # spack clean -abm && # shouldn't run this everytime... spack -e $SPACKENV develop --no-clone --path=$(pwd) exago@develop && mkdir hiop_dev From 008164e51543d06e15b15bd25774b8c16333b10b Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Fri, 23 Feb 2024 15:22:03 -0800 Subject: [PATCH 13/27] exclude fetching exago for spack mirror [deception-rebuild] Co-authored-by: Cameron Rutherford --- buildsystem/spack/binary_mirror.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildsystem/spack/binary_mirror.sh b/buildsystem/spack/binary_mirror.sh index c817c1fca..b34939533 100755 --- a/buildsystem/spack/binary_mirror.sh +++ b/buildsystem/spack/binary_mirror.sh @@ -5,7 +5,7 @@ SPACK_MIRROR="${SPACK_MIRROR:?SPACK_MIRROR is unset. Please use the load_spack s spack -e $SPACKENV develop --path=$(pwd) exago@develop && spack -e $SPACKENV bootstrap now && spack -e $SPACKENV concretize -f && -(spack -e $SPACKENV mirror create -a --directory $SPACK_MIRROR || true) && +spack -e $SPACKENV mirror create -a --exclude-specs exago@develop --directory $SPACK_MIRROR && spack -e $SPACKENV mirror add local file://$SPACK_MIRROR && spack -e $SPACKENV mirror list From f532b2445ebd561768bd5984e6aab59d181e80ea Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Fri, 23 Feb 2024 15:28:11 -0800 Subject: [PATCH 14/27] [deception-rebuild] --- buildsystem/spack/configure_modules.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildsystem/spack/configure_modules.sh b/buildsystem/spack/configure_modules.sh index 96f893d3e..bd7ae5edf 100755 --- a/buildsystem/spack/configure_modules.sh +++ b/buildsystem/spack/configure_modules.sh @@ -10,9 +10,11 @@ base="./buildsystem/spack/${MY_CLUSTER,,""""}" # Printing out loaded modules for debugging... module list +echo $SPACKENV + # This assumes that we are installing from a binary mirror, and don't want to fetch files # Make sure to use binary_mirror.sh if this is failing -spack -e $SPACKENV install -j $1 && \ +spack install -j $1 && \ # This deletes the previous modules that are installed # Either use a different module path than other users, or deal with frequent updates From ba12f4266af515b02ce948571d44559ab8810eba Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Fri, 23 Feb 2024 15:34:41 -0800 Subject: [PATCH 15/27] export SPACKENV [deception-rebuild] --- buildsystem/spack/configure_modules.sh | 2 +- buildsystem/spack/load_spack.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildsystem/spack/configure_modules.sh b/buildsystem/spack/configure_modules.sh index bd7ae5edf..02a72aeb8 100755 --- a/buildsystem/spack/configure_modules.sh +++ b/buildsystem/spack/configure_modules.sh @@ -14,7 +14,7 @@ echo $SPACKENV # This assumes that we are installing from a binary mirror, and don't want to fetch files # Make sure to use binary_mirror.sh if this is failing -spack install -j $1 && \ +spack -e $SPACKENV install -j $1 && \ # This deletes the previous modules that are installed # Either use a different module path than other users, or deal with frequent updates diff --git a/buildsystem/spack/load_spack.sh b/buildsystem/spack/load_spack.sh index fa5f403c4..37116b076 100755 --- a/buildsystem/spack/load_spack.sh +++ b/buildsystem/spack/load_spack.sh @@ -48,7 +48,7 @@ source $base/env.sh && source ./tpl/spack/share/spack/setup-env.sh && # Create directory for environment - SPACKENV=$(pwd)/spack-env-$MY_CLUSTER && + export SPACKENV=$(pwd)/spack-env-$MY_CLUSTER && mkdir -p $SPACKENV && # Remove old config if present (rm -f $SPACKENV/spack.yaml || true) && From 2c9779e6c84e7f05addc784ec7ae89e7f78148d1 Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Fri, 23 Feb 2024 15:51:23 -0800 Subject: [PATCH 16/27] add changes to incline and newell [incline-rebuild] [newell-rebuild] --- buildsystem/spack/binary_mirror.sh | 2 +- buildsystem/spack/incline/sbatch.sh | 4 ++-- buildsystem/spack/newell/sbatch.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildsystem/spack/binary_mirror.sh b/buildsystem/spack/binary_mirror.sh index b34939533..6ff49ea4f 100755 --- a/buildsystem/spack/binary_mirror.sh +++ b/buildsystem/spack/binary_mirror.sh @@ -11,6 +11,6 @@ spack -e $SPACKENV mirror list res=$? -chmod -R ugo+wrx $SPACK_MIRROR/* & +chmod -R ugo+wrx $SPACK_MIRROR & exit $res diff --git a/buildsystem/spack/incline/sbatch.sh b/buildsystem/spack/incline/sbatch.sh index 6fb59ba95..4355f86d5 100755 --- a/buildsystem/spack/incline/sbatch.sh +++ b/buildsystem/spack/incline/sbatch.sh @@ -45,9 +45,9 @@ cleanup() { export MY_CLUSTER=incline cp /qfs/projects/earthshot/src/coinhsl-archive-2019.05.21.tar.gz . && . buildsystem/spack/load_spack.sh && -spack develop --no-clone --path=$(pwd) exago@develop && +spack -e $SPACKENV develop --no-clone --path=$(pwd) exago@develop && mkdir hiop_dev -spack develop --clone --force FORCE --path=$(pwd)/hiop_dev hiop@develop && +spack -e $SPACKENV develop --clone --force FORCE --path=$(pwd)/hiop_dev hiop@develop && cd hiop_dev && git submodule update --init --recursive && #git checkout develop && #test out patch diff --git a/buildsystem/spack/newell/sbatch.sh b/buildsystem/spack/newell/sbatch.sh index 0dc8bd28d..e007f43f6 100644 --- a/buildsystem/spack/newell/sbatch.sh +++ b/buildsystem/spack/newell/sbatch.sh @@ -45,9 +45,9 @@ export MY_CLUSTER=newell cp /qfs/projects/earthshot/src/coinhsl-archive-2019.05.21.tar.gz . && . buildsystem/spack/load_spack.sh && # spack clean -abm && # shouldn't run this everytime... -spack develop --no-clone --path=$(pwd) exago@develop && +spack -e $SPACKENV develop --no-clone --path=$(pwd) exago@develop && mkdir hiop_dev -spack develop --clone --force FORCE --path=$(pwd)/hiop_dev hiop@develop && +spack -e $SPACKENV develop --clone --force FORCE --path=$(pwd)/hiop_dev hiop@develop && cd hiop_dev && git submodule update --init --recursive && #git checkout develop && #test out patch From 627391f6058448790a2927a01b5f30f854d23f19 Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Fri, 23 Feb 2024 17:05:40 -0800 Subject: [PATCH 17/27] refine README [skip-ci] --- .gitlab/pnnl/README.md | 88 ++++++++++++++++++++++++++++++++---------- 1 file changed, 68 insertions(+), 20 deletions(-) diff --git a/.gitlab/pnnl/README.md b/.gitlab/pnnl/README.md index 70366dad1..8950ce830 100644 --- a/.gitlab/pnnl/README.md +++ b/.gitlab/pnnl/README.md @@ -1,38 +1,86 @@ # How to connect GitHub to a PNNL GitLab (push) Mirror -CI runners +To run on our HPC clusters at PNNL while hosting our code base on GitHub, we utilize PNNL's CI/CD services on GitLab. -path to ci.yml +With GitLab premium, integration between GitHub and GitLab is included. This is how we have architected a solution with the base level GitLab offering. -in pnnl_mirror.yaml -- generate - GIT_PASSWORD (done in gitLAB under settings>access tokens - give it write_repository perms + developer) - PNNL_PIPELINE_TRIGGER (done in gitLAB under CI/CD pipeline trigger) -- paste as variable in gitHUB +The PNNL GitLab repository is a push mirror of the GitHub. So whenever a commit is pushed to a pull request or the `main` branch - the changes are pushed to the GitLab and a CI pipeline is triggered. +## Steps in linking the GitLab and GitHub -then github token for pnnl to push back results -GITHUB_CURL_HEADER +1. Push mirror & pipeline trigger +In `pnnl_mirror.yaml`, we use the variables `GIT_USER`, `GIT_PASSWORD`, and `PNNL_PIPELINE_TRIGGER`. `GIT_PASSWORD` and `PNNL_PIPELINE_TRIGGER` are generated in GitLab and then added to GitHub. -personal github settings - fine-grained tokens +(TODO: is GIT_USER just something you add directly into github?) + +a) GIT_PASSWORD +Go to Settings > Access Tokens. Click `Add new token`. + +Pick a reasonable name & expiration date. (ie "GITHUB_PUSH_PASSWORD") + +Pick the `Developer` role. + +Under `Select scopes`, select `write_repository`. + +Create. + +Go to GitHub > Settings > Secrets and variables > Actions. Click `New repository secret`. +Name it `GIT_PASSWORD` and paste in the value generated from GitLab. + +Add secret. + +b) PNNL_PIPELINE_TRIGGER +Go to Settings > CI/CD > Pipeline trigger tokens. Click `Add new token`. + +Give it a name and click create. + +Go to GitHub > Settings > Secrets and variables > Actions. Click `New repository secret`. +Name it `PNNL_PIPELINE_TRIGGER` and paste in the value generated from GitLab. + +2. Push back status & modules + +In our module rebuild pipelines, we rebuild spack modules on each PNNL platform, then commit the new module paths/hashes back to the repository. + +a) Generate token #1 (`GITLAB_MIRROR_STATUS`) + +Go to your GitHub profile > Settings > Developer Settings > Personal access tokens > Fine-grained tokens. + +Generate new token resource owner = pnnl - select repositories = ppnl/exago + select repositories = pnnl/exago permissions > repository permissions > commit statuses (read and write) copy this token - go to gitLAB > settings > cicd > variables - add variable - type = file - do not protect/mask/expand - key = GITHUB_CURL_HEADER - Value = Authorization: token -https://ecp-ci.gitlab.io/docs/guides/build-status-gitlab.html - again for commit token +Go to GitLab > Settings > CI/CD > Variables + add variable + type = file + do not protect/mask/expand + key = GITHUB_CURL_HEADER + Value = `Authorization: token ` + +See https://ecp-ci.gitlab.io/docs/guides/build-status-gitlab.html for more details. + +b) Generate token #2 (`GITLAB_COMMIT`) + +Go to your GitHub profile > Settings > Developer Settings > Personal access tokens > Fine-grained tokens. + +Generate new token + resource owner = pnnl + select repositories = pnnl/exago permissions > repository permissions > contents (read and write) - go to gitLAB > settings > cicd > variables + copy this token + +Go to GitLab > Settings > CI/CD > Variables add variable type = variable do not protect key = SPACK_GIT_TOKEN paste in value field + + +## Change path to `.gitlab-ci.yml` + +Go to > Settings > CI/CD > General Pipelines, change the `CI/CD configuration file` to the correct path to `.gitlab-ci.yml`. + +In our repo, the path is `.gitlab/pnnl/.gitlab-ci.yml`. \ No newline at end of file From 3a49a499c01c79dba2deeda7168b459dddc29e65 Mon Sep 17 00:00:00 2001 From: jaelynlitz Date: Sat, 24 Feb 2024 01:06:03 +0000 Subject: [PATCH 18/27] Apply pre-commmit fixes --- .gitlab/pnnl/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/pnnl/README.md b/.gitlab/pnnl/README.md index 8950ce830..1cbba4c7c 100644 --- a/.gitlab/pnnl/README.md +++ b/.gitlab/pnnl/README.md @@ -83,4 +83,4 @@ Go to GitLab > Settings > CI/CD > Variables Go to > Settings > CI/CD > General Pipelines, change the `CI/CD configuration file` to the correct path to `.gitlab-ci.yml`. -In our repo, the path is `.gitlab/pnnl/.gitlab-ci.yml`. \ No newline at end of file +In our repo, the path is `.gitlab/pnnl/.gitlab-ci.yml`. From 4faf82b11269b5e93922b09bb99b8716b8eef645 Mon Sep 17 00:00:00 2001 From: Cameron Rutherford Date: Tue, 27 Feb 2024 15:28:09 -0500 Subject: [PATCH 19/27] Update spack.yaml [deception-rebuild] [incline-rebuild] [newell-rebuild] --- buildsystem/spack/deception/spack.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/buildsystem/spack/deception/spack.yaml b/buildsystem/spack/deception/spack.yaml index 6b3f37e6c..415433db5 100644 --- a/buildsystem/spack/deception/spack.yaml +++ b/buildsystem/spack/deception/spack.yaml @@ -4,6 +4,7 @@ spack: view: false concretizer: reuse: false + unify: true config: concretizer: clingo install_tree: From aa01e8f157ae50b5e276c4ace009b41ca80a5236 Mon Sep 17 00:00:00 2001 From: spack-auto-module Date: Tue, 27 Feb 2024 21:14:27 +0000 Subject: [PATCH 20/27] Update newell spack built tcl modules - [newell-test] --- .../spack/newell/modules/dependencies.sh | 196 +++++++++--------- buildsystem/spack/newell/modules/exago.sh | 6 +- 2 files changed, 102 insertions(+), 100 deletions(-) diff --git a/buildsystem/spack/newell/modules/dependencies.sh b/buildsystem/spack/newell/modules/dependencies.sh index 1c4d67feb..ed94869ee 100644 --- a/buildsystem/spack/newell/modules/dependencies.sh +++ b/buildsystem/spack/newell/modules/dependencies.sh @@ -1,169 +1,171 @@ -module use -a /qfs/projects/exasgd/src/ci-newll/spack-install/ci-modules/linux-centos8-power9le +module use -a /qfs/projects/earthshot/src/newell-ci/spack-install/ci-modules/linux-centos8-power9le +# gcc-runtime@=8.5.0%gcc@=8.5.0 build_system=generic arch=linux-centos8-power9le +module load gcc-runtime/8.5.0-gcc-8.5.0-pmgzgcn # gmake@=4.4.1%gcc@=8.5.0~guile build_system=generic arch=linux-centos8-power9le -module load gmake/4.4.1-gcc-8.5.0-uysj4bc +module load gmake/4.4.1-gcc-8.5.0-3binpl5 # gnuconfig@=2022-09-17%gcc@=8.5.0 build_system=generic arch=linux-centos8-power9le -module load gnuconfig/2022-09-17-gcc-8.5.0-brd4tz7 +module load gnuconfig/2022-09-17-gcc-8.5.0-amqajvg # pkgconf@=1.9.5%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le -module load pkgconf/1.9.5-gcc-8.5.0-nrcoqfd +module load pkgconf/1.9.5-gcc-8.5.0-f3il7dq # nghttp2@=1.57.0%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le -module load nghttp2/1.57.0-gcc-8.5.0-pbbbhf7 +module load nghttp2/1.57.0-gcc-8.5.0-awrz4bk # ca-certificates-mozilla@=2023-05-30%gcc@=8.5.0 build_system=generic arch=linux-centos8-power9le -module load ca-certificates-mozilla/2023-05-30-gcc-8.5.0-ueq22oa +module load ca-certificates-mozilla/2023-05-30-gcc-8.5.0-lw3r7th # berkeley-db@=18.1.40%gcc@=8.5.0+cxx~docs+stl build_system=autotools patches=26090f4,b231fcc arch=linux-centos8-power9le -module load berkeley-db/18.1.40-gcc-8.5.0-44mqiak +module load berkeley-db/18.1.40-gcc-8.5.0-u5uqtkn # libiconv@=1.17%gcc@=8.5.0 build_system=autotools libs=shared,static arch=linux-centos8-power9le -module load libiconv/1.17-gcc-8.5.0-wtzwh5x +module load libiconv/1.17-gcc-8.5.0-tteytxo # diffutils@=3.9%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le -module load diffutils/3.9-gcc-8.5.0-vl62cx7 +module load diffutils/3.9-gcc-8.5.0-3ggffsl # bzip2@=1.0.8%gcc@=8.5.0~debug~pic+shared build_system=generic arch=linux-centos8-power9le -module load bzip2/1.0.8-gcc-8.5.0-rqfpz3l +module load bzip2/1.0.8-gcc-8.5.0-voqeke2 # ncurses@=6.4%gcc@=8.5.0~symlinks+termlib abi=none build_system=autotools arch=linux-centos8-power9le -module load ncurses/6.4-gcc-8.5.0-t7cgvnx +module load ncurses/6.4-gcc-8.5.0-kczmwq4 # readline@=8.2%gcc@=8.5.0 build_system=autotools patches=bbf97f1 arch=linux-centos8-power9le -module load readline/8.2-gcc-8.5.0-ekbdswm +module load readline/8.2-gcc-8.5.0-ynosqes # gdbm@=1.23%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le -module load gdbm/1.23-gcc-8.5.0-bnlfqr7 +module load gdbm/1.23-gcc-8.5.0-ypnlczn # zlib-ng@=2.1.5%gcc@=8.5.0+compat+opt build_system=autotools arch=linux-centos8-power9le -module load zlib-ng/2.1.5-gcc-8.5.0-jyxv2iy +module load zlib-ng/2.1.5-gcc-8.5.0-dsplf72 # perl@=5.38.0%gcc@=8.5.0+cpanm+opcode+open+shared+threads build_system=generic patches=714e4d1 arch=linux-centos8-power9le -module load perl/5.38.0-gcc-8.5.0-cdd5hba +module load perl/5.38.0-gcc-8.5.0-h2oo6ir # openssl@=3.1.3%gcc@=8.5.0~docs+shared build_system=generic certs=mozilla arch=linux-centos8-power9le -## module load openssl/3.1.3-gcc-8.5.0-jzdyuhc +## module load openssl/3.1.3-gcc-8.5.0-pswhwzo # curl@=8.4.0%gcc@=8.5.0~gssapi~ldap~libidn2~librtmp~libssh~libssh2+nghttp2 build_system=autotools libs=shared,static tls=openssl arch=linux-centos8-power9le -module load curl/8.4.0-gcc-8.5.0-joezlaf +module load curl/8.4.0-gcc-8.5.0-mwzlu55 # cmake@=3.27.9%gcc@=8.5.0~doc+ncurses+ownlibs build_system=generic build_type=Release arch=linux-centos8-power9le -module load cmake/3.27.9-gcc-8.5.0-zjwelyo +module load cmake/3.27.9-gcc-8.5.0-3vm6qun # blt@=0.4.1%gcc@=8.5.0 build_system=generic arch=linux-centos8-power9le -module load blt/0.4.1-gcc-8.5.0-zux4xxc +module load blt/0.4.1-gcc-8.5.0-qbqjtr2 # cub@=2.1.0%gcc@=8.5.0 build_system=generic arch=linux-centos8-power9le -module load cub/2.1.0-gcc-8.5.0-lx5hjs2 +module load cub/2.1.0-gcc-8.5.0-n4h3qsz # cuda@=11.4%gcc@=8.5.0~allow-unsupported-compilers~dev build_system=generic arch=linux-centos8-power9le module load cuda/11.4-gcc-8.5.0-fcxmvvd # camp@=0.2.3%gcc@=8.5.0+cuda~ipo+openmp~rocm~tests build_system=cmake build_type=Release cuda_arch=70 generator=make arch=linux-centos8-power9le -module load camp/0.2.3-gcc-8.5.0-wqt335s -# openblas@=0.3.25%gcc@=8.5.0~bignuma~consistent_fpcsr+fortran~ilp64+locking+pic+shared build_system=makefile symbol_suffix=none threads=none arch=linux-centos8-power9le -module load openblas/0.3.25-gcc-8.5.0-zoyafht -# coinhsl@=2019.05.21%gcc@=8.5.0+blas build_system=autotools arch=linux-centos8-power9le -module load coinhsl/2019.05.21-gcc-8.5.0-6ms33wi +module load camp/0.2.3-gcc-8.5.0-me7qrtf # ginkgo@=1.5.0.glu_experimental%gcc@=8.5.0+cuda~develtools~full_optimizations~hwloc~ipo~mpi+openmp~rocm+shared~sycl build_system=cmake build_type=Release cuda_arch=70 generator=make arch=linux-centos8-power9le -module load ginkgo/1.5.0.glu_experimental-gcc-8.5.0-a7bgjim +module load ginkgo/1.5.0.glu_experimental-gcc-8.5.0-g5n6tgr +# openblas@=0.3.26%gcc@=8.5.0~bignuma~consistent_fpcsr+fortran~ilp64+locking+pic+shared build_system=makefile symbol_suffix=none threads=none arch=linux-centos8-power9le +module load openblas/0.3.26-gcc-8.5.0-atmmzrk +# coinhsl@=2019.05.21%gcc@=8.5.0+blas build_system=autotools arch=linux-centos8-power9le +module load coinhsl/2019.05.21-gcc-8.5.0-p7hwz42 # magma@=2.6.2%gcc@=8.5.0+cuda+fortran~ipo~rocm+shared build_system=cmake build_type=Release cuda_arch=70 generator=make arch=linux-centos8-power9le -module load magma/2.6.2-gcc-8.5.0-wflxvhq +module load magma/2.6.2-gcc-8.5.0-wcsaklt # metis@=5.1.0%gcc@=8.5.0~gdb~int64~ipo~real64+shared build_system=cmake build_type=Release generator=make patches=4991da9,93a7903,b1225da arch=linux-centos8-power9le -module load metis/5.1.0-gcc-8.5.0-e67gfid -# openmpi@=4.1.4%gcc@=8.5.0~atomics~cuda~cxx~cxx_exceptions~gpfs~internal-hwloc~internal-pmix~java~legacylaunchers~lustre~memchecker~openshmem~orterunprefix+romio+rsh~singularity+static+vt+wrapper-rpath build_system=autotools fabrics=none schedulers=none arch=linux-centos8-power9le -module load openmpi/4.1.4-gcc-8.5.0-b4va3xy +module load metis/5.1.0-gcc-8.5.0-7u2ygpy +# openmpi@=4.1.4%gcc@=8.5.0~atomics~cuda~cxx~cxx_exceptions~gpfs~internal-hwloc~internal-libevent~internal-pmix~java~legacylaunchers~lustre~memchecker~openshmem~orterunprefix~romio+rsh~singularity~static+vt+wrapper-rpath build_system=autotools fabrics=none schedulers=none arch=linux-centos8-power9le +module load openmpi/4.1.4-gcc-8.5.0-ntdlotr # raja@=0.14.0%gcc@=8.5.0+cuda~examples~exercises~ipo+openmp~plugins~rocm+shared~tests build_system=cmake build_type=Release cuda_arch=70 generator=make arch=linux-centos8-power9le -module load raja/0.14.0-gcc-8.5.0-yntvr74 +module load raja/0.14.0-gcc-8.5.0-gw6xepf # libsigsegv@=2.14%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le -module load libsigsegv/2.14-gcc-8.5.0-2igjfex +module load libsigsegv/2.14-gcc-8.5.0-zynce5o # m4@=1.4.19%gcc@=8.5.0+sigsegv build_system=autotools patches=9dc5fbd,bfdffa7 arch=linux-centos8-power9le -module load m4/1.4.19-gcc-8.5.0-zmwmrjj -# autoconf@=2.69%gcc@=8.5.0 build_system=autotools patches=35c4492,7793209,a49dd5b arch=linux-centos8-power9le -module load autoconf/2.69-gcc-8.5.0-oxht7ld +module load m4/1.4.19-gcc-8.5.0-m4hoz3i +# autoconf@=2.72%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le +module load autoconf/2.72-gcc-8.5.0-datymaf # automake@=1.16.5%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le -module load automake/1.16.5-gcc-8.5.0-iv4yes2 +module load automake/1.16.5-gcc-8.5.0-xtl6kc7 +# findutils@=4.9.0%gcc@=8.5.0 build_system=autotools patches=440b954 arch=linux-centos8-power9le +module load findutils/4.9.0-gcc-8.5.0-3vzp5dt # libtool@=2.4.7%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le -module load libtool/2.4.7-gcc-8.5.0-el3zfel +module load libtool/2.4.7-gcc-8.5.0-fbte22i # gmp@=6.2.1%gcc@=8.5.0+cxx build_system=autotools libs=shared,static patches=69ad2e2 arch=linux-centos8-power9le -module load gmp/6.2.1-gcc-8.5.0-mexqehb +module load gmp/6.2.1-gcc-8.5.0-z2jr2nf # autoconf-archive@=2023.02.20%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le -module load autoconf-archive/2023.02.20-gcc-8.5.0-h3vkl44 +module load autoconf-archive/2023.02.20-gcc-8.5.0-lba25r6 # xz@=5.4.1%gcc@=8.5.0~pic build_system=autotools libs=shared,static arch=linux-centos8-power9le -module load xz/5.4.1-gcc-8.5.0-4k2rc3w +module load xz/5.4.1-gcc-8.5.0-655mase # libxml2@=2.10.3%gcc@=8.5.0+pic~python+shared build_system=autotools arch=linux-centos8-power9le -module load libxml2/2.10.3-gcc-8.5.0-fee6mnd -# pigz@=2.7%gcc@=8.5.0 build_system=makefile arch=linux-centos8-power9le -module load pigz/2.7-gcc-8.5.0-mmlvzjd +module load libxml2/2.10.3-gcc-8.5.0-kt7uf6w +# pigz@=2.8%gcc@=8.5.0 build_system=makefile arch=linux-centos8-power9le +module load pigz/2.8-gcc-8.5.0-2nhvqh2 # zstd@=1.5.5%gcc@=8.5.0+programs build_system=makefile compression=none libs=shared,static arch=linux-centos8-power9le -module load zstd/1.5.5-gcc-8.5.0-p52n5sn +module load zstd/1.5.5-gcc-8.5.0-l5rig24 # tar@=1.34%gcc@=8.5.0 build_system=autotools zip=pigz arch=linux-centos8-power9le -module load tar/1.34-gcc-8.5.0-fuqnfzk +module load tar/1.34-gcc-8.5.0-ovvdvs3 # gettext@=0.22.4%gcc@=8.5.0+bzip2+curses+git~libunistring+libxml2+pic+shared+tar+xz build_system=autotools arch=linux-centos8-power9le -module load gettext/0.22.4-gcc-8.5.0-mpisnwr +module load gettext/0.22.4-gcc-8.5.0-wacf7kj # texinfo@=7.0.3%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le -module load texinfo/7.0.3-gcc-8.5.0-w6m4l4d -# mpfr@=4.2.0%gcc@=8.5.0 build_system=autotools libs=shared,static arch=linux-centos8-power9le -module load mpfr/4.2.0-gcc-8.5.0-badscyk +module load texinfo/7.0.3-gcc-8.5.0-3tatox3 +# mpfr@=4.2.1%gcc@=8.5.0 build_system=autotools libs=shared,static arch=linux-centos8-power9le +module load mpfr/4.2.1-gcc-8.5.0-qp26atl # suite-sparse@=5.13.0%gcc@=8.5.0~cuda~graphblas~openmp+pic build_system=generic arch=linux-centos8-power9le -module load suite-sparse/5.13.0-gcc-8.5.0-btjz7ko +module load suite-sparse/5.13.0-gcc-8.5.0-e2alwtx # umpire@=6.0.0%gcc@=8.5.0+c+cuda~device_alloc~deviceconst~examples~fortran~ipo~numa~openmp~rocm~shared build_system=cmake build_type=Release cuda_arch=70 generator=make tests=none arch=linux-centos8-power9le -module load umpire/6.0.0-gcc-8.5.0-cu4ij4z -# hiop@=develop%gcc@=8.5.0+cuda~cusolver_lu~deepchecking+ginkgo~ipo~jsrun+kron+mpi+raja~rocm~shared+sparse build_system=cmake build_type=MinSizeRel cuda_arch=70 dev_path=/people/svcexasgd/gitlab/26534/spack_newell/hiop_dev generator=make arch=linux-centos8-power9le -module load hiop/develop-gcc-8.5.0-23kohcb +module load umpire/6.0.0-gcc-8.5.0-k2dmyxy +# hiop@=develop%gcc@=8.5.0+cuda~cusolver_lu~deepchecking+ginkgo~ipo~jsrun+kron+mpi+raja~rocm~shared+sparse build_system=cmake build_type=Release cuda_arch=70 dev_path=/people/svcearthshot/gitlab/30290/spack_newell/hiop_dev generator=make arch=linux-centos8-power9le +module load hiop/develop-gcc-8.5.0-rhaypd6 # ipopt@=3.12.10%gcc@=8.5.0+coinhsl~debug~metis~mumps build_system=autotools arch=linux-centos8-power9le -module load ipopt/3.12.10-gcc-8.5.0-qe5oe6x +module load ipopt/3.12.10-gcc-8.5.0-7sqpcwh # python@=3.8.5%gcc@=8.5.0+bz2+crypt+ctypes+dbm~debug+libxml2+lzma~nis~optimizations+pic+pyexpat+pythoncmd+readline+shared+sqlite3+ssl~tkinter+uuid+zlib build_system=generic patches=0d98e93,4c24573,ebdca64,f2fd060 arch=linux-centos8-power9le -module load python/3.8.5-gcc-8.5.0-dwf3kgs -# petsc@=3.20.2%gcc@=8.5.0~X~batch~cgns~complex~cuda~debug+double~exodusii~fftw+fortran~giflib~hdf5~hpddm~hwloc~hypre~int64~jpeg~knl~kokkos~libpng~libyaml~memkind~metis~mkl-pardiso~mmg~moab~mpfr+mpi~mumps~openmp~p4est~parmmg~ptscotch~random123~rocm~saws~scalapack+shared~strumpack~suite-sparse~superlu-dist~sycl~tetgen~trilinos~valgrind build_system=generic clanguage=C memalign=none arch=linux-centos8-power9le -module load petsc/3.20.2-gcc-8.5.0-3hyboap +module load python/3.8.5-gcc-8.5.0-3ohhmxo +# petsc@=3.20.3%gcc@=8.5.0~X~batch~cgns~complex~cuda~debug+double~exodusii~fftw+fortran~giflib~hdf5~hpddm~hwloc~hypre~int64~jpeg~knl~kokkos~libpng~libyaml~memkind~metis~mkl-pardiso~mmg~moab~mpfr+mpi~mumps~openmp~p4est~parmmg~ptscotch~random123~rocm~saws~scalapack+shared~strumpack~suite-sparse~superlu-dist~sycl~tetgen~trilinos~valgrind~zoltan build_system=generic clanguage=C memalign=none arch=linux-centos8-power9le +module load petsc/3.20.3-gcc-8.5.0-qxxu574 # py-pip@=23.1.2%gcc@=8.5.0 build_system=generic arch=linux-centos8-power9le -module load py-pip/23.1.2-gcc-8.5.0-45skzep +module load py-pip/23.1.2-gcc-8.5.0-altra54 # py-setuptools@=68.0.0%gcc@=8.5.0 build_system=generic arch=linux-centos8-power9le -module load py-setuptools/68.0.0-gcc-8.5.0-be735hh +module load py-setuptools/68.0.0-gcc-8.5.0-rndmqnv # py-wheel@=0.41.2%gcc@=8.5.0 build_system=generic arch=linux-centos8-power9le -module load py-wheel/0.41.2-gcc-8.5.0-o5hqddm +module load py-wheel/0.41.2-gcc-8.5.0-x26btdo # py-cython@=0.29.36%gcc@=8.5.0 build_system=python_pip patches=c4369ad arch=linux-centos8-power9le -module load py-cython/0.29.36-gcc-8.5.0-4lthysc +module load py-cython/0.29.36-gcc-8.5.0-nusktwp # py-mpi4py@=3.1.5%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-mpi4py/3.1.5-gcc-8.5.0-dlyvoe2 +module load py-mpi4py/3.1.5-gcc-8.5.0-rf7gwc6 # py-flit-core@=3.9.0%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-flit-core/3.9.0-gcc-8.5.0-7qlf3hc +module load py-flit-core/3.9.0-gcc-8.5.0-c6bnetl # libmd@=1.0.4%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le -module load libmd/1.0.4-gcc-8.5.0-s5jz3si +module load libmd/1.0.4-gcc-8.5.0-ghqr67q # libbsd@=0.11.7%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le -module load libbsd/0.11.7-gcc-8.5.0-nqmfv4p +module load libbsd/0.11.7-gcc-8.5.0-ji4eh3o # expat@=2.5.0%gcc@=8.5.0+libbsd build_system=autotools arch=linux-centos8-power9le -module load expat/2.5.0-gcc-8.5.0-dl7oihc +module load expat/2.5.0-gcc-8.5.0-udfpyas # libunistring@=1.1%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le -module load libunistring/1.1-gcc-8.5.0-y3gjdbv +module load libunistring/1.1-gcc-8.5.0-epmig4y # libidn2@=2.3.4%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le -module load libidn2/2.3.4-gcc-8.5.0-seplt7v +module load libidn2/2.3.4-gcc-8.5.0-iu6yp7z # bison@=3.8.2%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le -module load bison/3.8.2-gcc-8.5.0-752euud -# findutils@=4.9.0%gcc@=8.5.0 build_system=autotools patches=440b954 arch=linux-centos8-power9le -module load findutils/4.9.0-gcc-8.5.0-j6yj47y +module load bison/3.8.2-gcc-8.5.0-d4pxux7 # krb5@=1.20.1%gcc@=8.5.0+shared build_system=autotools arch=linux-centos8-power9le -module load krb5/1.20.1-gcc-8.5.0-q23rsxg +module load krb5/1.20.1-gcc-8.5.0-4toeerd # libedit@=3.1-20210216%gcc@=8.5.0 build_system=autotools arch=linux-centos8-power9le -module load libedit/3.1-20210216-gcc-8.5.0-xz3heyj +module load libedit/3.1-20210216-gcc-8.5.0-dbftmgn # libxcrypt@=4.4.35%gcc@=8.5.0~obsolete_api build_system=autotools patches=4885da3 arch=linux-centos8-power9le -module load libxcrypt/4.4.35-gcc-8.5.0-mdczuqr +module load libxcrypt/4.4.35-gcc-8.5.0-34deseu # openssh@=9.5p1%gcc@=8.5.0+gssapi build_system=autotools arch=linux-centos8-power9le -module load openssh/9.5p1-gcc-8.5.0-o7j6ws6 +module load openssh/9.5p1-gcc-8.5.0-iypfxiy # pcre2@=10.42%gcc@=8.5.0~jit+multibyte build_system=autotools arch=linux-centos8-power9le -module load pcre2/10.42-gcc-8.5.0-lvf7rst +module load pcre2/10.42-gcc-8.5.0-igublbw # git@=2.42.0%gcc@=8.5.0+man+nls+perl+subtree~svn~tcltk build_system=autotools arch=linux-centos8-power9le -module load git/2.42.0-gcc-8.5.0-kxc64wp +module load git/2.42.0-gcc-8.5.0-wnjkvsr # py-packaging@=23.1%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-packaging/23.1-gcc-8.5.0-fupho4o +module load py-packaging/23.1-gcc-8.5.0-faorpri # py-tomli@=2.0.1%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-tomli/2.0.1-gcc-8.5.0-a4g62fz +module load py-tomli/2.0.1-gcc-8.5.0-zenze6c # py-typing-extensions@=4.8.0%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-typing-extensions/4.8.0-gcc-8.5.0-usi6lq5 +module load py-typing-extensions/4.8.0-gcc-8.5.0-d2bqqhv # py-setuptools-scm@=7.1.0%gcc@=8.5.0+toml build_system=python_pip arch=linux-centos8-power9le -module load py-setuptools-scm/7.1.0-gcc-8.5.0-awwmkj3 +module load py-setuptools-scm/7.1.0-gcc-8.5.0-3tgsvnx # py-flit-scm@=1.7.0%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-flit-scm/1.7.0-gcc-8.5.0-oc4d4zd +module load py-flit-scm/1.7.0-gcc-8.5.0-irmu4g4 # py-exceptiongroup@=1.1.1%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-exceptiongroup/1.1.1-gcc-8.5.0-u4zhjo2 +module load py-exceptiongroup/1.1.1-gcc-8.5.0-iffozcl # py-editables@=0.3%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-editables/0.3-gcc-8.5.0-dcmsfjz +module load py-editables/0.3-gcc-8.5.0-i6vrh67 # py-pathspec@=0.11.1%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-pathspec/0.11.1-gcc-8.5.0-7xbvbhg -# py-pluggy@=1.0.0%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-pluggy/1.0.0-gcc-8.5.0-7tvvt3m +module load py-pathspec/0.11.1-gcc-8.5.0-fenlcx7 +# py-pluggy@=1.4.0%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le +module load py-pluggy/1.4.0-gcc-8.5.0-b6rdncv # py-calver@=2022.6.26%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-calver/2022.6.26-gcc-8.5.0-hgxbsu2 +module load py-calver/2022.6.26-gcc-8.5.0-d6vrsrb # py-trove-classifiers@=2023.8.7%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-trove-classifiers/2023.8.7-gcc-8.5.0-5wwsb65 -# py-hatchling@=1.18.0%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-hatchling/1.18.0-gcc-8.5.0-m7vyucy +module load py-trove-classifiers/2023.8.7-gcc-8.5.0-mwtxbac +# py-hatchling@=1.21.0%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le +module load py-hatchling/1.21.0-gcc-8.5.0-dmwtut6 # py-hatch-vcs@=0.3.0%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-hatch-vcs/0.3.0-gcc-8.5.0-etimeuw +module load py-hatch-vcs/0.3.0-gcc-8.5.0-c5ejpb5 # py-iniconfig@=2.0.0%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-iniconfig/2.0.0-gcc-8.5.0-n4k4cbt -# py-pytest@=7.3.2%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le -module load py-pytest/7.3.2-gcc-8.5.0-aprjpiw -# exago@=develop%gcc@=8.5.0+cuda+hiop~ipo+ipopt+logging+mpi+python+raja~rocm build_system=cmake build_type=MinSizeRel cuda_arch=70 dev_path=/people/svcexasgd/gitlab/26534/spack_newell generator=make arch=linux-centos8-power9le -## module load exago/develop-gcc-8.5.0-frqiwyf +module load py-iniconfig/2.0.0-gcc-8.5.0-7tok6sm +# py-pytest@=8.0.0%gcc@=8.5.0 build_system=python_pip arch=linux-centos8-power9le +module load py-pytest/8.0.0-gcc-8.5.0-pttcqxm +# exago@=develop%gcc@=8.5.0+cuda+hiop~ipo+ipopt+logging+mpi+python+raja~rocm build_system=cmake build_type=Release cuda_arch=70 dev_path=/people/svcearthshot/gitlab/30290/spack_newell generator=make arch=linux-centos8-power9le +## module load exago/develop-gcc-8.5.0-4d5hzqt diff --git a/buildsystem/spack/newell/modules/exago.sh b/buildsystem/spack/newell/modules/exago.sh index 6d97d423d..372788498 100644 --- a/buildsystem/spack/newell/modules/exago.sh +++ b/buildsystem/spack/newell/modules/exago.sh @@ -1,3 +1,3 @@ -module use -a /qfs/projects/exasgd/src/ci-newll/spack-install/ci-modules/linux-centos8-power9le -# exago@=develop%gcc@=8.5.0+cuda+hiop~ipo+ipopt+logging+mpi+python+raja~rocm build_system=cmake build_type=MinSizeRel cuda_arch=70 dev_path=/people/svcexasgd/gitlab/26534/spack_newell generator=make arch=linux-centos8-power9le -module load exago/develop-gcc-8.5.0-frqiwyf +module use -a /qfs/projects/earthshot/src/newell-ci/spack-install/ci-modules/linux-centos8-power9le +# exago@=develop%gcc@=8.5.0+cuda+hiop~ipo+ipopt+logging+mpi+python+raja~rocm build_system=cmake build_type=Release cuda_arch=70 dev_path=/people/svcearthshot/gitlab/30290/spack_newell generator=make arch=linux-centos8-power9le +module load exago/develop-gcc-8.5.0-4d5hzqt From 06cc91ad48218215cac0f0bdefffb32f0cef5904 Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger Date: Tue, 19 Mar 2024 12:30:35 -0700 Subject: [PATCH 21/27] [deception-rebuild] --- buildsystem/spack/load_spack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildsystem/spack/load_spack.sh b/buildsystem/spack/load_spack.sh index 37116b076..80328b3a4 100755 --- a/buildsystem/spack/load_spack.sh +++ b/buildsystem/spack/load_spack.sh @@ -56,7 +56,7 @@ source $base/env.sh && # Use a directory based environment, and decorate command line spack env create -d $SPACKENV $base/spack.yaml && - #spack env activate -p $SPACKENV && + spack env activate -p $SPACKENV && # Print relevant spack config for sanity check of environment. echo "spack configuration will be installed into $SPACK_INSTALL" && From 2a12efc44d8628cdc953aa84008305e39a4d78de Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger Date: Fri, 22 Mar 2024 15:44:44 -0700 Subject: [PATCH 22/27] add +batch to petsc spec [deception-rebuild] --- buildsystem/spack/deception/spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildsystem/spack/deception/spack.yaml b/buildsystem/spack/deception/spack.yaml index 415433db5..ce44ceeac 100644 --- a/buildsystem/spack/deception/spack.yaml +++ b/buildsystem/spack/deception/spack.yaml @@ -32,7 +32,7 @@ spack: umpire: require: ~openmp~examples petsc: - require: ~hypre~superlu-dist~hdf5~metis + require: ~hypre~superlu-dist~hdf5~metis+batch python: externals: - spec: python@3.9.12 From 8b015b469c5241e95483a8f5315790102030b434 Mon Sep 17 00:00:00 2001 From: spack-auto-module Date: Fri, 22 Mar 2024 23:08:48 +0000 Subject: [PATCH 23/27] Update deception spack built tcl modules - [deception-test] --- .../spack/deception/modules/dependencies.sh | 160 +++++++++--------- buildsystem/spack/deception/modules/exago.sh | 6 +- 2 files changed, 85 insertions(+), 81 deletions(-) diff --git a/buildsystem/spack/deception/modules/dependencies.sh b/buildsystem/spack/deception/modules/dependencies.sh index 5c91cb92b..3a8a23c50 100644 --- a/buildsystem/spack/deception/modules/dependencies.sh +++ b/buildsystem/spack/deception/modules/dependencies.sh @@ -1,129 +1,133 @@ -module use -a /qfs/projects/exasgd/src/deception-ci/install/ci-modules/linux-centos7-zen2 +module use -a /qfs/projects/earthshot/src/deception-ci/install/ci-modules/linux-centos7-zen2 # cmake@=3.26.3%gcc@=9.1.0~doc+ncurses+ownlibs build_system=generic build_type=Release arch=linux-centos7-zen2 module load cmake/3.26.3-gcc-9.1.0-wryjrgo +# gcc-runtime@=9.1.0%gcc@=9.1.0 build_system=generic arch=linux-centos7-zen2 +module load gcc-runtime/9.1.0-gcc-9.1.0-abiv3jd # blt@=0.4.1%gcc@=9.1.0 build_system=generic arch=linux-centos7-zen2 -module load blt/0.4.1-gcc-9.1.0-2kcdf2y +module load blt/0.4.1-gcc-9.1.0-r65qngy # cub@=2.1.0%gcc@=9.1.0 build_system=generic arch=linux-centos7-zen2 -module load cub/2.1.0-gcc-9.1.0-wx4parb +module load cub/2.1.0-gcc-9.1.0-toinftv # cuda@=11.4%gcc@=9.1.0~allow-unsupported-compilers~dev build_system=generic arch=linux-centos7-zen2 module load cuda/11.4-gcc-9.1.0-tmrg4gr # gmake@=4.4.1%gcc@=9.1.0~guile build_system=generic arch=linux-centos7-zen2 -module load gmake/4.4.1-gcc-9.1.0-2hyua4w -# camp@=0.2.3%gcc@=9.1.0+cuda~ipo+openmp~rocm~tests build_system=cmake build_type=Release cuda_arch=60,70,75,80 generator=make arch=linux-centos7-zen2 -module load camp/0.2.3-gcc-9.1.0-hyzpmsn +module load gmake/4.4.1-gcc-9.1.0-zro7edd +# camp@=0.2.3%gcc@=9.1.0+cuda~ipo+openmp~rocm~tests build_system=cmake build_type=Release cuda_arch=60,70,75,80 generator=make patches=cb9e25b arch=linux-centos7-zen2 +module load camp/0.2.3-gcc-9.1.0-wrcymwz +# ginkgo@=1.5.0.glu_experimental%gcc@=9.1.0+cuda~develtools~full_optimizations~hwloc~ipo~mpi+openmp~rocm+shared~sycl build_system=cmake build_type=Release cuda_arch=60,70,75,80 generator=make arch=linux-centos7-zen2 +module load ginkgo/1.5.0.glu_experimental-gcc-9.1.0-uxadao2 # perl@=5.26.0%gcc@=9.1.0+cpanm+opcode+open+shared+threads build_system=generic patches=0eac10e,8cf4302 arch=linux-centos7-zen2 -module load perl/5.26.0-gcc-9.1.0-aca44by -# openblas@=0.3.25%gcc@=9.1.0~bignuma~consistent_fpcsr+fortran~ilp64+locking+pic+shared build_system=makefile symbol_suffix=none threads=none arch=linux-centos7-zen2 -module load openblas/0.3.25-gcc-9.1.0-edjd2fv +module load perl/5.26.0-gcc-9.1.0-cjrkygi +# openblas@=0.3.26%gcc@=9.1.0~bignuma~consistent_fpcsr+fortran~ilp64+locking+pic+shared build_system=makefile symbol_suffix=none threads=none arch=linux-centos7-zen2 +module load openblas/0.3.26-gcc-9.1.0-ksf53ii # coinhsl@=2019.05.21%gcc@=9.1.0+blas build_system=autotools arch=linux-centos7-zen2 -module load coinhsl/2019.05.21-gcc-9.1.0-xttde3f -# ginkgo@=1.5.0.glu_experimental%gcc@=9.1.0+cuda~develtools~full_optimizations~hwloc~ipo~mpi+openmp~rocm+shared~sycl build_system=cmake build_type=Release cuda_arch=60,70,75,80 generator=make arch=linux-centos7-zen2 -module load ginkgo/1.5.0.glu_experimental-gcc-9.1.0-byoaioj +module load coinhsl/2019.05.21-gcc-9.1.0-gpha2c7 # magma@=2.6.2%gcc@=9.1.0+cuda+fortran~ipo~rocm+shared build_system=cmake build_type=Release cuda_arch=60,70,75,80 generator=make arch=linux-centos7-zen2 -module load magma/2.6.2-gcc-9.1.0-eybt5h4 +module load magma/2.6.2-gcc-9.1.0-5sbhjkx # metis@=5.1.0%gcc@=9.1.0~gdb~int64~ipo~real64+shared build_system=cmake build_type=Release generator=make patches=4991da9,93a7903,b1225da arch=linux-centos7-zen2 -module load metis/5.1.0-gcc-9.1.0-yjhcoa3 -# openmpi@=4.1.0mlx5.0%gcc@=9.1.0~atomics~cuda~cxx~cxx_exceptions~gpfs~internal-hwloc~internal-pmix~java~legacylaunchers~lustre~memchecker~openshmem~orterunprefix+romio+rsh~singularity+static+vt+wrapper-rpath build_system=autotools fabrics=none patches=60ce20b schedulers=none arch=linux-centos7-zen2 -module load openmpi/4.1.0mlx5.0-gcc-9.1.0-vj5ufod +module load metis/5.1.0-gcc-9.1.0-f7o2p3m +# openmpi@=4.1.0mlx5.0%gcc@=9.1.0~atomics~cuda~cxx~cxx_exceptions~gpfs~internal-hwloc~internal-libevent~internal-pmix~java~legacylaunchers~lustre~memchecker~openshmem~orterunprefix~romio+rsh~singularity~static+vt+wrapper-rpath build_system=autotools fabrics=none patches=60ce20b schedulers=none arch=linux-centos7-zen2 +module load openmpi/4.1.0mlx5.0-gcc-9.1.0-wxzawxc # raja@=0.14.0%gcc@=9.1.0+cuda~examples~exercises~ipo+openmp~plugins~rocm+shared~tests build_system=cmake build_type=Release cuda_arch=60,70,75,80 generator=make arch=linux-centos7-zen2 -module load raja/0.14.0-gcc-9.1.0-tq2hxbw +module load raja/0.14.0-gcc-9.1.0-poskbuz # libiconv@=1.17%gcc@=9.1.0 build_system=autotools libs=shared,static arch=linux-centos7-zen2 -module load libiconv/1.17-gcc-9.1.0-ryrjbul -# diffutils@=3.9%gcc@=9.1.0 build_system=autotools arch=linux-centos7-zen2 -module load diffutils/3.9-gcc-9.1.0-4r6gzdy +module load libiconv/1.17-gcc-9.1.0-2st3zf2 +# diffutils@=3.10%gcc@=9.1.0 build_system=autotools arch=linux-centos7-zen2 +module load diffutils/3.10-gcc-9.1.0-ackf5zf # libsigsegv@=2.14%gcc@=9.1.0 build_system=autotools arch=linux-centos7-zen2 -module load libsigsegv/2.14-gcc-9.1.0-cy447uk +module load libsigsegv/2.14-gcc-9.1.0-6jgesu5 # m4@=1.4.19%gcc@=9.1.0+sigsegv build_system=autotools patches=9dc5fbd,bfdffa7 arch=linux-centos7-zen2 -module load m4/1.4.19-gcc-9.1.0-yf2slnz -# autoconf@=2.69%gcc@=9.1.0 build_system=autotools patches=35c4492,7793209,a49dd5b arch=linux-centos7-zen2 -module load autoconf/2.69-gcc-9.1.0-fj76bwy +module load m4/1.4.19-gcc-9.1.0-upgj45g +# autoconf@=2.72%gcc@=9.1.0 build_system=autotools arch=linux-centos7-zen2 +module load autoconf/2.72-gcc-9.1.0-f7ut5ij # automake@=1.16.5%gcc@=9.1.0 build_system=autotools arch=linux-centos7-zen2 -module load automake/1.16.5-gcc-9.1.0-6ciswaj +module load automake/1.16.5-gcc-9.1.0-rt4hcgd +# findutils@=4.9.0%gcc@=9.1.0 build_system=autotools patches=440b954 arch=linux-centos7-zen2 +module load findutils/4.9.0-gcc-9.1.0-265efmp # libtool@=2.4.7%gcc@=9.1.0 build_system=autotools arch=linux-centos7-zen2 -module load libtool/2.4.7-gcc-9.1.0-tsf7hsq +module load libtool/2.4.7-gcc-9.1.0-7gpcxtf # gmp@=6.2.1%gcc@=9.1.0+cxx build_system=autotools libs=shared,static patches=69ad2e2 arch=linux-centos7-zen2 -module load gmp/6.2.1-gcc-9.1.0-tsjd6bm +module load gmp/6.2.1-gcc-9.1.0-q5u7hor # autoconf-archive@=2023.02.20%gcc@=9.1.0 build_system=autotools arch=linux-centos7-zen2 -module load autoconf-archive/2023.02.20-gcc-9.1.0-ebkhgoh +module load autoconf-archive/2023.02.20-gcc-9.1.0-v26a2vn # bzip2@=1.0.8%gcc@=9.1.0~debug~pic+shared build_system=generic arch=linux-centos7-zen2 -module load bzip2/1.0.8-gcc-9.1.0-mfp2wwg +module load bzip2/1.0.8-gcc-9.1.0-ckcsq7c # pkgconf@=1.9.5%gcc@=9.1.0 build_system=autotools arch=linux-centos7-zen2 -module load pkgconf/1.9.5-gcc-9.1.0-bg6z6dj -# xz@=5.4.1%gcc@=9.1.0~pic build_system=autotools libs=shared,static arch=linux-centos7-zen2 -module load xz/5.4.1-gcc-9.1.0-cflgxw5 +module load pkgconf/1.9.5-gcc-9.1.0-zmbhfgn +# xz@=5.4.6%gcc@=9.1.0~pic build_system=autotools libs=shared,static arch=linux-centos7-zen2 +module load xz/5.4.6-gcc-9.1.0-nqmk7cs # zlib@=1.3%gcc@=9.1.0+optimize+pic+shared build_system=makefile arch=linux-centos7-zen2 -module load zlib/1.3-gcc-9.1.0-3ckc3rk +module load zlib/1.3-gcc-9.1.0-glaosn3 # libxml2@=2.10.3%gcc@=9.1.0+pic~python+shared build_system=autotools arch=linux-centos7-zen2 -module load libxml2/2.10.3-gcc-9.1.0-kel6jjt +module load libxml2/2.10.3-gcc-9.1.0-2tijqp2 # ncurses@=6.4%gcc@=9.1.0~symlinks+termlib abi=none build_system=autotools arch=linux-centos7-zen2 -module load ncurses/6.4-gcc-9.1.0-aurkwew -# pigz@=2.7%gcc@=9.1.0 build_system=makefile arch=linux-centos7-zen2 -module load pigz/2.7-gcc-9.1.0-pvzit7o +module load ncurses/6.4-gcc-9.1.0-ue2vvf3 +# pigz@=2.8%gcc@=9.1.0 build_system=makefile arch=linux-centos7-zen2 +module load pigz/2.8-gcc-9.1.0-mvwpico # zstd@=1.5.5%gcc@=9.1.0+programs build_system=makefile compression=none libs=shared,static arch=linux-centos7-zen2 -module load zstd/1.5.5-gcc-9.1.0-lcexipe +module load zstd/1.5.5-gcc-9.1.0-twxts5j # tar@=1.34%gcc@=9.1.0 build_system=autotools zip=pigz arch=linux-centos7-zen2 -module load tar/1.34-gcc-9.1.0-vpzflun +module load tar/1.34-gcc-9.1.0-yivbsi7 # gettext@=0.22.4%gcc@=9.1.0+bzip2+curses+git~libunistring+libxml2+pic+shared+tar+xz build_system=autotools arch=linux-centos7-zen2 -module load gettext/0.22.4-gcc-9.1.0-6bwgojr +module load gettext/0.22.4-gcc-9.1.0-ivckr74 # texinfo@=7.0.3%gcc@=9.1.0 build_system=autotools arch=linux-centos7-zen2 -module load texinfo/7.0.3-gcc-9.1.0-kwmj254 -# mpfr@=4.2.0%gcc@=9.1.0 build_system=autotools libs=shared,static arch=linux-centos7-zen2 -module load mpfr/4.2.0-gcc-9.1.0-2d5o4yj +module load texinfo/7.0.3-gcc-9.1.0-phuxsxp +# mpfr@=4.2.1%gcc@=9.1.0 build_system=autotools libs=shared,static arch=linux-centos7-zen2 +module load mpfr/4.2.1-gcc-9.1.0-gbnsni6 # suite-sparse@=5.13.0%gcc@=9.1.0~cuda~graphblas~openmp+pic build_system=generic arch=linux-centos7-zen2 -module load suite-sparse/5.13.0-gcc-9.1.0-aytsg72 +module load suite-sparse/5.13.0-gcc-9.1.0-jwgbvrn # umpire@=6.0.0%gcc@=9.1.0+c+cuda~device_alloc~deviceconst~examples~fortran~ipo~numa~openmp~rocm~shared build_system=cmake build_type=Release cuda_arch=60,70,75,80 generator=make tests=none arch=linux-centos7-zen2 -module load umpire/6.0.0-gcc-9.1.0-zh3kabb -# hiop@=develop%gcc@=9.1.0+cuda~cusolver_lu~deepchecking+ginkgo~ipo~jsrun+kron+mpi+raja~rocm~shared+sparse build_system=cmake build_type=MinSizeRel cuda_arch=60,70,75,80 dev_path=/people/svcexasgd/gitlab/26535/spack_deception/hiop_dev generator=make arch=linux-centos7-zen2 -module load hiop/develop-gcc-9.1.0-v5bgi52 +module load umpire/6.0.0-gcc-9.1.0-o2367nu +# hiop@=develop%gcc@=9.1.0+cuda~cusolver_lu~deepchecking+ginkgo~ipo~jsrun+kron+mpi+raja~rocm~shared+sparse build_system=cmake build_type=Release cuda_arch=60,70,75,80 dev_path=/people/svcearthshot/gitlab/31746/spack_deception/hiop_dev generator=make arch=linux-centos7-zen2 +module load hiop/develop-gcc-9.1.0-xa72s2d # ipopt@=3.12.10%gcc@=9.1.0+coinhsl~debug~metis~mumps build_system=autotools arch=linux-centos7-zen2 -module load ipopt/3.12.10-gcc-9.1.0-li7gpqb +module load ipopt/3.12.10-gcc-9.1.0-zdw2vxv # python@=3.9.12%gcc@=9.1.0+bz2+crypt+ctypes+dbm~debug+libxml2+lzma~nis~optimizations+pic+pyexpat+pythoncmd+readline+shared+sqlite3+ssl~tkinter+uuid+zlib build_system=generic patches=0d98e93,4c24573,ebdca64,f2fd060 arch=linux-centos7-zen2 -module load python/3.9.12-gcc-9.1.0-a5w6cuq -# petsc@=3.20.2%gcc@=9.1.0~X~batch~cgns~complex~cuda~debug+double~exodusii~fftw+fortran~giflib~hdf5~hpddm~hwloc~hypre~int64~jpeg~knl~kokkos~libpng~libyaml~memkind~metis~mkl-pardiso~mmg~moab~mpfr+mpi~mumps~openmp~p4est~parmmg~ptscotch~random123~rocm~saws~scalapack+shared~strumpack~suite-sparse~superlu-dist~sycl~tetgen~trilinos~valgrind build_system=generic clanguage=C memalign=none arch=linux-centos7-zen2 -module load petsc/3.20.2-gcc-9.1.0-orrankw +module load python/3.9.12-gcc-9.1.0-xlhqfig +# petsc@=3.20.4%gcc@=9.1.0~X+batch~cgns~complex~cuda~debug+double~exodusii~fftw+fortran~giflib~hdf5~hpddm~hwloc~hypre~int64~jpeg~knl~kokkos~libpng~libyaml~memkind~metis~mkl-pardiso~mmg~moab~mpfr+mpi~mumps~openmp~p4est~parmmg~ptscotch~random123~rocm~saws~scalapack+shared~strumpack~suite-sparse~superlu-dist~sycl~tetgen~trilinos~valgrind~zoltan build_system=generic clanguage=C memalign=none arch=linux-centos7-zen2 +module load petsc/3.20.4-gcc-9.1.0-qvnl7v7 # py-pip@=23.1.2%gcc@=9.1.0 build_system=generic arch=linux-centos7-zen2 -module load py-pip/23.1.2-gcc-9.1.0-pvy73ms -# py-setuptools@=68.0.0%gcc@=9.1.0 build_system=generic arch=linux-centos7-zen2 -module load py-setuptools/68.0.0-gcc-9.1.0-fef5ebz +module load py-pip/23.1.2-gcc-9.1.0-nrjrbog +# py-setuptools@=69.2.0%gcc@=9.1.0 build_system=generic arch=linux-centos7-zen2 +module load py-setuptools/69.2.0-gcc-9.1.0-wruumo7 # py-wheel@=0.41.2%gcc@=9.1.0 build_system=generic arch=linux-centos7-zen2 -module load py-wheel/0.41.2-gcc-9.1.0-ycwjnxk +module load py-wheel/0.41.2-gcc-9.1.0-ouezqxe # py-cython@=0.29.36%gcc@=9.1.0 build_system=python_pip patches=c4369ad arch=linux-centos7-zen2 -module load py-cython/0.29.36-gcc-9.1.0-lhxhitm +module load py-cython/0.29.36-gcc-9.1.0-v4ukl22 # py-mpi4py@=3.1.5%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-mpi4py/3.1.5-gcc-9.1.0-7xg3hnu +module load py-mpi4py/3.1.5-gcc-9.1.0-kuiww6g # py-flit-core@=3.9.0%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-flit-core/3.9.0-gcc-9.1.0-tgih3ig +module load py-flit-core/3.9.0-gcc-9.1.0-2dpwfr7 # git@=2.37.3%gcc@=9.1.0+man+nls+perl+subtree~svn~tcltk build_system=autotools arch=linux-centos7-zen2 module load git/2.37.3-gcc-9.1.0-qxn54jq # py-packaging@=23.1%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-packaging/23.1-gcc-9.1.0-3uczz47 +module load py-packaging/23.1-gcc-9.1.0-mnl5iwv # py-tomli@=2.0.1%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-tomli/2.0.1-gcc-9.1.0-6w6ssdm +module load py-tomli/2.0.1-gcc-9.1.0-24mbqlo # py-typing-extensions@=4.8.0%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-typing-extensions/4.8.0-gcc-9.1.0-iv3gy6a +module load py-typing-extensions/4.8.0-gcc-9.1.0-2lhchlw # py-setuptools-scm@=7.1.0%gcc@=9.1.0+toml build_system=python_pip arch=linux-centos7-zen2 -module load py-setuptools-scm/7.1.0-gcc-9.1.0-huz56hs +module load py-setuptools-scm/7.1.0-gcc-9.1.0-jw2iop6 # py-flit-scm@=1.7.0%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-flit-scm/1.7.0-gcc-9.1.0-ihypnl3 +module load py-flit-scm/1.7.0-gcc-9.1.0-kbgm7pu # py-exceptiongroup@=1.1.1%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-exceptiongroup/1.1.1-gcc-9.1.0-2uuhbhc +module load py-exceptiongroup/1.1.1-gcc-9.1.0-qs5eakf # py-editables@=0.3%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-editables/0.3-gcc-9.1.0-6c6asxe +module load py-editables/0.3-gcc-9.1.0-arv3gc3 # py-pathspec@=0.11.1%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-pathspec/0.11.1-gcc-9.1.0-tja5anm -# py-pluggy@=1.0.0%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-pluggy/1.0.0-gcc-9.1.0-gmrzy4m +module load py-pathspec/0.11.1-gcc-9.1.0-3vaax3z +# py-pluggy@=1.4.0%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 +module load py-pluggy/1.4.0-gcc-9.1.0-b6gb62e # py-calver@=2022.6.26%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-calver/2022.6.26-gcc-9.1.0-6pb422e +module load py-calver/2022.6.26-gcc-9.1.0-q26c62c # py-trove-classifiers@=2023.8.7%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-trove-classifiers/2023.8.7-gcc-9.1.0-wvlyozv -# py-hatchling@=1.18.0%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-hatchling/1.18.0-gcc-9.1.0-qpw4or6 +module load py-trove-classifiers/2023.8.7-gcc-9.1.0-wumpenj +# py-hatchling@=1.21.0%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 +module load py-hatchling/1.21.0-gcc-9.1.0-6rpq2y3 # py-hatch-vcs@=0.3.0%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-hatch-vcs/0.3.0-gcc-9.1.0-hwwyqic +module load py-hatch-vcs/0.3.0-gcc-9.1.0-tfm37qn # py-iniconfig@=2.0.0%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-iniconfig/2.0.0-gcc-9.1.0-raa2jbg -# py-pytest@=7.3.2%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 -module load py-pytest/7.3.2-gcc-9.1.0-2nh22mh -# exago@=develop%gcc@=9.1.0+cuda+hiop~ipo+ipopt+logging+mpi+python+raja~rocm build_system=cmake build_type=MinSizeRel cuda_arch=60,70,75,80 dev_path=/people/svcexasgd/gitlab/26535/spack_deception generator=make arch=linux-centos7-zen2 -## module load exago/develop-gcc-9.1.0-tk4zxrz +module load py-iniconfig/2.0.0-gcc-9.1.0-mtbo5hz +# py-pytest@=8.0.0%gcc@=9.1.0 build_system=python_pip arch=linux-centos7-zen2 +module load py-pytest/8.0.0-gcc-9.1.0-c72o7pz +# exago@=develop%gcc@=9.1.0+cuda+hiop~ipo+ipopt+logging+mpi+python+raja~rocm build_system=cmake build_type=Release cuda_arch=60,70,75,80 dev_path=/people/svcearthshot/gitlab/31746/spack_deception generator=make arch=linux-centos7-zen2 +## module load exago/develop-gcc-9.1.0-3h2zyl5 diff --git a/buildsystem/spack/deception/modules/exago.sh b/buildsystem/spack/deception/modules/exago.sh index 3116954b2..a83b9d1c0 100644 --- a/buildsystem/spack/deception/modules/exago.sh +++ b/buildsystem/spack/deception/modules/exago.sh @@ -1,3 +1,3 @@ -module use -a /qfs/projects/exasgd/src/deception-ci/install/ci-modules/linux-centos7-zen2 -# exago@=develop%gcc@=9.1.0+cuda+hiop~ipo+ipopt+logging+mpi+python+raja~rocm build_system=cmake build_type=MinSizeRel cuda_arch=60,70,75,80 dev_path=/people/svcexasgd/gitlab/26535/spack_deception generator=make arch=linux-centos7-zen2 -module load exago/develop-gcc-9.1.0-tk4zxrz +module use -a /qfs/projects/earthshot/src/deception-ci/install/ci-modules/linux-centos7-zen2 +# exago@=develop%gcc@=9.1.0+cuda+hiop~ipo+ipopt+logging+mpi+python+raja~rocm build_system=cmake build_type=Release cuda_arch=60,70,75,80 dev_path=/people/svcearthshot/gitlab/31746/spack_deception generator=make arch=linux-centos7-zen2 +module load exago/develop-gcc-9.1.0-3h2zyl5 From 32208250bdce9f8be5c9567e9065a90e30e3b008 Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger Date: Fri, 22 Mar 2024 16:13:02 -0700 Subject: [PATCH 24/27] add +batch to petsc spec [incline-rebuild] --- buildsystem/spack/incline/spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildsystem/spack/incline/spack.yaml b/buildsystem/spack/incline/spack.yaml index e38de5fca..97735dac0 100644 --- a/buildsystem/spack/incline/spack.yaml +++ b/buildsystem/spack/incline/spack.yaml @@ -73,7 +73,7 @@ spack: require: '@2.6.2' # See !495 petsc: - require: "@3.20.1~hypre~superlu-dist~hdf5~metis" + require: "@3.20.1~hypre~superlu-dist~hdf5~metis+batch" binutils: variants: +ld +gold +headers +libiberty ~nls elfutils: From 9b066c9f3087c46037e09595620fa58c8f4ebde4 Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Wed, 27 Mar 2024 14:39:38 -0700 Subject: [PATCH 25/27] temporarily disable incline testing --- .gitlab/pnnl/.gitlab-ci.yml | 12 +++---- .gitlab/pnnl/base.gitlab-ci.yml | 56 ++++++++++++++++----------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.gitlab/pnnl/.gitlab-ci.yml b/.gitlab/pnnl/.gitlab-ci.yml index 05ba53e94..fb6cd3dc4 100644 --- a/.gitlab/pnnl/.gitlab-ci.yml +++ b/.gitlab/pnnl/.gitlab-ci.yml @@ -12,12 +12,12 @@ trigger_newell: - local: .gitlab/pnnl/base.gitlab-ci.yml - local: .gitlab/pnnl/newell.gitlab-ci.yml -trigger_incline: - needs: [] - trigger: - include: - - local: .gitlab/pnnl/base.gitlab-ci.yml - - local: .gitlab/pnnl/incline.gitlab-ci.yml +#trigger_incline: +# needs: [] +# trigger: +# include: +# - local: .gitlab/pnnl/base.gitlab-ci.yml +# - local: .gitlab/pnnl/incline.gitlab-ci.yml SVC-Account-Cleanup: image: kfox1111/slurm:deception2 diff --git a/.gitlab/pnnl/base.gitlab-ci.yml b/.gitlab/pnnl/base.gitlab-ci.yml index 7e060df3a..d2ebab92e 100644 --- a/.gitlab/pnnl/base.gitlab-ci.yml +++ b/.gitlab/pnnl/base.gitlab-ci.yml @@ -21,9 +21,9 @@ include: if: '$CI_COMMIT_TITLE =~ /\[deception-rebuild\]/' when: never # Only run when the commit **DOES NOT** contains "[incline-rebuild]" - - &rule_no_incline_rebuild - if: '$CI_COMMIT_TITLE =~ /\[incline-rebuild\]/' - when: never +# - &rule_no_incline_rebuild +# if: '$CI_COMMIT_TITLE =~ /\[incline-rebuild\]/' +# when: never # Only run when the commit **DOES NOT** contains "[ascent-rebuild]" - &rule_no_ascent_rebuild if: '$CI_COMMIT_TITLE =~ /\[ascent-rebuild\]/' @@ -45,13 +45,13 @@ include: if: '$CI_COMMIT_TITLE =~ /\[deception-test\]/' when: always # Only run when the commit **DOES NOT** contains "[incline-test]" - - &rule_no_incline_test - if: '$CI_COMMIT_TITLE =~ /\[incline-test\]/' - when: never +# - &rule_no_incline_test +# if: '$CI_COMMIT_TITLE =~ /\[incline-test\]/' +# when: never # Only run when the commit **DOES** contains "[incline-test]" - - &rule_yes_incline_test - if: '$CI_COMMIT_TITLE =~ /\[incline-test\]/' - when: always +# - &rule_yes_incline_test +# if: '$CI_COMMIT_TITLE =~ /\[incline-test\]/' +# when: always # Only run when the commit **DOES NOT** contains "[ascent-test]" - &rule_no_ascent_test if: '$CI_COMMIT_TITLE =~ /\[ascent-test\]/' @@ -372,8 +372,8 @@ stages: - *rule_no_deception_rebuild - *rule_no_newell_test - *rule_no_newell_rebuild - - *rule_no_incline_test - - *rule_no_incline_rebuild +# - *rule_no_incline_test +# - *rule_no_incline_rebuild - *rule_no_ascent_test - *rule_no_ascent_rebuild - *default @@ -389,8 +389,8 @@ stages: - *rule_no_deception_rebuild - *rule_yes_newell_test - *rule_no_newell_rebuild - - *rule_no_incline_test - - *rule_no_incline_rebuild +# - *rule_no_incline_test +# - *rule_no_incline_rebuild - *rule_no_ascent_test - *rule_no_ascent_rebuild - *default @@ -399,18 +399,18 @@ stages: MY_CLUSTER: "newell" SLURM_ARGS: " --gres=gpu:1 --ntasks=3 " -.incline: - rules: - - *rule_no_deception_test - - *rule_no_deception_rebuild - - *rule_no_newell_test - - *rule_no_newell_rebuild - - *rule_yes_incline_test - - *rule_no_incline_rebuild - - *rule_no_ascent_test - - *rule_no_ascent_rebuild - - *default - variables: - WORKDIR_SUFFIX: "x86_64-clang-hip-build" - MY_CLUSTER: "incline" - SLURM_ARGS: " --exclusive --ntasks=3 " +#.incline: +# rules: +# - *rule_no_deception_test +# - *rule_no_deception_rebuild +# - *rule_no_newell_test +# - *rule_no_newell_rebuild +# - *rule_yes_incline_test +# - *rule_no_incline_rebuild +# - *rule_no_ascent_test +# - *rule_no_ascent_rebuild +# - *default +# variables: +# WORKDIR_SUFFIX: "x86_64-clang-hip-build" +# MY_CLUSTER: "incline" +# SLURM_ARGS: " --exclusive --ntasks=3 " From 8f1aa72d0ec38f06454a11baa3cfb9bd2cf09abe Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Tue, 2 Apr 2024 12:42:26 -0700 Subject: [PATCH 26/27] apply suggestions from code review Co-authored-by: Cameron Rutherford --- .gitlab/pnnl/.gitlab-ci.yml | 1 + .gitlab/pnnl/README.md | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab/pnnl/.gitlab-ci.yml b/.gitlab/pnnl/.gitlab-ci.yml index fb6cd3dc4..240246383 100644 --- a/.gitlab/pnnl/.gitlab-ci.yml +++ b/.gitlab/pnnl/.gitlab-ci.yml @@ -12,6 +12,7 @@ trigger_newell: - local: .gitlab/pnnl/base.gitlab-ci.yml - local: .gitlab/pnnl/newell.gitlab-ci.yml +# See - #132 #trigger_incline: # needs: [] # trigger: diff --git a/.gitlab/pnnl/README.md b/.gitlab/pnnl/README.md index 1cbba4c7c..1bac3f170 100644 --- a/.gitlab/pnnl/README.md +++ b/.gitlab/pnnl/README.md @@ -2,7 +2,7 @@ To run on our HPC clusters at PNNL while hosting our code base on GitHub, we utilize PNNL's CI/CD services on GitLab. -With GitLab premium, integration between GitHub and GitLab is included. This is how we have architected a solution with the base level GitLab offering. +With GitLab premium, integration between GitHub and GitLab is included. The tier of GitLab that we have does not and did not initially support this. While switching to premium would alleviate some of the burden here, our technical requirements expanded having to test on more than one cluster. This is how we have architected a solution with the base level GitLab offering. The PNNL GitLab repository is a push mirror of the GitHub. So whenever a commit is pushed to a pull request or the `main` branch - the changes are pushed to the GitLab and a CI pipeline is triggered. @@ -12,7 +12,7 @@ The PNNL GitLab repository is a push mirror of the GitHub. So whenever a commit In `pnnl_mirror.yaml`, we use the variables `GIT_USER`, `GIT_PASSWORD`, and `PNNL_PIPELINE_TRIGGER`. `GIT_PASSWORD` and `PNNL_PIPELINE_TRIGGER` are generated in GitLab and then added to GitHub. -(TODO: is GIT_USER just something you add directly into github?) +`GIT_USER` is the username of whoever will be authenticated when pushing to GitLab for the mirror action. Since we then manually trigger CI after that, and explicitly skip CI here, this name is cosmetic. a) GIT_PASSWORD Go to Settings > Access Tokens. Click `Add new token`. From 1a3fcdd1abe18d3b4a07a1c59ed416979deafbfa Mon Sep 17 00:00:00 2001 From: Jaelyn Litzinger <93339979+jaelynlitz@users.noreply.github.com> Date: Tue, 2 Apr 2024 12:49:11 -0700 Subject: [PATCH 27/27] fix formatting [skip-ci] --- .gitlab/pnnl/README.md | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.gitlab/pnnl/README.md b/.gitlab/pnnl/README.md index 1bac3f170..650dc6962 100644 --- a/.gitlab/pnnl/README.md +++ b/.gitlab/pnnl/README.md @@ -10,7 +10,7 @@ The PNNL GitLab repository is a push mirror of the GitHub. So whenever a commit 1. Push mirror & pipeline trigger -In `pnnl_mirror.yaml`, we use the variables `GIT_USER`, `GIT_PASSWORD`, and `PNNL_PIPELINE_TRIGGER`. `GIT_PASSWORD` and `PNNL_PIPELINE_TRIGGER` are generated in GitLab and then added to GitHub. +In [`pnnl_mirror.yaml`](/.github/workflows/pnnl_mirror.yaml), we use the variables `GIT_USER`, `GIT_PASSWORD`, and `PNNL_PIPELINE_TRIGGER`. `GIT_PASSWORD` and `PNNL_PIPELINE_TRIGGER` are generated in GitLab and then added to GitHub. `GIT_USER` is the username of whoever will be authenticated when pushing to GitLab for the mirror action. Since we then manually trigger CI after that, and explicitly skip CI here, this name is cosmetic. @@ -46,18 +46,22 @@ a) Generate token #1 (`GITLAB_MIRROR_STATUS`) Go to your GitHub profile > Settings > Developer Settings > Personal access tokens > Fine-grained tokens. -Generate new token +Generate new token: +``` resource owner = pnnl select repositories = pnnl/exago permissions > repository permissions > commit statuses (read and write) copy this token +``` -Go to GitLab > Settings > CI/CD > Variables +Go to GitLab > Settings > CI/CD > Variables: +``` add variable type = file do not protect/mask/expand key = GITHUB_CURL_HEADER Value = `Authorization: token ` +``` See https://ecp-ci.gitlab.io/docs/guides/build-status-gitlab.html for more details. @@ -65,19 +69,22 @@ b) Generate token #2 (`GITLAB_COMMIT`) Go to your GitHub profile > Settings > Developer Settings > Personal access tokens > Fine-grained tokens. -Generate new token +Generate new token: +``` resource owner = pnnl select repositories = pnnl/exago permissions > repository permissions > contents (read and write) - copy this token + +``` -Go to GitLab > Settings > CI/CD > Variables +Go to GitLab > Settings > CI/CD > Variables: +``` add variable type = variable do not protect key = SPACK_GIT_TOKEN - paste in value field - + +``` ## Change path to `.gitlab-ci.yml`