From 8a282a1525c4c8deb20bd0dd4ab28c34d691ae6b Mon Sep 17 00:00:00 2001
From: Michel Schanen <mschanen@anl.gov>
Date: Mon, 19 Sep 2022 12:46:24 -0500
Subject: [PATCH] Fixes and bumps

* Fix hdf5 on moonshot
* Bump ExaAdmm version enabling portability on the latest CUDA.jl and
  AMDGPU.jl
---
 .github/workflows/action.yml | 4 ++--
 Project.toml                 | 4 ++--
 setup_moonshot.sh            | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
index 49dfdf7..0ce2c21 100644
--- a/.github/workflows/action.yml
+++ b/.github/workflows/action.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        julia-version: ['1.7']
+        julia-version: ['1.8']
         julia-arch: [x64]
         os: [ubuntu-20.04]
 
@@ -39,7 +39,7 @@ jobs:
     runs-on: self-hosted
     strategy:
       matrix:
-        julia-version: ['1.7']
+        julia-version: ['1.8']
         julia-arch: [x64]
         os: [ubuntu-20.04]
 
diff --git a/Project.toml b/Project.toml
index 989c8c4..617462b 100644
--- a/Project.toml
+++ b/Project.toml
@@ -21,13 +21,13 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 [compat]
 CUDA = "3.4"
 CatViews = "1"
-ExaAdmm = "0.2"
+ExaAdmm = "0.3"
 ExaPF = "0.8"
 ExaTron = "2.1"
 Ipopt = "1"
 JuMP = "1"
 MPI = "0.19"
-julia = "~1.7"
+julia = "1.8"
 
 [extras]
 LazyArtifacts = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
diff --git a/setup_moonshot.sh b/setup_moonshot.sh
index d2a8904..d2ea163 100755
--- a/setup_moonshot.sh
+++ b/setup_moonshot.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
-module load intel mpich hdf5
-julia --project -e 'ENV["JULIA_HDF5_PATH"]="/nfs/gce/software/custom/linux-ubuntu18.04-x86_64/hdf5/1.12.1-mpich-3.4.2-intel-parallel-fortran"; ENV["JULIA_MPI_BINARY"]="system"; ENV["JULIA_MPI_PATH"]="/nfs/gce/software/custom/linux-ubuntu18.04-x86_64/mpich/3.4.2-intel"; using Pkg; Pkg.build("MPI"; verbose=true); Pkg.build("HDF5"; verbose=true)'
-julia --project -e 'using MPI ; MPI.install_mpiexecjl(force=true ;destdir=".")'
\ No newline at end of file
+export JULIA_HDF5_PATH="/disk/hdf5/hdf5-1.12.2/build/bin"
+export JULIA_MPI_BINARY="system"
+julia --project -e 'using Pkg; Pkg.build("MPI"; verbose=true); Pkg.build("HDF5"; verbose=true)'
+julia --project -e 'using MPI ; MPI.install_mpiexecjl(force=true ;destdir=".")'