Update pymfem and libROM versions in dockerfiles

LLNL · Sep 26, 2024 · 1794614 · 1794614
1 parent 59c29bf
commit 1794614
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/docker/baseline/Dockerfile b/docker/baseline/Dockerfile
@@ -60,9 +60,9 @@ WORKDIR $LIB_DIR
 RUN git clone https://github.com/mfem/PyMFEM.git
 WORKDIR ./PyMFEM
 # --with-gslib flag does not work with later versions.
-RUN git checkout v4.5.2
+RUN git checkout v_4.7.0.1
 # We need to use this hack until we can submit a pull request to PyMFEM.
-RUN wget -O setup.py https://github.com/LLNL/pylibROM/raw/prom_parallel/extern/PyMFEM.setup.py
+#RUN wget -O setup.py https://github.com/LLNL/pylibROM/raw/prom_parallel/extern/PyMFEM.setup.py
 RUN sudo python3 setup.py install --with-parallel --with-gslib
 
 # install lldb and gdb for debugging

diff --git a/docker/librom/Dockerfile b/docker/librom/Dockerfile
@@ -12,18 +12,16 @@ WORKDIR $LIB_DIR
 RUN sudo git clone https://github.com/mfem/PyMFEM.git
 WORKDIR ./PyMFEM
 # --with-gslib flag does not work with later versions.
-RUN sudo git checkout v4.5.2
+RUN sudo git checkout v_4.7.0.1
 # We need to use this hack until we can submit a pull request to PyMFEM.
-RUN sudo wget -O setup.py https://github.com/LLNL/pylibROM/raw/prom_parallel/extern/PyMFEM.setup.py
+#RUN sudo wget -O setup.py https://github.com/LLNL/pylibROM/raw/prom_parallel/extern/PyMFEM.setup.py
 RUN sudo python3 setup.py install --with-parallel --with-gslib
 
 # install libROM
 WORKDIR $LIB_DIR
 RUN sudo git clone https://github.com/LLNL/libROM.git
 WORKDIR ./libROM
 RUN sudo git pull
-# pylibROM is currently based on a specific commit of the libROM.
-RUN sudo git checkout 0809d7d09dc24f0963c38fc8c0a2649948142ba0
 WORKDIR ./build
 RUN sudo cmake .. -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DUSE_MFEM=${USE_MFEM} -DMFEM_USE_GSLIB=${MFEM_USE_GSLIB}
 # RUN sudo cmake .. -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DUSE_MFEM=OFF