From feecc9ceb79040158785609e362653cfca698234 Mon Sep 17 00:00:00 2001
From: Alexander Blair <alexander.blair@ukaea.uk>
Date: Tue, 30 Jul 2024 14:03:07 +0100
Subject: [PATCH] Add additional python dependencies to CSD3 build for ampere
 nodes for running XMLDiff tests

---
 scripts/build-platypus-csd3-ampere.sh   | 10 +++++++---
 scripts/build-platypus-csd3-sapphire.sh |  9 +--------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/scripts/build-platypus-csd3-ampere.sh b/scripts/build-platypus-csd3-ampere.sh
index b7293447..174f1ce2 100755
--- a/scripts/build-platypus-csd3-ampere.sh
+++ b/scripts/build-platypus-csd3-ampere.sh
@@ -125,6 +125,11 @@ install_spack_deps() {
     spack install py-setuptools
     spack load py-setuptools arch=${ARCH}
 
+    spack install py-deepdiff
+    spack load py-deepdiff arch=${ARCH}
+
+    spack install py-xmltodict
+    spack load py-xmltodict arch=${ARCH}
 }
 
 install_gslib() {
@@ -150,8 +155,7 @@ install_mfem() {
     cd "${BUILD_PATH}" || exit 1
     git clone https://github.com/mfem/mfem.git
     cd mfem || exit 1
-    # This is just until MFEM merges Edward's changes. Without this, GPU build crashes!
-    git checkout EdwardPalmer99/add-missing-header-to-exodus-writer-fix
+    git checkout master
     mkdir build
     cd build || exit 1
     echo "Building MFEM"
@@ -254,7 +258,7 @@ install_platypus() {
     git clone https://github.com/aurora-multiphysics/platypus.git
     cd platypus || exit 1
     make -j"$compile_cores"
-
+    ./run_tests -j"$compile_cores"
 }
 
 load_modules
diff --git a/scripts/build-platypus-csd3-sapphire.sh b/scripts/build-platypus-csd3-sapphire.sh
index 03ba3fb7..33e86e6a 100755
--- a/scripts/build-platypus-csd3-sapphire.sh
+++ b/scripts/build-platypus-csd3-sapphire.sh
@@ -25,13 +25,6 @@ function load_modules() {
     module load python/3.8
     module load ninja
 
-    module load py-pyaml
-    module load py-jinja2
-    module load py-packaging
-    module load py-setuptools
-    module load py-deepdiff
-    module load py-xmltodict
-
     STACK_SRC=$(mktemp -d /tmp/moose_stack_src.XXXXXX)
     export STACK_SRC
 
@@ -61,7 +54,7 @@ function load_modules() {
 
     export PATH=${BUILD_PATH}:${PATH}
 
-    cd "{$WORKDIR}" || exit
+    cd "${WORKDIR}" || exit
 
     #Need to set some compiler flags via config file"
     echo "-std=c++17" >> icpx.cfg