From 4974e9bf1ae8bbbb2465cfdbdb8019f27bcddddd Mon Sep 17 00:00:00 2001
From: Cameron Rutherford <robert.rutherford@pnnl.gov>
Date: Tue, 10 Oct 2023 18:37:00 -0400
Subject: [PATCH] Add working build on ascent.

---
 buildsystem/spack/ascent/bsub.sh    |  8 +++++++
 buildsystem/spack/ascent/env.sh     |  2 ++
 buildsystem/spack/ascent/spack.yaml | 36 +++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)
 mode change 100644 => 100755 buildsystem/spack/ascent/bsub.sh

diff --git a/buildsystem/spack/ascent/bsub.sh b/buildsystem/spack/ascent/bsub.sh
old mode 100644
new mode 100755
index 27d32a67..9a6798c3
--- a/buildsystem/spack/ascent/bsub.sh
+++ b/buildsystem/spack/ascent/bsub.sh
@@ -55,11 +55,19 @@ which unzip
 export MY_CLUSTER=ascent
 . 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 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
+spack concretize -f &&
+spack install patch &&
+spack load patch &&
 jsrun -n 1 -c 40 buildsystem/spack/configure_modules.sh 40
 
 EXIT_CODE=$?
diff --git a/buildsystem/spack/ascent/env.sh b/buildsystem/spack/ascent/env.sh
index e3660203..eb876ac6 100644
--- a/buildsystem/spack/ascent/env.sh
+++ b/buildsystem/spack/ascent/env.sh
@@ -2,6 +2,8 @@
 
 # Configure python
 module load python/3.9-anaconda3
+module load unzip/6.0
+module load autoconf/2.69
 
 BASE=/gpfs/wolf/proj-shared/csc359/exago/spack-ci
 export SPACK_INSTALL=$BASE/install
diff --git a/buildsystem/spack/ascent/spack.yaml b/buildsystem/spack/ascent/spack.yaml
index 317effcf..ea3e378d 100644
--- a/buildsystem/spack/ascent/spack.yaml
+++ b/buildsystem/spack/ascent/spack.yaml
@@ -1,5 +1,6 @@
 spack:
   specs:
+  - patch
   - exago@develop+cuda cuda_arch=70
   view: false
   concretizer:
@@ -68,6 +69,41 @@ spack:
       - spec: openblas@0.3.17
         modules: [openblas/0.3.17-omp]
       buildable: false
+    tar:
+      externals:
+      - spec: tar@1.34
+        modules: [tar/1.34]
+      buildable: false
+    curl:
+      externals:
+      - spec: curl@7.79.0
+        modules: [curl/7.79.0]
+      buildable: false
+    git:
+      externals:
+      - spec: git@2.35.1
+        modules: [git/2.35.1]
+      buildable: false
+    texinfo:
+      externals:
+      - spec: texinfo@6.5
+        modules: [texinfo/6.5]
+      buildable: false
+    autoconf:
+      externals:
+      - spec: autoconf@2.69
+        modules: [autoconf/2.69]
+      buildable: false
+    gmp:
+      externals:
+      - spec: gmp@6.2.1
+        modules: [gmp/6.2.1]
+      buildable: false
+    metis:
+      externals:
+      - spec: metis@5.1.0
+        modules: [metis/5.1.0]
+      buildable: false
     perl:
       externals:
       - spec: perl@5.30.1