From 741ce9a2fd3b48d2516f57cf796274ee49b7aa38 Mon Sep 17 00:00:00 2001
From: "Rutherford, Cameron" <robert.rutherford@pnnl.gov>
Date: Thu, 12 Oct 2023 11:46:44 -0400
Subject: [PATCH] Force python rebuild on ascent and use hiop@0.7.2 on incline
 [ascent-rebuild] [newell-rebuild] [incline-rebuild]

---
 buildsystem/spack/ascent/spack.yaml  | 2 +-
 buildsystem/spack/incline/sbatch.sh  | 8 ++++----
 buildsystem/spack/incline/spack.yaml | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/buildsystem/spack/ascent/spack.yaml b/buildsystem/spack/ascent/spack.yaml
index b2206bb0..568992d1 100644
--- a/buildsystem/spack/ascent/spack.yaml
+++ b/buildsystem/spack/ascent/spack.yaml
@@ -5,7 +5,7 @@ spack:
   view: false
   concretizer:
     unify: when_possible
-    reuse: true
+    reuse: false
   config:
     concretizer: clingo
     install_tree:
diff --git a/buildsystem/spack/incline/sbatch.sh b/buildsystem/spack/incline/sbatch.sh
index bdfdf27c..af111852 100755
--- a/buildsystem/spack/incline/sbatch.sh
+++ b/buildsystem/spack/incline/sbatch.sh
@@ -46,10 +46,10 @@ export MY_CLUSTER=incline
 cp /qfs/projects/exasgd/src/coinhsl-archive-2019.05.21.tar.gz . &&
 . buildsystem/spack/load_spack.sh &&
 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 develop --clone --force FORCE --path=$(pwd)/hiop hiop@develop &&
+# cd $(pwd)/hiop &&
+# git submodule update --init --recursive &&
+# cd - &&
 buildsystem/spack/configure_modules.sh 24
 
 EXIT_CODE=$?
diff --git a/buildsystem/spack/incline/spack.yaml b/buildsystem/spack/incline/spack.yaml
index 62d67de7..00b588df 100644
--- a/buildsystem/spack/incline/spack.yaml
+++ b/buildsystem/spack/incline/spack.yaml
@@ -3,6 +3,7 @@ spack:
     - exago@develop%clang@15.0.0-rocm5.3.0 amdgpu_target=gfx908
   view: false
   concretizer:
+    unify: when_possible
     reuse: false
   config:
     install_tree:
@@ -55,7 +56,8 @@ spack:
       require: ~python+raja+hiop+rocm+ipopt 
     hiop:
     # TODO - build with Ginkgo #463
-      require: '@develop+sparse+mpi+raja+rocm~ginkgo+kron'
+    # TODO - updgrade to develop / 1.0.0
+      require: '@0.7.2+sparse+mpi+raja+rocm~ginkgo+kron'
     ipopt:
       require: '@3.12.10~metis+coinhsl~mumps'
     # Pin version of OpenBlas for testing results