Merge pull request Azure#609 from Azure/azhop_update

Azhop update

experimental/azhop/opm/build.sh

@@ -3,5 +3,8 @@
 . ~/spack/share/spack/setup-env.sh
 module use /usr/share/Modules/modulefiles
 
+sudo yum install -y freeglut-devel
+spack install boost +system+test+date_time
+
 spack install dune
 spack install opm-simulators

experimental/azhop/spack/configure.sh

@@ -1,8 +1,12 @@
 #!/bin/bash
+OPENMPI_VERSION=4.1.1
+HPCX_VERSION=2.9.0
+GCC_VERSION=9.2.0
+
 . ~/spack/share/spack/setup-env.sh
 
 echo "Add GCC compiler"
-spack compiler find /opt/gcc-9.2.0/
+spack compiler find /opt/gcc-$GCC_VERSION/
 
 echo "Configure external MPI packages"
 cat <<EOF >~/.spack/packages.yaml
@@ -13,15 +17,15 @@ packages:
       mpi: [openmpi]
   openmpi:
     externals:
-    - spec: openmpi@4.1.0%gcc@9.2.0
+    - spec: openmpi@$OPENMPI_VERSION%gcc@$GCC_VERSION
       modules:
-      - mpi/openmpi-4.1.0
+      - mpi/openmpi-$OPENMPI_VERSION
     buildable: False
   hpcx:
     externals:
-    - spec: hpcx@2.8.3%gcc@9.2.0
+    - spec: hpcx@$HPCX_VERSION%gcc@$GCC_VERSION
       modules:
-      - mpi/hpcx-v2.8.3
+      - mpi/hpcx-v$HPCX_VERSION
     buildable: False
 EOF
 
@@ -33,3 +37,13 @@ config:
     - /mnt/resource/$USER/spack-stage
     - ~/.spack/stage
 EOF
+
+# from https://techcommunity.microsoft.com/t5/azure-global/spack-in-a-multi-user-hpc-environment-on-azure/ba-p/3438261
+spack config --scope defaults add config:build_jobs:32
+
+MICROARCHFILE=$SPACK_ROOT/lib/spack/external/archspec/json/cpu/microarchitectures.json
+mv $MICROARCHFILE ${MICROARCHFILE}.orig
+cat ${MICROARCHFILE}.orig \
+| jq 'del(.microarchitectures.zen3.features[] | select (. == "pku"))' \
+| jq 'del(.microarchitectures.zen.features[] | select (. == "clzero"))' \
+>$MICROARCHFILE

experimental/azhop/spack/install.sh

@@ -2,5 +2,5 @@
 
 git clone https://github.com/spack/spack ~/spack
 cd ~/spack
-git checkout releases/v0.16
+git checkout releases/v0.18