Pin [email protected] on all CI platforms [decetpion-rebuild] [ascent-rebuil…

…d] [newell-rebuild] [incline-rebuild]
pnnl · Oct 12, 2023 · 1516a74 · 1516a74
1 parent 94f54aa
commit 1516a74
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 19 deletions.
diff --git a/buildsystem/spack/ascent/bsub.sh b/buildsystem/spack/ascent/bsub.sh
@@ -60,8 +60,6 @@ cd $(pwd)/hiop &&
 git submodule update --init --recursive &&
 cd - &&
 spack mirror add local file://$SPACK_MIRROR &&
-# This is necessary?
-spack mirror add spack-public file://$SPACK_MIRROR &&
 spack mirror list &&
 cp /gpfs/wolf/proj-shared/csc359/src/coinhsl-archive-2019.05.21.tar.gz . &&
 # Need to load self-installed patch since it is not available on compute nodes

diff --git a/buildsystem/spack/ascent/spack.yaml b/buildsystem/spack/ascent/spack.yaml
@@ -41,7 +41,7 @@ spack:
     exago:
       require: +raja+hiop+ipopt
     hiop:
-      require: '@develop+sparse+mpi+ginkgo+kron+cusolver_lu'
+      require: '@1.0.0+sparse+mpi+ginkgo+kron+cusolver_lu'
     coinhsl:
       require: '@2019.05.21'
     ipopt:

diff --git a/buildsystem/spack/deception/sbatch.sh b/buildsystem/spack/deception/sbatch.sh
@@ -44,12 +44,12 @@ cleanup() {
 export MY_CLUSTER=deception
 cp /qfs/projects/exasgd/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 develop --clone --force FORCE --path=$(pwd)/hiop hiop@develop &&
-cd $(pwd)/hiop &&
-git submodule update --init --recursive &&
-cd - &&
+# spack clean -abm &&  # shouldn't run this everytime...
+# spack develop --no-clone --path=$(pwd) exago@develop &&
+# spack develop --clone --force FORCE --path=$(pwd)/hiop hiop@develop &&
+# cd $(pwd)/hiop &&
+# git submodule update --init --recursive &&
+# cd - &&
 ./buildsystem/spack/configure_modules.sh 64
 
 EXIT_CODE=$?

diff --git a/buildsystem/spack/deception/spack.yaml b/buildsystem/spack/deception/spack.yaml
@@ -19,7 +19,7 @@ spack:
     exago:
       require: +raja+hiop+ipopt
     hiop:
-      require: '@develop+sparse+mpi+ginkgo+kron'
+      require: '@1.0.0+sparse+mpi+ginkgo+kron'
     magma:
       require: '@2.6.2'
     coinhsl:

diff --git a/buildsystem/spack/incline/spack.yaml b/buildsystem/spack/incline/spack.yaml
@@ -56,8 +56,8 @@ spack:
       require: ~python+raja+hiop+rocm+ipopt 
     hiop:
     # TODO - build with Ginkgo #463
-    # TODO - updgrade to develop / 1.0.0
-      require: '@0.7.2+sparse+mpi+raja+rocm~ginkgo+kron'
+    # TODO - updgrade to develop / 1.0.0 #28
+      require: '@1.0.0+sparse+mpi+raja+rocm~ginkgo+kron'
     ipopt:
       require: '@3.12.10~metis+coinhsl~mumps'
     # Pin version of OpenBlas for testing results

diff --git a/buildsystem/spack/newell/sbatch.sh b/buildsystem/spack/newell/sbatch.sh
@@ -44,12 +44,12 @@ cleanup() {
 export MY_CLUSTER=newell
 cp /qfs/projects/exasgd/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 develop --clone --force FORCE --path=$(pwd)/hiop hiop@develop &&
-cd $(pwd)/hiop &&
-git submodule update --init --recursive &&
-cd - &&
+# spack clean -abm && # shouldn't run this everytime...
+# spack develop --no-clone --path=$(pwd) exago@develop &&
+# spack develop --clone --force FORCE --path=$(pwd)/hiop hiop@develop &&
+# cd $(pwd)/hiop &&
+# git submodule update --init --recursive &&
+# cd - &&
 ./buildsystem/spack/configure_modules.sh 128
 
 EXIT_CODE=$?

diff --git a/buildsystem/spack/newell/spack.yaml b/buildsystem/spack/newell/spack.yaml
@@ -19,7 +19,7 @@ spack:
     exago:
       require: +raja+hiop+ipopt
     hiop:
-      require: '@develop+sparse+mpi+ginkgo+kron'
+      require: '@1.0.0+sparse+mpi+ginkgo+kron'
     magma:
       require: '@2.6.2'
     coinhsl: