Skip to content

Commit

Permalink
Do not build pygeosx for gcc, build silo~shared
Browse files Browse the repository at this point in the history
  • Loading branch information
bmhan12 committed Aug 29, 2024
1 parent f5ce06f commit c2d6d69
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
11 changes: 11 additions & 0 deletions docker/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,12 @@ spack:
externals:
- spec: [email protected]
prefix: /usr
findutils:
version: [4.7.0]
buildable: false
externals:
- spec: [email protected]
prefix: /usr
m4:
buildable: false
externals:
Expand Down Expand Up @@ -274,3 +280,8 @@ spack:
externals:
- spec: [email protected]
prefix: /usr
zlib:
buildable: false
externals:
- spec: [email protected]
prefix: /usr
13 changes: 2 additions & 11 deletions docker/tpl-ubuntu-gcc.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ RUN apt-get install -y --no-install-recommends \
RUN --mount=src=.,dst=$SRC_DIR,readwrite cd ${SRC_DIR} && \
mkdir -p ${GEOSX_TPL_DIR} && \
./scripts/uberenv/uberenv.py \
--spec "%gcc@${GCC_MAJOR_VERSION} +docs" \
--spec "%gcc@${GCC_MAJOR_VERSION} ~pygeosx +docs" \
--spack-env-file=${SRC_DIR}/docker/spack.yaml \
--project-json=${SRC_DIR}/.uberenv_config.json \
--prefix ${GEOSX_TPL_DIR} \
Expand Down Expand Up @@ -137,16 +137,7 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=America/Los_Angeles \
libxml2-utils \
git \
ghostscript \
ninja-build \
# Necessary dependencies for pygeosx unit tests
python3-dev \
python3-sphinx \
python3-mpi4py \
python3-scipy \
python3-virtualenv \
python3-matplotlib \
python3-venv \
python3-pytest
ninja-build

# Install `sccache` binaries to speed up the build of `geos`
RUN --mount=src=.,dst=$SRC_DIR $SRC_DIR/docker/install-sccache.sh
Expand Down
2 changes: 1 addition & 1 deletion scripts/spack_packages/packages/geosx/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class Geosx(CMakePackage, CudaPackage):
# IO
#
depends_on('[email protected]')
depends_on('[email protected]~fortran')
depends_on('[email protected]~fortran~shared')

depends_on('conduit~test~fortran~hdf5_compat')

Expand Down

0 comments on commit c2d6d69

Please sign in to comment.