Fix Dockerfile /usr/lib locations for aarch64 (parflow#722)

This PR replaces hardcoding `/usr/lib/x86_64-linux-gnu` library location
with `dpkg-architecture -qDEB_HOST_MULTIARCH`. This allows the Docker
image to be built on aarch64 (arm64) processors.

* Determine /usr/lib/<arch> location using dpkg-architecture
* Upgrade Silo to support AArch64
* Fix Docker build warnings

---------

Co-authored-by: Steven Smith <smith84@llnl.gov>

Author: danrosen25

.github/workflows/linux.yml

@@ -486,7 +486,7 @@ jobs:
         CACHE_HIT: ${{steps.cache-parflow-dependencies.outputs.cache-hit}}
       run: |
         if [[ "$CACHE_HIT" != 'true' ]]; then
-          URL=https://github.com/LLNL/Silo/archive/refs/tags/4.11.1.tar.gz
+          URL=https://github.com/LLNL/Silo/archive/refs/tags/4.12.0.tar.gz
           mkdir silo
           cd silo
           curl -L $URL | tar --strip-components=1 -xz

.github/workflows/macos.yml

@@ -124,7 +124,7 @@ jobs:
         CACHE_HIT: ${{steps.cache-parflow-dependencies.outputs.cache-hit}}
       run: |
         if [[ "$CACHE_HIT" != 'true' ]]; then
-          URL=https://github.com/LLNL/Silo/archive/refs/tags/4.11.1.tar.gz
+          URL=https://github.com/LLNL/Silo/archive/refs/tags/4.12.0.tar.gz
           mkdir silo
           cd silo
           curl -L $URL | tar --strip-components=1 -xz
@@ -137,7 +137,7 @@ jobs:
         CACHE_HIT: ${{steps.cache-parflow-dependencies.outputs.cache-hit}}
       run: |
         if [[ "$CACHE_HIT" != 'true' ]]; then
-          URL=https://github.com/hypre-space/hypre/archive/v2.26.0.tar.gz
+          URL=https://github.com/hypre-space/hypre/archive/v2.33.0.tar.gz
           mkdir hypre
           cd hypre
           curl -L $URL | tar --strip-components=1 -xz

Dockerfile

@@ -2,10 +2,10 @@
 # start by building the basic container
 #-----------------------------------------------------------------------------
 FROM ubuntu:22.04
-MAINTAINER Steven Smith <smith84@llnl.gov>
+LABEL org.opencontainers.image.authors="Steven Smith <smith84@llnl.gov>"
 
 # Non interactive mode
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
     ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && \
@@ -38,9 +38,9 @@ RUN mkdir -p /home/parflow
 #-----------------------------------------------------------------------------
 # Set environment vars
 #-----------------------------------------------------------------------------
-ENV PARFLOW_DIR /usr/opt/parflow
-ENV PARFLOW_DEP_DIR /usr/opt/parflow
-ENV PATH $PATH:$PARFLOW_DIR/bin
+ENV PARFLOW_DIR=/usr/opt/parflow
+ENV PARFLOW_DEP_DIR=/usr/opt/parflow
+ENV PATH=$PATH:$PARFLOW_DIR/bin
 
 #-----------------------------------------------------------------------------
 # Build libraries
@@ -52,7 +52,7 @@ ENV PATH $PATH:$PARFLOW_DIR/bin
 #  https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-1.12.2/src/hdf5-1.12.2.tar.bz2
 #
 # WORKDIR /home/parflow
-# RUN wget -q https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-1.8.21/src/hdf5-1.8.21.tar.gz && \ 
+# RUN wget -q https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-1.8.21/src/hdf5-1.8.21.tar.gz && \
 #     tar -xf hdf5-1.8.21.tar.gz && \
 #     cd hdf5-1.8.21 && \
 #     CC=mpicc ./configure \
@@ -64,12 +64,13 @@ ENV PATH $PATH:$PARFLOW_DIR/bin
 
 #
 # NetCDF
-# 
+#
 WORKDIR /home/parflow
-run wget -q https://github.com/Unidata/netcdf-c/archive/v4.9.0.tar.gz && \ 
+RUN wget -q https://github.com/Unidata/netcdf-c/archive/v4.9.0.tar.gz && \
     tar -xf v4.9.0.tar.gz && \
     cd netcdf-c-4.9.0 && \
-    CC=mpicc CPPFLAGS=-I/usr/include/hdf5/openmpi LDFLAGS=-L/usr/lib/x86_64-linux-gnu/hdf5/openmpi ./configure --prefix=${PARFLOW_DIR} && \
+    arch=$(dpkg-architecture -qDEB_HOST_MULTIARCH) && \
+    CC=mpicc CPPFLAGS=-I/usr/include/hdf5/openmpi LDFLAGS=-L/usr/lib/$arch/hdf5/openmpi ./configure --prefix=${PARFLOW_DIR} && \
     make && \
     make install && \
     cd .. && \
@@ -79,7 +80,7 @@ run wget -q https://github.com/Unidata/netcdf-c/archive/v4.9.0.tar.gz && \
 # NetCDF Fortran
 #
 WORKDIR /home/parflow
-run wget -q https://github.com/Unidata/netcdf-fortran/archive/v4.5.4.tar.gz && \ 
+RUN wget -q https://github.com/Unidata/netcdf-fortran/archive/v4.5.4.tar.gz && \
     tar -xf v4.5.4.tar.gz && \
     cd netcdf-fortran-4.5.4 && \
     CC=mpicc FC=mpifort CPPFLAGS=-I${PARFLOW_DIR}/include LDFLAGS=-L${PARFLOW_DIR}/lib ./configure --prefix=${PARFLOW_DIR} && \
@@ -92,41 +93,42 @@ run wget -q https://github.com/Unidata/netcdf-fortran/archive/v4.5.4.tar.gz && \
 # SILO
 #
 WORKDIR /home/parflow
-RUN wget -q https://github.com/LLNL/Silo/archive/refs/tags/4.10.2.tar.gz && \
-    tar -xf 4.10.2.tar.gz && \
-    cd Silo-4.10.2 && \
-    ./configure  --prefix=$PARFLOW_DIR --disable-silex --disable-hzip --disable-fpzip && \
+RUN wget -q https://github.com/LLNL/Silo/archive/refs/tags/4.12.0.tar.gz && \
+    tar -xf 4.12.0.tar.gz && \
+    cd Silo-4.12.0 && \
+    ./configure  --disable-silex --disable-hzip --disable-fpzip --enable-shared=yes --prefix=$PARFLOW_DIR && \
     make install && \
     cd .. && \
-    rm -fr Silo-4.10.2 4.10.2.tar.gz
+    rm -fr Silo-4.12.0 4.12.0.tar.gz
 
 #
 # Hypre
 #
 WORKDIR /home/parflow
-RUN  wget -q https://github.com/hypre-space/hypre/archive/v2.26.0.tar.gz && \
-   tar xf v2.26.0.tar.gz && \
-   cd hypre-2.26.0/src && \
+RUN  wget -q https://github.com/hypre-space/hypre/archive/v2.33.0.tar.gz && \
+   tar xf v2.33.0.tar.gz && \
+   cd hypre-2.33.0/src && \
    ./configure --prefix=$PARFLOW_DIR && \
    make install && \
    cd ../.. && \
-   rm -fr hypre-2.18.2 v2.18.2.tar.gz
+   rm -fr hypre-2.33.0 v2.33.0.tar.gz
 
 #-----------------------------------------------------------------------------
 # Parflow configure and build
 #-----------------------------------------------------------------------------
 
-ENV PARFLOW_MPIEXEC_EXTRA_FLAGS "--mca mpi_yield_when_idle 1 --oversubscribe --allow-run-as-root"
+ENV PARFLOW_MPIEXEC_EXTRA_FLAGS="--mca mpi_yield_when_idle 1 --oversubscribe --allow-run-as-root"
 
 # Disable HWLOC warnings from showing up, confusing messages, this has been fixed in later OpenMPI versions
-ENV HWLOC_HIDE_ERRORS "2"
+ENV HWLOC_HIDE_ERRORS="2"
 
 WORKDIR /home/parflow
 
 RUN git clone -b master --single-branch https://github.com/parflow/parflow.git parflow
 
 RUN mkdir -p build && \
     cd build && \
+    arch=$(dpkg-architecture -qDEB_HOST_MULTIARCH) && \
     cmake ../parflow \
        -DPARFLOW_AMPS_LAYER=mpi1 \
        -DPARFLOW_AMPS_SEQUENTIAL_IO=TRUE \
@@ -137,7 +139,7 @@ RUN mkdir -p build && \
        -DPARFLOW_ENABLE_TIMING=TRUE \
        -DPARFLOW_HAVE_CLM=TRUE \
        -DPARFLOW_ENABLE_PYTHON=TRUE \
-       -DCURL_LIBRARY=/usr/lib/x86_64-linux-gnu/libcurl.so.4 \
+       -DCURL_LIBRARY=/usr/lib/$arch/libcurl.so.4 \
        -DCMAKE_INSTALL_PREFIX=$PARFLOW_DIR && \
      make install && \
      cd .. && \