From e0f261a3c51554edb19307f194a3ef0b7f7b025a Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 25 Feb 2026 15:42:38 -0600 Subject: [PATCH 1/5] Use embree from apt --- Dockerfile | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index a163a281029..8a790a46bce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,11 +33,6 @@ ARG build_libmesh # Set default value of HOME to /root ENV HOME=/root -# Embree variables -ENV EMBREE_TAG='v4.3.1' -ENV EMBREE_REPO='https://github.com/embree/embree' -ENV EMBREE_INSTALL_DIR=$HOME/EMBREE/ - # MOAB variables ENV MOAB_TAG='5.5.1' ENV MOAB_REPO='https://bitbucket.org/fathomteam/moab/' @@ -94,20 +89,10 @@ RUN cd $HOME \ RUN if [ "$build_dagmc" = "on" ]; then \ # Install addition packages required for DAGMC - apt-get -y install libeigen3-dev libnetcdf-dev libtbb-dev libglfw3-dev \ + apt-get -y install \ + libeigen3-dev libnetcdf-dev libtbb-dev libglfw3-dev libembree-dev \ && pip install --upgrade numpy \ && pip install --no-cache-dir setuptools cython \ - # Clone and install EMBREE - && mkdir -p $HOME/EMBREE && cd $HOME/EMBREE \ - && git clone --single-branch -b ${EMBREE_TAG} --depth 1 ${EMBREE_REPO} \ - && mkdir build && cd build \ - && cmake ../embree \ - -DCMAKE_INSTALL_PREFIX=${EMBREE_INSTALL_DIR} \ - -DEMBREE_MAX_ISA=NONE \ - -DEMBREE_ISA_SSE42=ON \ - -DEMBREE_ISPC_SUPPORT=OFF \ - && make 2>/dev/null -j${compile_cores} install \ - && rm -rf ${EMBREE_INSTALL_DIR}/build ${EMBREE_INSTALL_DIR}/embree ; \ # Clone and install MOAB mkdir -p $HOME/MOAB && cd $HOME/MOAB \ && git clone --single-branch -b ${MOAB_TAG} --depth 1 ${MOAB_REPO} \ @@ -133,7 +118,7 @@ RUN if [ "$build_dagmc" = "on" ]; then \ && mkdir build && cd build \ && cmake ../double-down -DCMAKE_INSTALL_PREFIX=${DD_INSTALL_DIR} \ -DMOAB_DIR=/usr/local \ - -DEMBREE_DIR=${EMBREE_INSTALL_DIR} \ + -DEMBREE_DIR=/usr \ && make 2>/dev/null -j${compile_cores} install \ && rm -rf ${DD_INSTALL_DIR}/build ${DD_INSTALL_DIR}/double-down ; \ # Clone and install DAGMC From a500abaf50d79abb33803f43204ab0767d84f007 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 25 Feb 2026 15:43:32 -0600 Subject: [PATCH 2/5] Use pugixml and fmtlib from apt --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8a790a46bce..f9ca1415907 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,7 +66,7 @@ RUN apt-get update -y && \ apt-get install -y \ python3-pip python-is-python3 wget git build-essential cmake \ mpich libmpich-dev libhdf5-serial-dev libhdf5-mpich-dev \ - libpng-dev python3-venv && \ + libpng-dev libpugixml-dev libfmt-dev python3-venv && \ apt-get autoremove # create virtual enviroment to avoid externally managed environment error From 5db2c0a044b9eeaa858cf2df3fe19b1f69cd6a77 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 25 Feb 2026 15:45:29 -0600 Subject: [PATCH 3/5] Don't build tests for MOAB and DAGMC --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index f9ca1415907..e233a465e94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -103,6 +103,7 @@ RUN if [ "$build_dagmc" = "on" ]; then \ -DBUILD_SHARED_LIBS=OFF \ -DENABLE_FORTRAN=OFF \ -DENABLE_BLASLAPACK=OFF \ + -DENABLE_TESTING=OFF \ && make 2>/dev/null -j${compile_cores} install \ && cmake ../moab \ -DENABLE_PYMOAB=ON \ @@ -132,6 +133,7 @@ RUN if [ "$build_dagmc" = "on" ]; then \ -DDOUBLE_DOWN_DIR=${DD_INSTALL_DIR} \ -DCMAKE_PREFIX_PATH=${DD_INSTALL_DIR}/lib \ -DBUILD_STATIC_LIBS=OFF \ + -DBUILD_TESTS=OFF \ && make 2>/dev/null -j${compile_cores} install \ && rm -rf ${DAGMC_INSTALL_DIR}/DAGMC ${DAGMC_INSTALL_DIR}/build ; \ fi From c1cc02681c9a9a2f22dd7b7c82e33bf95489936c Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Thu, 26 Feb 2026 16:39:04 -0600 Subject: [PATCH 4/5] Fix missing && --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e233a465e94..2847c5d9e81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -94,7 +94,7 @@ RUN if [ "$build_dagmc" = "on" ]; then \ && pip install --upgrade numpy \ && pip install --no-cache-dir setuptools cython \ # Clone and install MOAB - mkdir -p $HOME/MOAB && cd $HOME/MOAB \ + && mkdir -p $HOME/MOAB && cd $HOME/MOAB \ && git clone --single-branch -b ${MOAB_TAG} --depth 1 ${MOAB_REPO} \ && mkdir build && cd build \ && cmake ../moab -DCMAKE_BUILD_TYPE=Release \ From 2d4a6f14a297074f5e99d463be8af2f7876bbe17 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Fri, 27 Feb 2026 14:01:17 -0600 Subject: [PATCH 5/5] Add libcatch2-dev to avoid building Catch2 from source --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2847c5d9e81..44ed6d828ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,7 +66,7 @@ RUN apt-get update -y && \ apt-get install -y \ python3-pip python-is-python3 wget git build-essential cmake \ mpich libmpich-dev libhdf5-serial-dev libhdf5-mpich-dev \ - libpng-dev libpugixml-dev libfmt-dev python3-venv && \ + libpng-dev libpugixml-dev libfmt-dev libcatch2-dev python3-venv && \ apt-get autoremove # create virtual enviroment to avoid externally managed environment error