Skip to content

Commit

Permalink
switch back to 4.2 will try using mpich module at nersc
Browse files Browse the repository at this point in the history
  • Loading branch information
joezuntz committed Jul 24, 2024
1 parent 9dc5b5b commit d287d3e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion txpipe-base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM condaforge/mambaforge:23.3.1-1
LABEL [email protected]

ENV TX_MPI_VERSION=4.0.2
ENV TX_MPI_VERSION=4.2.0


# Make, which we will need for everything
Expand Down
3 changes: 1 addition & 2 deletions txpipe-dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN echo Build version 3
# but apparently not. Might be a github actions thing.
# or maybe I just didn't wait long enough for the parent
# build to propagate.
ENV TX_MPI_VERSION=4.0.2
ENV TX_MPI_VERSION=4.2.0

ENV SKLEARN_ALLOW_DEPRECATED_SKLEARN_PACKAGE_INSTALL=True

Expand All @@ -36,7 +36,6 @@ RUN git clone --branch ${TX_TAG_FOR_DEPENDENCIES} https://github.com/LSSTDESC/T
&& cat ../conda-extras.yml \
&& echo cat environment-piponly.yml \
&& cat environment-piponly.yml \
&& mamba install https://anaconda.org/conda-forge/mpich/4.0.2/download/linux-64/mpich-4.0.2-external_0.tar.bz2 \
&& mamba env update --name base --file environment-nopip2.yml \
&& mamba env update --name base --file ../conda-extras.yml \
&& mamba env update --name base --file environment-piponly.yml \
Expand Down

0 comments on commit d287d3e

Please sign in to comment.