From 9ad165ae2e086f85c9599bf60810a80c10095a2e Mon Sep 17 00:00:00 2001
From: domke <673751-domke@users.noreply.gitlab.com>
Date: Fri, 23 Feb 2024 12:00:36 +1100
Subject: [PATCH] amg runs now

---
 .../auxiliary_software_files/packages.yaml     |  5 +++++
 .../RCCS-Fugaku-Fujitsu-A64FX-TofuD/spack.yaml | 18 ++++++++++--------
 .../variables.yaml                             |  5 +++--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/configs/RCCS-Fugaku-Fujitsu-A64FX-TofuD/auxiliary_software_files/packages.yaml b/configs/RCCS-Fugaku-Fujitsu-A64FX-TofuD/auxiliary_software_files/packages.yaml
index 93118804..591b98eb 100644
--- a/configs/RCCS-Fugaku-Fujitsu-A64FX-TofuD/auxiliary_software_files/packages.yaml
+++ b/configs/RCCS-Fugaku-Fujitsu-A64FX-TofuD/auxiliary_software_files/packages.yaml
@@ -584,3 +584,8 @@ packages:
       - spec: "pmlib@9.0-trad-power arch=linux-rhel8-a64fx"
         prefix: /vol0004/apps/oss/pmlib-v9.0/9.0-trad-power
     buildable: False
+  cmake:
+    externals:
+      - spec: "cmake@3.20.2 arch=linux-rhel8-a64fx"
+        prefix: /usr
+
diff --git a/configs/RCCS-Fugaku-Fujitsu-A64FX-TofuD/spack.yaml b/configs/RCCS-Fugaku-Fujitsu-A64FX-TofuD/spack.yaml
index bf2cf20c..81facd97 100644
--- a/configs/RCCS-Fugaku-Fujitsu-A64FX-TofuD/spack.yaml
+++ b/configs/RCCS-Fugaku-Fujitsu-A64FX-TofuD/spack.yaml
@@ -6,18 +6,20 @@
 spack:
   packages:
     default-compiler:
-      spack_spec: fj@{default_fujitsu_version}
+      spack_spec: fj@{default_fj_version}
     default-mpi:
-      spack_spec: fujitsu-mpi@head%fj@{default_fujitsu_version}
+      spack_spec: fujitsu-mpi@{default_fj_version}%fj arch=linux-rhel8-a64fx
     compiler-gcc:
-      spack_spec: gcc@12.2.0
+      spack_spec: gcc@{default_gnu_version}
     compiler-fujitsu:
-      spack_spec: fj@{default_fujitsu_version}
+      spack_spec: fj@{default_fj_version}
     blas:
-      spack_spec: fujitsu-ssl2@head%fj@{default_fujitsu_version}
+      spack_spec: fujitsu-ssl2@head%fj arch=linux-rhel8-a64fx
     lapack:
-      spack_spec: fujitsu-ssl2@head%fj@{default_fujitsu_version}
+      spack_spec: fujitsu-ssl2@head%fj arch=linux-rhel8-a64fx
     mpi-gcc:
-      spack_spec: fujitsu-mpi@head%gcc@12.2.0
+      spack_spec: fujitsu-mpi@head%gcc@{default_gnu_version} arch=linux-rhel8-a64fx
     mpi-fujitsu:
-      spack_spec: fujitsu-mpi@head%fj@{default_fujitsu_version}
\ No newline at end of file
+      spack_spec: fujitsu-mpi@{default_fj_version}%fj arch=linux-rhel8-a64fx
+    gmake:
+      spack_spec: gmake@4.2.1 arch=linux-rhel8-a64fx
diff --git a/configs/RCCS-Fugaku-Fujitsu-A64FX-TofuD/variables.yaml b/configs/RCCS-Fugaku-Fujitsu-A64FX-TofuD/variables.yaml
index 046ce515..b4db683c 100644
--- a/configs/RCCS-Fugaku-Fujitsu-A64FX-TofuD/variables.yaml
+++ b/configs/RCCS-Fugaku-Fujitsu-A64FX-TofuD/variables.yaml
@@ -9,5 +9,6 @@ variables:
   batch_submit: 'pjsub {execute_experiment}'
   batch_nodes: '#PJM -L "node={n_nodes}"'
   batch_ranks: '#PJM --mpi proc={n_ranks}'
-  batch_timeout: '#PJM -L "elapse={batch_time}:00"'
-  default_fujitsu_version: '4.8.1'
\ No newline at end of file
+  batch_timeout: '#PJM -L "elapse={batch_time}:00" -x PJM_LLIO_GFSCACHE="/vol0001:/vol0002:/vol0003:/vol0004:/vol0005:/vol0006"'
+  default_fj_version: '4.8.1'
+  default_gnu_version: '12.2.0'