From 906f6e62cd4872e6ac87ac98d8364bea2b0a8685 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Sat, 7 Nov 2020 18:02:22 +0000 Subject: [PATCH 01/15] added yml scripts for optional dagmc builds --- .github/workflows/dockerhub-publish-dagmc.yml | 34 +++++++++++++++++ .../dockerhub-publish-release-dagmc.yml | 37 +++++++++++++++++++ .../name: dockerhub-publish-develop-dagmc.yml | 34 +++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 .github/workflows/dockerhub-publish-dagmc.yml create mode 100644 .github/workflows/dockerhub-publish-release-dagmc.yml create mode 100644 .github/workflows/name: dockerhub-publish-develop-dagmc.yml diff --git a/.github/workflows/dockerhub-publish-dagmc.yml b/.github/workflows/dockerhub-publish-dagmc.yml new file mode 100644 index 000000000..439ef87a4 --- /dev/null +++ b/.github/workflows/dockerhub-publish-dagmc.yml @@ -0,0 +1,34 @@ +name: dockerhub-publish-latest-dagmc + +on: + push: + branches: master + +jobs: + main: + runs-on: ubuntu-latest + steps: + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + push: true + tags: openmc/openmc:latest-dagmc + build-args: | + include_dagmc=true + - + name: Image digest + run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/dockerhub-publish-release-dagmc.yml b/.github/workflows/dockerhub-publish-release-dagmc.yml new file mode 100644 index 000000000..0f1df936e --- /dev/null +++ b/.github/workflows/dockerhub-publish-release-dagmc.yml @@ -0,0 +1,37 @@ +name: dockerhub-publish-release-dagmc + +on: + push: + tags: 'v*.*.*' + +jobs: + main: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set env + run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + push: true + tags: openmc/openmc:${{ env.RELEASE_VERSION }}-dagmc + build-args: | + include_dagmc=true + - + name: Image digest + run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/name: dockerhub-publish-develop-dagmc.yml b/.github/workflows/name: dockerhub-publish-develop-dagmc.yml new file mode 100644 index 000000000..ba3f1878c --- /dev/null +++ b/.github/workflows/name: dockerhub-publish-develop-dagmc.yml @@ -0,0 +1,34 @@ +name: dockerhub-publish-develop-dagmc + +on: + push: + branches: develop + +jobs: + main: + runs-on: ubuntu-latest + steps: + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + push: true + tags: openmc/openmc:develop-dagmc + build-args: | + include_dagmc=true + - + name: Image digest + run: echo ${{ steps.docker_build.outputs.digest }} From 104d5bd41daa4f82fd7a36fffc8aa9e869042b91 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Sat, 7 Nov 2020 18:37:42 +0000 Subject: [PATCH 02/15] added moab and dagmc optional builds --- Dockerfile | 77 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 71 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d3fdb1e9..8dc19325a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ FROM ubuntu:latest +# By default this Dockerfile builds OpenMC without dagmc +ARG include_dagmc=false + # Setup environment variables for Docker image ENV CC=/usr/bin/mpicc CXX=/usr/bin/mpicxx \ PATH=/opt/openmc/bin:/opt/NJOY2016/build:$PATH \ @@ -26,12 +29,74 @@ RUN git clone https://github.com/njoy/NJOY2016 /opt/NJOY2016 && \ mkdir build && cd build && \ cmake -Dstatic=on .. && make 2>/dev/null && make install -# Clone and install OpenMC -RUN git clone --recurse-submodules https://github.com/openmc-dev/openmc.git \ - /opt/openmc && cd /opt/openmc && mkdir -p build && cd build && \ - cmake -Doptimize=on -DHDF5_PREFER_PARALLEL=on .. && \ - make && make install && \ - cd .. && pip install -e .[test] +# Clone and install OpenMC without DAGMC +RUN if [ "$include_dagmc" = "false" ] ; \ + then git clone --recurse-submodules https://github.com/openmc-dev/openmc.git \ + /opt/openmc ; \ + cd /opt/openmc ; \ + mkdir -p build ; \ + cd build ; \ + cmake -Doptimize=on -DHDF5_PREFER_PARALLEL=on .. ; \ + make ; \ + make install ; \ + cd .. ; \ + pip install -e .[test] ; \ + fi + +# Clone and install MOAB +RUN if [ "$include_dagmc" = "true" ] ; \ + then mkdir -p MOAB/bld ; \ + cd MOAB ; \ + git clone --depth 1 https://bitbucket.org/fathomteam/moab -b Version5.1.0 ; \ + cd bld ; \ + cmake ../moab -DBUILD_SHARED_LIBS=OFF ; \ + -DENABLE_HDF5=ON ; \ + -DENABLE_BLASLAPACK=OFF ; \ + -DENABLE_FORTRAN=OFF ; \ + -DCMAKE_INSTALL_PREFIX=$HOME/MOAB ; \ + -DCMAKE_C_COMPILER=${CC} ; \ + -DCMAKE_CXX_COMPILER=${CXX} ; \ + -DCMAKE_INSTALL_RPATH=${hdf5_install_dir}:$HOME/MOAB ; \ + make ; \ + make install ; \ + rm -rf * ; \ + cmake ../moab -DBUILD_SHARED_LIBS=ON ; \ + -DENABLE_HDF5=ON ; \ + -DENABLE_PYMOAB=ON ; \ + -DENABLE_BLASLAPACK=OFF ; \ + -DENABLE_FORTRAN=OFF ; \ + -DCMAKE_INSTALL_PREFIX=$HOME/MOAB ; \ + -DCMAKE_C_COMPILER=${CC} ; \ + -DCMAKE_CXX_COMPILER=${CXX} ; \ + -DCMAKE_INSTALL_RPATH=${hdf5_install_dir}:$HOME/MOAB ; \ + make ; \ + make install ; \ + +# Clone and install DAGMC +RUN if [ "$include_dagmc" = "true" ] ; \ + then DAGMC && \ + cd DAGMC && \ + git clone -b develop https://github.com/svalinn/dagmc && \ + mkdir build && \ + cd build && \ + cmake ../dagmc -DBUILD_TALLY=ON -DCMAKE_INSTALL_PREFIX=$DAGMC_INSTALL_DIR -DMOAB_DIR=$MOAB_INSTALL_DIR -DBUILD_STATIC_LIBS=OFF -DBUILD_STATIC_EXE=OFF && \ + make -j install && \ + rm -rf $HOME/DAGMC/dagmc $HOME/DAGMC/build ; \ + fi + +# Clone and install OpenMC with DAGMC +RUN if [ "$include_dagmc" = "true" ] ; \ + then git clone --recurse-submodules https://github.com/openmc-dev/openmc.git \ + /opt/openmc ; \ + cd /opt/openmc ; \ + mkdir -p build ; \ + cd build ; \ + cmake -Doptimize=on -Ddagmc=ON -DDAGMC_ROOT=$DAGMC_INSTALL_DIR -DHDF5_PREFER_PARALLEL=on .. && \ + make ; \ + make install ; \ + cd .. ; \ + pip install -e .[test] ; \ + fi # Download cross sections (NNDC and WMP) and ENDF data needed by test suite RUN /opt/openmc/tools/ci/download-xs.sh From c894c04865fc5c7566d7719655e75dc6ddcc0bc0 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Sat, 7 Nov 2020 23:38:57 +0000 Subject: [PATCH 03/15] added usage instrucions --- Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Dockerfile b/Dockerfile index 8dc19325a..b69b8e3dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,9 @@ +# To build with OpenMC +# docker build -t openmc . + +# To build with OpenMC and DAGMC enabled +# docker build -t openmc_dagmc --build-arg include_dagmc=true . + FROM ubuntu:latest # By default this Dockerfile builds OpenMC without dagmc @@ -71,6 +77,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DCMAKE_INSTALL_RPATH=${hdf5_install_dir}:$HOME/MOAB ; \ make ; \ make install ; \ + fi # Clone and install DAGMC RUN if [ "$include_dagmc" = "true" ] ; \ From fe5343dfa8c5d0c8bfb98670e84d7682617fd522 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Sun, 8 Nov 2020 10:08:23 +0000 Subject: [PATCH 04/15] added extra packages --- Dockerfile | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index b69b8e3dc..b97e7ac8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,21 +49,29 @@ RUN if [ "$include_dagmc" = "false" ] ; \ pip install -e .[test] ; \ fi +# install addition packages required for DAGMC +RUN if [ "$include_dagmc" = "true" ] ; \ + then apt-get --yes install libeigen3-dev ; \ + apt-get --yes install libblas-dev ; \ + apt-get --yes install liblapack-dev ; \ + apt-get --yes install libnetcdf-dev ; \ + #apt-get --yes install libnetcdf13 ; \ + fi + +ENV LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial:$LD_LIBRARY_PATH + # Clone and install MOAB RUN if [ "$include_dagmc" = "true" ] ; \ then mkdir -p MOAB/bld ; \ cd MOAB ; \ git clone --depth 1 https://bitbucket.org/fathomteam/moab -b Version5.1.0 ; \ cd bld ; \ - cmake ../moab -DBUILD_SHARED_LIBS=OFF ; \ - -DENABLE_HDF5=ON ; \ - -DENABLE_BLASLAPACK=OFF ; \ + cmake ../moab -DENABLE_HDF5=ON ; \ + -DENABLE_NETCDF=ON ; \ + -DBUILD_SHARED_LIBS=OFF ; \ -DENABLE_FORTRAN=OFF ; \ -DCMAKE_INSTALL_PREFIX=$HOME/MOAB ; \ - -DCMAKE_C_COMPILER=${CC} ; \ - -DCMAKE_CXX_COMPILER=${CXX} ; \ - -DCMAKE_INSTALL_RPATH=${hdf5_install_dir}:$HOME/MOAB ; \ - make ; \ + make -j4; \ make install ; \ rm -rf * ; \ cmake ../moab -DBUILD_SHARED_LIBS=ON ; \ @@ -72,22 +80,23 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DENABLE_BLASLAPACK=OFF ; \ -DENABLE_FORTRAN=OFF ; \ -DCMAKE_INSTALL_PREFIX=$HOME/MOAB ; \ - -DCMAKE_C_COMPILER=${CC} ; \ - -DCMAKE_CXX_COMPILER=${CXX} ; \ - -DCMAKE_INSTALL_RPATH=${hdf5_install_dir}:$HOME/MOAB ; \ - make ; \ + make -j4; \ make install ; \ fi # Clone and install DAGMC RUN if [ "$include_dagmc" = "true" ] ; \ - then DAGMC && \ - cd DAGMC && \ - git clone -b develop https://github.com/svalinn/dagmc && \ - mkdir build && \ - cd build && \ - cmake ../dagmc -DBUILD_TALLY=ON -DCMAKE_INSTALL_PREFIX=$DAGMC_INSTALL_DIR -DMOAB_DIR=$MOAB_INSTALL_DIR -DBUILD_STATIC_LIBS=OFF -DBUILD_STATIC_EXE=OFF && \ - make -j install && \ + then mkdir DAGMC ; \ + cd DAGMC ; \ + git clone -b develop https://github.com/svalinn/dagmc ; \ + mkdir build ; \ + cd build ; \ + cmake ../dagmc -DBUILD_TALLY=ON ; \ + -DCMAKE_INSTALL_PREFIX=$HOME/DAGMC/ ; \ + -DMOAB_DIR=$HOME/MOAB ; \ + -DBUILD_STATIC_LIBS=OFF ; \ + -DBUILD_STATIC_EXE=OFF ; \ + make -j install ; \ rm -rf $HOME/DAGMC/dagmc $HOME/DAGMC/build ; \ fi @@ -98,7 +107,9 @@ RUN if [ "$include_dagmc" = "true" ] ; \ cd /opt/openmc ; \ mkdir -p build ; \ cd build ; \ - cmake -Doptimize=on -Ddagmc=ON -DDAGMC_ROOT=$DAGMC_INSTALL_DIR -DHDF5_PREFER_PARALLEL=on .. && \ + cmake -Doptimize=on -Ddagmc=ON ; \ + -DDAGMC_DIR=$HOME/DAGMC/ ; \ + -DHDF5_PREFER_PARALLEL=on .. ; \ make ; \ make install ; \ cd .. ; \ From 4dd3ce901832e7d7ee7c5b6e86c57d2641490b19 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Tue, 17 Nov 2020 13:49:32 +0000 Subject: [PATCH 05/15] not finding MOAB dir --- Dockerfile | 81 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index b97e7ac8a..8f7d54464 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,7 +43,7 @@ RUN if [ "$include_dagmc" = "false" ] ; \ mkdir -p build ; \ cd build ; \ cmake -Doptimize=on -DHDF5_PREFER_PARALLEL=on .. ; \ - make ; \ + make ; \ make install ; \ cd .. ; \ pip install -e .[test] ; \ @@ -56,21 +56,52 @@ RUN if [ "$include_dagmc" = "true" ] ; \ apt-get --yes install liblapack-dev ; \ apt-get --yes install libnetcdf-dev ; \ #apt-get --yes install libnetcdf13 ; \ + apt-get --yes install libtbb-dev ; \ + apt-get --yes install libglfw3-dev ; \ + fi + +# perhaps not needed# +# ENV LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial:$LD_LIBRARY_PATH + +RUN git clone https://github.com/embree/embree +RUN git clone https://github.com/pshriwise/double-down +RUN git clone -b develop https://github.com/svalinn/dagmc +RUN git clone --recurse-submodules https://github.com/openmc-dev/openmc.git +RUN cd $HOME && \ + mkdir MOAB && \ + cd MOAB && \ + git clone --single-branch --branch develop https://bitbucket.org/fathomteam/moab/ + + +RUN apt-get --yes install + + +# Clone and install Embree +RUN if [ "$include_dagmc" = "true" ] ; \ + then echo installing embree ; \ + # git clone https://github.com/embree/embree ; \ + cd embree ; \ + mkdir build ; \ + cd build ; \ + cmake .. -DCMAKE_INSTALL_PREFIX=.. \ + -DEMBREE_ISPC_SUPPORT=OFF ; \ + make ; \ + make install ; \ fi -ENV LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial:$LD_LIBRARY_PATH # Clone and install MOAB RUN if [ "$include_dagmc" = "true" ] ; \ - then mkdir -p MOAB/bld ; \ + then mkdir MOAB ; \ + mkdir build ; \ cd MOAB ; \ - git clone --depth 1 https://bitbucket.org/fathomteam/moab -b Version5.1.0 ; \ - cd bld ; \ + # git clone --depth 1 https://bitbucket.org/fathomteam/moab -b develop ; \ + cd build ; \ cmake ../moab -DENABLE_HDF5=ON ; \ -DENABLE_NETCDF=ON ; \ -DBUILD_SHARED_LIBS=OFF ; \ -DENABLE_FORTRAN=OFF ; \ - -DCMAKE_INSTALL_PREFIX=$HOME/MOAB ; \ + -DCMAKE_INSTALL_PREFIX=/MOAB ; \ make -j4; \ make install ; \ rm -rf * ; \ @@ -79,37 +110,55 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DENABLE_PYMOAB=ON ; \ -DENABLE_BLASLAPACK=OFF ; \ -DENABLE_FORTRAN=OFF ; \ - -DCMAKE_INSTALL_PREFIX=$HOME/MOAB ; \ + -DCMAKE_INSTALL_PREFIX=/MOAB ; \ make -j4; \ make install ; \ fi + +# Clone and install double-down +RUN if [ "$include_dagmc" = "true" ] ; \ + then echo installing double-down ; \ + # git clone https://github.com/pshriwise/double-down ; \ + cd double-down ; \ + mkdir build ; \ + cd build ; \ + cmake .. -DCMAKE_INSTALL_PREFIX=.. ; \ + -DMOAB_DIR=/MOAB ; \ + -DEMBREE_DIR=/embree ; \ + -DEMBREE_ROOT=/embree ; \ + make ; \ + make install ; \ + fi + # Clone and install DAGMC RUN if [ "$include_dagmc" = "true" ] ; \ then mkdir DAGMC ; \ cd DAGMC ; \ - git clone -b develop https://github.com/svalinn/dagmc ; \ + # git clone -b develop https://github.com/svalinn/dagmc ; \ mkdir build ; \ cd build ; \ cmake ../dagmc -DBUILD_TALLY=ON ; \ - -DCMAKE_INSTALL_PREFIX=$HOME/DAGMC/ ; \ - -DMOAB_DIR=$HOME/MOAB ; \ - -DBUILD_STATIC_LIBS=OFF ; \ - -DBUILD_STATIC_EXE=OFF ; \ + -DCMAKE_INSTALL_PREFIX=/DAGMC/ ; \ + -DMOAB_DIR=/MOAB ; \ + -DBUILD_STATIC_LIBS=OFF ; \ + -DBUILD_STATIC_EXE=OFF ; \ make -j install ; \ - rm -rf $HOME/DAGMC/dagmc $HOME/DAGMC/build ; \ + rm -rf /DAGMC/dagmc /DAGMC/build ; \ fi + # Clone and install OpenMC with DAGMC RUN if [ "$include_dagmc" = "true" ] ; \ - then git clone --recurse-submodules https://github.com/openmc-dev/openmc.git \ + then echo installing openmc with dagmc ; \ + # then git clone --recurse-submodules https://github.com/openmc-dev/openmc.git ; \ /opt/openmc ; \ cd /opt/openmc ; \ mkdir -p build ; \ cd build ; \ cmake -Doptimize=on -Ddagmc=ON ; \ - -DDAGMC_DIR=$HOME/DAGMC/ ; \ - -DHDF5_PREFER_PARALLEL=on .. ; \ + -DDAGMC_DIR=/DAGMC/ ; \ + -DHDF5_PREFER_PARALLEL=on .. ; \ make ; \ make install ; \ cd .. ; \ From 389c6109f854fc44353c9249bac5de342b48514d Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Wed, 18 Nov 2020 00:01:12 +0000 Subject: [PATCH 06/15] moved clones and builds together --- Dockerfile | 73 ++++++++++++++++++++++-------------------------------- 1 file changed, 30 insertions(+), 43 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f7d54464..b27bac43b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,26 +60,11 @@ RUN if [ "$include_dagmc" = "true" ] ; \ apt-get --yes install libglfw3-dev ; \ fi -# perhaps not needed# -# ENV LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial:$LD_LIBRARY_PATH - -RUN git clone https://github.com/embree/embree -RUN git clone https://github.com/pshriwise/double-down -RUN git clone -b develop https://github.com/svalinn/dagmc -RUN git clone --recurse-submodules https://github.com/openmc-dev/openmc.git -RUN cd $HOME && \ - mkdir MOAB && \ - cd MOAB && \ - git clone --single-branch --branch develop https://bitbucket.org/fathomteam/moab/ - - -RUN apt-get --yes install - # Clone and install Embree RUN if [ "$include_dagmc" = "true" ] ; \ then echo installing embree ; \ - # git clone https://github.com/embree/embree ; \ + git clone https://github.com/embree/embree ; \ cd embree ; \ mkdir build ; \ cd build ; \ @@ -92,26 +77,27 @@ RUN if [ "$include_dagmc" = "true" ] ; \ # Clone and install MOAB RUN if [ "$include_dagmc" = "true" ] ; \ - then mkdir MOAB ; \ - mkdir build ; \ + then pip install --upgrade numpy cython ; \ + mkdir MOAB ; \ cd MOAB ; \ - # git clone --depth 1 https://bitbucket.org/fathomteam/moab -b develop ; \ + mkdir build ; \ + git clone --single-branch --branch develop https://bitbucket.org/fathomteam/moab/ ; \ cd build ; \ - cmake ../moab -DENABLE_HDF5=ON ; \ - -DENABLE_NETCDF=ON ; \ - -DBUILD_SHARED_LIBS=OFF ; \ - -DENABLE_FORTRAN=OFF ; \ + cmake ../moab -DENABLE_HDF5=ON \ + -DENABLE_NETCDF=ON \ + -DBUILD_SHARED_LIBS=OFF \ + -DENABLE_FORTRAN=OFF \ -DCMAKE_INSTALL_PREFIX=/MOAB ; \ - make -j4; \ + make -j; \ make install ; \ rm -rf * ; \ - cmake ../moab -DBUILD_SHARED_LIBS=ON ; \ - -DENABLE_HDF5=ON ; \ - -DENABLE_PYMOAB=ON ; \ - -DENABLE_BLASLAPACK=OFF ; \ - -DENABLE_FORTRAN=OFF ; \ + cmake ../moab -DBUILD_SHARED_LIBS=ON \ + -DENABLE_HDF5=ON \ + -DENABLE_PYMOAB=ON \ + -DENABLE_BLASLAPACK=OFF \ + -DENABLE_FORTRAN=OFF \ -DCMAKE_INSTALL_PREFIX=/MOAB ; \ - make -j4; \ + make -j; \ make install ; \ fi @@ -119,29 +105,30 @@ RUN if [ "$include_dagmc" = "true" ] ; \ # Clone and install double-down RUN if [ "$include_dagmc" = "true" ] ; \ then echo installing double-down ; \ - # git clone https://github.com/pshriwise/double-down ; \ + git clone https://github.com/pshriwise/double-down ; \ cd double-down ; \ mkdir build ; \ cd build ; \ - cmake .. -DCMAKE_INSTALL_PREFIX=.. ; \ - -DMOAB_DIR=/MOAB ; \ - -DEMBREE_DIR=/embree ; \ - -DEMBREE_ROOT=/embree ; \ - make ; \ - make install ; \ + cmake .. -DCMAKE_INSTALL_PREFIX=.. \ + -DMOAB_DIR=/MOAB \ + -DEMBREE_DIR=/embree/lib/cmake/embree-3.12.1 \ + -DEMBREE_ROOT=/embree/lib/cmake/embree-3.12.1 ; \ + make -j ; \ + make -j install ; \ fi + # Clone and install DAGMC RUN if [ "$include_dagmc" = "true" ] ; \ then mkdir DAGMC ; \ cd DAGMC ; \ - # git clone -b develop https://github.com/svalinn/dagmc ; \ + git clone -b develop https://github.com/svalinn/dagmc ; \ mkdir build ; \ cd build ; \ - cmake ../dagmc -DBUILD_TALLY=ON ; \ - -DCMAKE_INSTALL_PREFIX=/DAGMC/ ; \ - -DMOAB_DIR=/MOAB ; \ - -DBUILD_STATIC_LIBS=OFF ; \ + cmake ../dagmc -DBUILD_TALLY=ON \ + -DCMAKE_INSTALL_PREFIX=/dagmc/ \ + -DMOAB_DIR=/MOAB \ + -DBUILD_STATIC_LIBS=OFF \ -DBUILD_STATIC_EXE=OFF ; \ make -j install ; \ rm -rf /DAGMC/dagmc /DAGMC/build ; \ @@ -151,7 +138,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ # Clone and install OpenMC with DAGMC RUN if [ "$include_dagmc" = "true" ] ; \ then echo installing openmc with dagmc ; \ - # then git clone --recurse-submodules https://github.com/openmc-dev/openmc.git ; \ + then git clone --recurse-submodules https://github.com/openmc-dev/openmc.git ; \ /opt/openmc ; \ cd /opt/openmc ; \ mkdir -p build ; \ From 966d2bd64c76eb4b8a57f4894288050d671cdb89 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Wed, 18 Nov 2020 14:13:11 +0000 Subject: [PATCH 07/15] removed echo commands --- Dockerfile | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index b27bac43b..2ff1d9cef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN git clone https://github.com/njoy/NJOY2016 /opt/NJOY2016 && \ # Clone and install OpenMC without DAGMC RUN if [ "$include_dagmc" = "false" ] ; \ - then git clone --recurse-submodules https://github.com/openmc-dev/openmc.git \ + then git clone --recurse-submodules https://github.com/openmc-dev/openmc.git ; \ /opt/openmc ; \ cd /opt/openmc ; \ mkdir -p build ; \ @@ -55,16 +55,13 @@ RUN if [ "$include_dagmc" = "true" ] ; \ apt-get --yes install libblas-dev ; \ apt-get --yes install liblapack-dev ; \ apt-get --yes install libnetcdf-dev ; \ - #apt-get --yes install libnetcdf13 ; \ apt-get --yes install libtbb-dev ; \ apt-get --yes install libglfw3-dev ; \ fi - # Clone and install Embree RUN if [ "$include_dagmc" = "true" ] ; \ - then echo installing embree ; \ - git clone https://github.com/embree/embree ; \ + then git clone https://github.com/embree/embree ; \ cd embree ; \ mkdir build ; \ cd build ; \ @@ -74,7 +71,6 @@ RUN if [ "$include_dagmc" = "true" ] ; \ make install ; \ fi - # Clone and install MOAB RUN if [ "$include_dagmc" = "true" ] ; \ then pip install --upgrade numpy cython ; \ @@ -88,7 +84,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DBUILD_SHARED_LIBS=OFF \ -DENABLE_FORTRAN=OFF \ -DCMAKE_INSTALL_PREFIX=/MOAB ; \ - make -j; \ + make ; \ make install ; \ rm -rf * ; \ cmake ../moab -DBUILD_SHARED_LIBS=ON \ @@ -97,15 +93,13 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DENABLE_BLASLAPACK=OFF \ -DENABLE_FORTRAN=OFF \ -DCMAKE_INSTALL_PREFIX=/MOAB ; \ - make -j; \ + make ; \ make install ; \ fi - -# Clone and install double-down +# Clone and install Double-Down RUN if [ "$include_dagmc" = "true" ] ; \ - then echo installing double-down ; \ - git clone https://github.com/pshriwise/double-down ; \ + then git clone https://github.com/pshriwise/double-down ; \ cd double-down ; \ mkdir build ; \ cd build ; \ @@ -113,11 +107,10 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DMOAB_DIR=/MOAB \ -DEMBREE_DIR=/embree/lib/cmake/embree-3.12.1 \ -DEMBREE_ROOT=/embree/lib/cmake/embree-3.12.1 ; \ - make -j ; \ - make -j install ; \ + make ; \ + make install ; \ fi - # Clone and install DAGMC RUN if [ "$include_dagmc" = "true" ] ; \ then mkdir DAGMC ; \ @@ -130,21 +123,18 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DMOAB_DIR=/MOAB \ -DBUILD_STATIC_LIBS=OFF \ -DBUILD_STATIC_EXE=OFF ; \ - make -j install ; \ + make install ; \ rm -rf /DAGMC/dagmc /DAGMC/build ; \ fi - # Clone and install OpenMC with DAGMC RUN if [ "$include_dagmc" = "true" ] ; \ - then echo installing openmc with dagmc ; \ - then git clone --recurse-submodules https://github.com/openmc-dev/openmc.git ; \ - /opt/openmc ; \ + then git clone --recurse-submodules https://github.com/openmc-dev/openmc.git /opt/openmc ; \ cd /opt/openmc ; \ - mkdir -p build ; \ + mkdir build ; \ cd build ; \ - cmake -Doptimize=on -Ddagmc=ON ; \ - -DDAGMC_DIR=/DAGMC/ ; \ + cmake -Doptimize=on -Ddagmc=ON \ + -DDAGMC_DIR=/DAGMC/ \ -DHDF5_PREFER_PARALLEL=on .. ; \ make ; \ make install ; \ From b59233072a10a4778992dda61effb3d70c962014 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Wed, 18 Nov 2020 18:27:36 +0000 Subject: [PATCH 08/15] added pymoab to moab build --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 2ff1d9cef..725ea0811 100644 --- a/Dockerfile +++ b/Dockerfile @@ -95,6 +95,9 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DCMAKE_INSTALL_PREFIX=/MOAB ; \ make ; \ make install ; \ + cd pymoab ; \ + bash install.sh ; \ + python setup.py install ; \ fi # Clone and install Double-Down From 9987b0c871b907e872f4a9252a81c59db6384a4d Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Thu, 26 Nov 2020 19:09:44 +0000 Subject: [PATCH 09/15] added option to complie with multiple cores --- .github/workflows/dockerhub-publish-dagmc.yml | 1 + .github/workflows/dockerhub-publish-dev.yml | 2 ++ .../dockerhub-publish-release-dagmc.yml | 1 + .../workflows/dockerhub-publish-release.yml | 2 ++ .github/workflows/dockerhub-publish.yml | 2 ++ .../name: dockerhub-publish-develop-dagmc.yml | 1 + Dockerfile | 32 +++++++++++-------- 7 files changed, 28 insertions(+), 13 deletions(-) diff --git a/.github/workflows/dockerhub-publish-dagmc.yml b/.github/workflows/dockerhub-publish-dagmc.yml index 439ef87a4..d96229279 100644 --- a/.github/workflows/dockerhub-publish-dagmc.yml +++ b/.github/workflows/dockerhub-publish-dagmc.yml @@ -29,6 +29,7 @@ jobs: tags: openmc/openmc:latest-dagmc build-args: | include_dagmc=true + compile_cores=2 - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/dockerhub-publish-dev.yml b/.github/workflows/dockerhub-publish-dev.yml index 00fab4129..73f62acaa 100644 --- a/.github/workflows/dockerhub-publish-dev.yml +++ b/.github/workflows/dockerhub-publish-dev.yml @@ -27,6 +27,8 @@ jobs: with: push: true tags: openmc/openmc:develop + build-args: | + compile_cores=2 - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/dockerhub-publish-release-dagmc.yml b/.github/workflows/dockerhub-publish-release-dagmc.yml index 0f1df936e..6038a9878 100644 --- a/.github/workflows/dockerhub-publish-release-dagmc.yml +++ b/.github/workflows/dockerhub-publish-release-dagmc.yml @@ -32,6 +32,7 @@ jobs: tags: openmc/openmc:${{ env.RELEASE_VERSION }}-dagmc build-args: | include_dagmc=true + compile_cores=2 - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/dockerhub-publish-release.yml b/.github/workflows/dockerhub-publish-release.yml index d8de72618..c94a50c0d 100644 --- a/.github/workflows/dockerhub-publish-release.yml +++ b/.github/workflows/dockerhub-publish-release.yml @@ -30,6 +30,8 @@ jobs: with: push: true tags: openmc/openmc:${{ env.RELEASE_VERSION }} + build-args: | + compile_cores=2 - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/dockerhub-publish.yml b/.github/workflows/dockerhub-publish.yml index 0737849e9..6bd0c4dc6 100644 --- a/.github/workflows/dockerhub-publish.yml +++ b/.github/workflows/dockerhub-publish.yml @@ -27,6 +27,8 @@ jobs: with: push: true tags: openmc/openmc:latest + build-args: | + compile_cores=2 - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/name: dockerhub-publish-develop-dagmc.yml b/.github/workflows/name: dockerhub-publish-develop-dagmc.yml index ba3f1878c..0ded0c180 100644 --- a/.github/workflows/name: dockerhub-publish-develop-dagmc.yml +++ b/.github/workflows/name: dockerhub-publish-develop-dagmc.yml @@ -29,6 +29,7 @@ jobs: tags: openmc/openmc:develop-dagmc build-args: | include_dagmc=true + compile_cores=2 - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/Dockerfile b/Dockerfile index 725ea0811..20f07bf49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,11 +4,17 @@ # To build with OpenMC and DAGMC enabled # docker build -t openmc_dagmc --build-arg include_dagmc=true . +# To make use of multiple cores during the compile stages of the docker build +# docker build -t openmc_dagmc --build-arg compile_cores=8 + FROM ubuntu:latest # By default this Dockerfile builds OpenMC without dagmc ARG include_dagmc=false +# By default one core is used to compile +ARG compile_cores=1 + # Setup environment variables for Docker image ENV CC=/usr/bin/mpicc CXX=/usr/bin/mpicxx \ PATH=/opt/openmc/bin:/opt/NJOY2016/build:$PATH \ @@ -43,8 +49,8 @@ RUN if [ "$include_dagmc" = "false" ] ; \ mkdir -p build ; \ cd build ; \ cmake -Doptimize=on -DHDF5_PREFER_PARALLEL=on .. ; \ - make ; \ - make install ; \ + make -j"$compile_cores" ; \ + make -j"$compile_cores" install ; \ cd .. ; \ pip install -e .[test] ; \ fi @@ -67,8 +73,8 @@ RUN if [ "$include_dagmc" = "true" ] ; \ cd build ; \ cmake .. -DCMAKE_INSTALL_PREFIX=.. \ -DEMBREE_ISPC_SUPPORT=OFF ; \ - make ; \ - make install ; \ + make -j"$compile_cores" ; \ + make -j"$compile_cores" install ; \ fi # Clone and install MOAB @@ -84,8 +90,8 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DBUILD_SHARED_LIBS=OFF \ -DENABLE_FORTRAN=OFF \ -DCMAKE_INSTALL_PREFIX=/MOAB ; \ - make ; \ - make install ; \ + make -j"$compile_cores" ; \ + make -j"$compile_cores" install ; \ rm -rf * ; \ cmake ../moab -DBUILD_SHARED_LIBS=ON \ -DENABLE_HDF5=ON \ @@ -93,8 +99,8 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DENABLE_BLASLAPACK=OFF \ -DENABLE_FORTRAN=OFF \ -DCMAKE_INSTALL_PREFIX=/MOAB ; \ - make ; \ - make install ; \ + make -j"$compile_cores" ; \ + make -j"$compile_cores" install ; \ cd pymoab ; \ bash install.sh ; \ python setup.py install ; \ @@ -110,8 +116,8 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DMOAB_DIR=/MOAB \ -DEMBREE_DIR=/embree/lib/cmake/embree-3.12.1 \ -DEMBREE_ROOT=/embree/lib/cmake/embree-3.12.1 ; \ - make ; \ - make install ; \ + make -j"$compile_cores" ; \ + make -j"$compile_cores" install ; \ fi # Clone and install DAGMC @@ -126,7 +132,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DMOAB_DIR=/MOAB \ -DBUILD_STATIC_LIBS=OFF \ -DBUILD_STATIC_EXE=OFF ; \ - make install ; \ + make -j"$compile_cores" install ; \ rm -rf /DAGMC/dagmc /DAGMC/build ; \ fi @@ -139,8 +145,8 @@ RUN if [ "$include_dagmc" = "true" ] ; \ cmake -Doptimize=on -Ddagmc=ON \ -DDAGMC_DIR=/DAGMC/ \ -DHDF5_PREFER_PARALLEL=on .. ; \ - make ; \ - make install ; \ + make -j"$compile_cores" ; \ + make -j"$compile_cores" install ; \ cd .. ; \ pip install -e .[test] ; \ fi From c9cbe35c5febe305e1653552603d290b6f1bb6a8 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Tue, 8 Dec 2020 11:14:03 +0000 Subject: [PATCH 10/15] Apply suggestions from code review, indents Co-authored-by: Patrick Shriwise --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 20f07bf49..14ad2473b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,7 +72,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ mkdir build ; \ cd build ; \ cmake .. -DCMAKE_INSTALL_PREFIX=.. \ - -DEMBREE_ISPC_SUPPORT=OFF ; \ + -DEMBREE_ISPC_SUPPORT=OFF ; \ make -j"$compile_cores" ; \ make -j"$compile_cores" install ; \ fi @@ -113,9 +113,9 @@ RUN if [ "$include_dagmc" = "true" ] ; \ mkdir build ; \ cd build ; \ cmake .. -DCMAKE_INSTALL_PREFIX=.. \ - -DMOAB_DIR=/MOAB \ - -DEMBREE_DIR=/embree/lib/cmake/embree-3.12.1 \ - -DEMBREE_ROOT=/embree/lib/cmake/embree-3.12.1 ; \ + -DMOAB_DIR=/MOAB \ + -DEMBREE_DIR=/embree/lib/cmake/embree-3.12.1 \ + -DEMBREE_ROOT=/embree/lib/cmake/embree-3.12.1 ; \ make -j"$compile_cores" ; \ make -j"$compile_cores" install ; \ fi From bea1a7ea8334802506c91484f338fab930db53fe Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Tue, 8 Dec 2020 13:32:25 +0000 Subject: [PATCH 11/15] review comments removed blaslapack --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 14ad2473b..a9176f7c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ # docker build -t openmc_dagmc --build-arg include_dagmc=true . # To make use of multiple cores during the compile stages of the docker build -# docker build -t openmc_dagmc --build-arg compile_cores=8 +# docker build -t openmc_dagmc --build-arg compile_cores=8 . FROM ubuntu:latest @@ -58,8 +58,6 @@ RUN if [ "$include_dagmc" = "false" ] ; \ # install addition packages required for DAGMC RUN if [ "$include_dagmc" = "true" ] ; \ then apt-get --yes install libeigen3-dev ; \ - apt-get --yes install libblas-dev ; \ - apt-get --yes install liblapack-dev ; \ apt-get --yes install libnetcdf-dev ; \ apt-get --yes install libtbb-dev ; \ apt-get --yes install libglfw3-dev ; \ @@ -89,7 +87,8 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DENABLE_NETCDF=ON \ -DBUILD_SHARED_LIBS=OFF \ -DENABLE_FORTRAN=OFF \ - -DCMAKE_INSTALL_PREFIX=/MOAB ; \ + -DCMAKE_INSTALL_PREFIX=/MOAB \ + -DENABLE_BLASLAPACK=OFF ; \ make -j"$compile_cores" ; \ make -j"$compile_cores" install ; \ rm -rf * ; \ @@ -98,7 +97,8 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DENABLE_PYMOAB=ON \ -DENABLE_BLASLAPACK=OFF \ -DENABLE_FORTRAN=OFF \ - -DCMAKE_INSTALL_PREFIX=/MOAB ; \ + -DCMAKE_INSTALL_PREFIX=/MOAB \ + -DENABLE_BLASLAPACK=OFF ; \ make -j"$compile_cores" ; \ make -j"$compile_cores" install ; \ cd pymoab ; \ From 1469c2334be343e9b07a73441806e0b17d7bc93c Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Tue, 8 Dec 2020 13:43:53 +0000 Subject: [PATCH 12/15] review comment, removed duplicate dir finding flags --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a9176f7c3..5550d6ba9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -114,8 +114,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ cd build ; \ cmake .. -DCMAKE_INSTALL_PREFIX=.. \ -DMOAB_DIR=/MOAB \ - -DEMBREE_DIR=/embree/lib/cmake/embree-3.12.1 \ - -DEMBREE_ROOT=/embree/lib/cmake/embree-3.12.1 ; \ + -DEMBREE_DIR=/embree/lib/cmake/embree-3.12.1 ; \ make -j"$compile_cores" ; \ make -j"$compile_cores" install ; \ fi From 96c025c92f5c1590581e4f549d973e60e330cf6d Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Sat, 26 Dec 2020 00:59:27 +0000 Subject: [PATCH 13/15] changed MOAB path --- Dockerfile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5550d6ba9..3cc5cadf8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -87,7 +87,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DENABLE_NETCDF=ON \ -DBUILD_SHARED_LIBS=OFF \ -DENABLE_FORTRAN=OFF \ - -DCMAKE_INSTALL_PREFIX=/MOAB \ + -DPYMOAB_PREFIX=/MOAB/build/pymoab \ -DENABLE_BLASLAPACK=OFF ; \ make -j"$compile_cores" ; \ make -j"$compile_cores" install ; \ @@ -97,13 +97,9 @@ RUN if [ "$include_dagmc" = "true" ] ; \ -DENABLE_PYMOAB=ON \ -DENABLE_BLASLAPACK=OFF \ -DENABLE_FORTRAN=OFF \ - -DCMAKE_INSTALL_PREFIX=/MOAB \ -DENABLE_BLASLAPACK=OFF ; \ make -j"$compile_cores" ; \ make -j"$compile_cores" install ; \ - cd pymoab ; \ - bash install.sh ; \ - python setup.py install ; \ fi # Clone and install Double-Down @@ -113,7 +109,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ mkdir build ; \ cd build ; \ cmake .. -DCMAKE_INSTALL_PREFIX=.. \ - -DMOAB_DIR=/MOAB \ + -DMOAB_DIR=/usr/local \ -DEMBREE_DIR=/embree/lib/cmake/embree-3.12.1 ; \ make -j"$compile_cores" ; \ make -j"$compile_cores" install ; \ @@ -128,7 +124,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ cd build ; \ cmake ../dagmc -DBUILD_TALLY=ON \ -DCMAKE_INSTALL_PREFIX=/dagmc/ \ - -DMOAB_DIR=/MOAB \ + -DMOAB_DIR=/usr/local \ -DBUILD_STATIC_LIBS=OFF \ -DBUILD_STATIC_EXE=OFF ; \ make -j"$compile_cores" install ; \ From fb4100f84e89a8af1831d5ce6cbd36d7b3fe08b7 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Tue, 29 Dec 2020 19:06:05 +0000 Subject: [PATCH 14/15] review suggestions removed pymoab flag and indent Co-authored-by: Patrick Shriwise --- Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3cc5cadf8..67bcbd5d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -84,11 +84,10 @@ RUN if [ "$include_dagmc" = "true" ] ; \ git clone --single-branch --branch develop https://bitbucket.org/fathomteam/moab/ ; \ cd build ; \ cmake ../moab -DENABLE_HDF5=ON \ - -DENABLE_NETCDF=ON \ - -DBUILD_SHARED_LIBS=OFF \ - -DENABLE_FORTRAN=OFF \ - -DPYMOAB_PREFIX=/MOAB/build/pymoab \ - -DENABLE_BLASLAPACK=OFF ; \ + -DENABLE_NETCDF=ON \ + -DBUILD_SHARED_LIBS=OFF \ + -DENABLE_FORTRAN=OFF \ + -DENABLE_BLASLAPACK=OFF ; \ make -j"$compile_cores" ; \ make -j"$compile_cores" install ; \ rm -rf * ; \ From 080166aaa67dbdb0cdceb011b3522b0a304d9064 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Sat, 2 Jan 2021 18:12:45 +0000 Subject: [PATCH 15/15] indent alignment --- Dockerfile | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 67bcbd5d5..325a0f4bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,8 @@ RUN if [ "$include_dagmc" = "false" ] ; \ cd /opt/openmc ; \ mkdir -p build ; \ cd build ; \ - cmake -Doptimize=on -DHDF5_PREFER_PARALLEL=on .. ; \ + cmake -Doptimize=on \ + -DHDF5_PREFER_PARALLEL=on .. ; \ make -j"$compile_cores" ; \ make -j"$compile_cores" install ; \ cd .. ; \ @@ -92,11 +93,11 @@ RUN if [ "$include_dagmc" = "true" ] ; \ make -j"$compile_cores" install ; \ rm -rf * ; \ cmake ../moab -DBUILD_SHARED_LIBS=ON \ - -DENABLE_HDF5=ON \ - -DENABLE_PYMOAB=ON \ - -DENABLE_BLASLAPACK=OFF \ - -DENABLE_FORTRAN=OFF \ - -DENABLE_BLASLAPACK=OFF ; \ + -DENABLE_HDF5=ON \ + -DENABLE_PYMOAB=ON \ + -DENABLE_BLASLAPACK=OFF \ + -DENABLE_FORTRAN=OFF \ + -DENABLE_BLASLAPACK=OFF ; \ make -j"$compile_cores" ; \ make -j"$compile_cores" install ; \ fi @@ -122,10 +123,10 @@ RUN if [ "$include_dagmc" = "true" ] ; \ mkdir build ; \ cd build ; \ cmake ../dagmc -DBUILD_TALLY=ON \ - -DCMAKE_INSTALL_PREFIX=/dagmc/ \ - -DMOAB_DIR=/usr/local \ - -DBUILD_STATIC_LIBS=OFF \ - -DBUILD_STATIC_EXE=OFF ; \ + -DCMAKE_INSTALL_PREFIX=/dagmc/ \ + -DMOAB_DIR=/usr/local \ + -DBUILD_STATIC_LIBS=OFF \ + -DBUILD_STATIC_EXE=OFF ; \ make -j"$compile_cores" install ; \ rm -rf /DAGMC/dagmc /DAGMC/build ; \ fi @@ -136,9 +137,10 @@ RUN if [ "$include_dagmc" = "true" ] ; \ cd /opt/openmc ; \ mkdir build ; \ cd build ; \ - cmake -Doptimize=on -Ddagmc=ON \ - -DDAGMC_DIR=/DAGMC/ \ - -DHDF5_PREFER_PARALLEL=on .. ; \ + cmake -Doptimize=on \ + -Ddagmc=ON \ + -DDAGMC_DIR=/DAGMC/ \ + -DHDF5_PREFER_PARALLEL=on .. ; \ make -j"$compile_cores" ; \ make -j"$compile_cores" install ; \ cd .. ; \