From 5e2b56ea80283596300d76f32a46de36a3b11fa1 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Sat, 23 Jan 2021 23:28:08 +0000 Subject: [PATCH 1/6] using embree root in cmake args --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a15ddbbf32..c04e6b5b4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -108,7 +108,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ cd build ; \ cmake .. -DCMAKE_INSTALL_PREFIX=.. \ -DMOAB_DIR=/usr/local \ - -DEMBREE_DIR=/embree/lib/cmake/embree-3.12.1 ; \ + -DEMBREE_DIR=/embree ; \ make -j"$compile_cores" ; \ make -j"$compile_cores" install ; \ fi From 5588f91661e8110d3500e219d455273fe91bdb5f Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Sat, 23 Jan 2021 23:38:03 +0000 Subject: [PATCH 2/6] added missing .git to cloned repos --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index c04e6b5b4e..1001260332 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ RUN apt-get update -y && \ RUN pip3 install --upgrade pip # Clone and install NJOY2016 -RUN git clone https://github.com/njoy/NJOY2016 /opt/NJOY2016 && \ +RUN git clone https://github.com/njoy/NJOY2016.git /opt/NJOY2016 && \ cd /opt/NJOY2016 && \ mkdir build && cd build && \ cmake -Dstatic=on .. && make 2>/dev/null && make install @@ -65,7 +65,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ # Clone and install Embree RUN if [ "$include_dagmc" = "true" ] ; \ - then git clone https://github.com/embree/embree ; \ + then git clone https://github.com/embree/embree.git ; \ cd embree ; \ mkdir build ; \ cd build ; \ @@ -81,7 +81,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ mkdir MOAB ; \ cd MOAB ; \ mkdir build ; \ - git clone --single-branch --branch develop https://bitbucket.org/fathomteam/moab/ ; \ + git clone --single-branch --branch develop https://bitbucket.org/fathomteam/moab.git ; \ cd build ; \ cmake ../moab -DENABLE_HDF5=ON \ -DENABLE_NETCDF=ON \ @@ -102,7 +102,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ # Clone and install Double-Down RUN if [ "$include_dagmc" = "true" ] ; \ - then git clone https://github.com/pshriwise/double-down ; \ + then git clone https://github.com/pshriwise/double-down.git ; \ cd double-down ; \ mkdir build ; \ cd build ; \ @@ -117,7 +117,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ 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.git ; \ mkdir build ; \ cd build ; \ cmake ../dagmc -DBUILD_TALLY=ON \ From 2831d84ff1530f3063501f5d9bb248310c2ce6bf Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Sun, 24 Jan 2021 12:00:31 +0000 Subject: [PATCH 3/6] Now deleting correct folder name with uppercase Co-authored-by: Ariful Islam Pranto --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1001260332..17378e422d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -120,7 +120,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ git clone -b develop https://github.com/svalinn/DAGMC.git ; \ mkdir build ; \ cd build ; \ - cmake ../dagmc -DBUILD_TALLY=ON \ + cmake ../DAGMC -DBUILD_TALLY=ON \ -DCMAKE_INSTALL_PREFIX=/dagmc/ \ -DMOAB_DIR=/usr/local \ -DBUILD_STATIC_LIBS=OFF \ From 13ba2603097a92c4b613a7daf105a35893e78ea5 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Mon, 25 Jan 2021 16:48:20 +0000 Subject: [PATCH 4/6] cloning single branch to reduce footprint and upercase DAGMC dir --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 17378e422d..393574e8dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -65,7 +65,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ # Clone and install Embree RUN if [ "$include_dagmc" = "true" ] ; \ - then git clone https://github.com/embree/embree.git ; \ + then git clone --single-branch --branch master https://github.com/embree/embree.git ; \ cd embree ; \ mkdir build ; \ cd build ; \ @@ -102,7 +102,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ # Clone and install Double-Down RUN if [ "$include_dagmc" = "true" ] ; \ - then git clone https://github.com/pshriwise/double-down.git ; \ + then git clone --single-branch --branch main https://github.com/pshriwise/double-down.git ; \ cd double-down ; \ mkdir build ; \ cd build ; \ @@ -117,16 +117,16 @@ RUN if [ "$include_dagmc" = "true" ] ; \ RUN if [ "$include_dagmc" = "true" ] ; \ then mkdir DAGMC ; \ cd DAGMC ; \ - git clone -b develop https://github.com/svalinn/DAGMC.git ; \ + git clone --single-branch --branch develop develop https://github.com/svalinn/DAGMC.git ; \ mkdir build ; \ cd build ; \ cmake ../DAGMC -DBUILD_TALLY=ON \ - -DCMAKE_INSTALL_PREFIX=/dagmc/ \ + -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 ; \ + rm -rf /DAGMC/DAGMC /DAGMC/build ; \ fi # Clone and install OpenMC with DAGMC From 0990d92c05f897059d368ec9ff08b0ce9ef131cb Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Tue, 26 Jan 2021 18:34:52 +0000 Subject: [PATCH 5/6] suggestion from PR review, removed duplicate develop Co-authored-by: Patrick Shriwise --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 393574e8dc..d8824b631d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -117,7 +117,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ RUN if [ "$include_dagmc" = "true" ] ; \ then mkdir DAGMC ; \ cd DAGMC ; \ - git clone --single-branch --branch develop develop https://github.com/svalinn/DAGMC.git ; \ + git clone --single-branch --branch develop https://github.com/svalinn/DAGMC.git ; \ mkdir build ; \ cd build ; \ cmake ../DAGMC -DBUILD_TALLY=ON \ From 61b416980179bc5824f01340b991974a143bf0af Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Tue, 26 Jan 2021 19:11:42 +0000 Subject: [PATCH 6/6] suggestion from code review, change moab branch to master --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d8824b631d..a43b4f31d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -81,7 +81,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \ mkdir MOAB ; \ cd MOAB ; \ mkdir build ; \ - git clone --single-branch --branch develop https://bitbucket.org/fathomteam/moab.git ; \ + git clone --single-branch --branch master https://bitbucket.org/fathomteam/moab.git ; \ cd build ; \ cmake ../moab -DENABLE_HDF5=ON \ -DENABLE_NETCDF=ON \