From 61de2e2ff2d167027bb68937269ebd452815918b Mon Sep 17 00:00:00 2001
From: Ben Prather <bprathr2@illinois.edu>
Date: Fri, 6 Oct 2023 11:27:08 -0500
Subject: [PATCH] CI: try to fix CPU build

---
 machines/bp.sh     | 3 ++-
 scripts/ci/cpu.yml | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/machines/bp.sh b/machines/bp.sh
index c746b042..47b52cd1 100644
--- a/machines/bp.sh
+++ b/machines/bp.sh
@@ -73,6 +73,7 @@ if [[ $HOST == "cinnabar"* ]]; then
   module purge # Handle modules inside this script
   HOST_ARCH="HSW" # This won't change
   DEVICE_ARCH="TURING75"
+  NPROC=56
 
   # Runtime
   MPI_NUM_PROCS=1
@@ -93,7 +94,7 @@ if [[ $HOST == "cinnabar"* ]]; then
       C_NATIVE="gcc"
       CXX_NATIVE="g++"
     else
-      module load nvhpc
+      module load nvhpc/23.7
       PREFIX_PATH="$HOME/libs/hdf5-nvhpc"
       C_NATIVE="nvc"
       CXX_NATIVE="nvc++"
diff --git a/scripts/ci/cpu.yml b/scripts/ci/cpu.yml
index 1f13629d..9d383895 100644
--- a/scripts/ci/cpu.yml
+++ b/scripts/ci/cpu.yml
@@ -38,15 +38,15 @@ stages:
 build:
   stage: build
   variables:
-    NPROC: 4
+    NPROC: 8
     HOST_ARCH: NATIVE
   before_script:
     - dnf -y groupinstall "Development Tools"
-    - dnf -y install hostname environment-modules cmake mpich-devel fftw-devel
+    - dnf -y install hostname environment-modules cmake mpich-devel hdf5-mpich-devel fftw-devel
     - source /etc/profile
     - module load mpi/mpich-x86_64
   script:
-    - ./make.sh clean hdf5
+    - ./make.sh clean
   artifacts:
     paths:
       - kharma.*