Skip to content
Open
7 changes: 6 additions & 1 deletion docker/tpl-ubuntu-clang.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,16 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=America/Los_Angeles \
python3-dev \
python3-sphinx \
python3-mpi4py \
python3-scipy \
python3-virtualenv \
python3-matplotlib \
python3-venv \
python3-pytest

# Remove older scipy/numpy and re-install newer scipy/numpy through pip
# (matplotlib needs to be reinstalled as well)
RUN apt remove -y python3-numpy python3-scipy && \
python3 -m pip install --upgrade pip && \
python3 -m pip install scipy matplotlib

RUN --mount=src=.,dst=$SRC_DIR $SRC_DIR/docker/install-sccache.sh
ENV SCCACHE=/opt/sccache/bin/sccache
18 changes: 15 additions & 3 deletions docker/tpl-ubuntu-gcc.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ COPY --from=tpl_toolchain /spack-generated.cmake /

# Any tool specific to building GEOSX shall be installed in this stage.
RUN DEBIAN_FRONTEND=noninteractive TZ=America/Los_Angeles \
apt-get install -y --no-install-recommends \
openssh-client \
apt-get install -y --no-install-recommends \
openssh-client \
# `ca-certificates` is needed by `sccache` to download the cached compilations.
ca-certificates \
curl \
Expand All @@ -148,7 +148,19 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=America/Los_Angeles \
libxml2-utils \
git \
ghostscript \
ninja-build
ninja-build \
python3-dev \
python3-mpi4py \
python3-virtualenv \
python3-matplotlib \
python3-venv \
python3-pytest

# Remove older scipy/numpy and re-install newer scipy/numpy through pip
# (matplotlib needs to be reinstalled as well)
RUN apt remove -y python3-numpy python3-scipy && \
python3 -m pip install --upgrade pip && \
python3 -m pip install scipy matplotlib

# Install `sccache` binaries to speed up the build of `geos`
RUN --mount=src=.,dst=$SRC_DIR $SRC_DIR/docker/install-sccache.sh
Expand Down
1 change: 1 addition & 0 deletions scripts/spack_packages/packages/geosx/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,7 @@ def geos_hostconfig(self, spec, prefix, py_site_pkgs_dir=None):

if '+pygeosx' in spec:
cfg.write(cmake_cache_option('ENABLE_PYGEOSX', True))
cfg.write(cmake_cache_option('ENABLE_PYLVARRAY', True))
else:
cfg.write(cmake_cache_option('ENABLE_PYGEOSX', False))

Expand Down