Merge pull request #54 from OpenGATE/geant11

Update to c++17 and root

Author: tbaudier

.github/workflows/Dockerfile_gatebenchmarks

@@ -22,6 +22,8 @@ RUN yum install -y  make \
                     centos-release-scl \
                     python3-devel \
                     which \
+                    openssl-devel \
+                    patch \
  && yum install -y devtoolset-7-gcc-c++
 
 #create folder and install cmake
@@ -38,9 +40,10 @@ RUN mkdir software/root-cern \
  && source /etc/mybashrc \
  && cd software/root-cern \
  && mkdir src bin install \
- && git clone --branch v6-19-02 https://github.com/root-project/root.git src \
+ && git clone --branch v6-24-06 https://github.com/root-project/root.git src \
  && cd bin \
- && cmake ../src/ -Dpython=OFF \
+ && cmake ../src/ -DCMAKE_CXX_STANDARD=17 \
+                  -Dpython=OFF \
                   -DCMAKE_INSTALL_PREFIX=/software/root-cern/install \
  && make -j16 install \
  && cd .. \
@@ -53,7 +56,8 @@ RUN mkdir software/geant4 \
  && mkdir src bin install data \
  && git clone --branch v10.7.0 https://github.com/Geant4/geant4.git src \
  && cd bin \
- && cmake ../src/ -DGEANT4_INSTALL_DATA=OFF \
+ && cmake ../src/ -DCMAKE_CXX_FLAGS="-std=c++17" \
+                  -DGEANT4_INSTALL_DATA=OFF \
                   -DGEANT4_INSTALL_DATADIR=/software/geant4/data \
                   -DGEANT4_USE_QT=ON \
                   -DCMAKE_INSTALL_PREFIX=/software/geant4/install \

.github/workflows/main.yml

@@ -66,5 +66,5 @@ jobs:
     - name: Run the test in docker
       run: |
         ls $GITHUB_WORKSPACE
-        docker run --rm -e "TEST=${{ matrix.strategy_name }}" -v $GITHUB_WORKSPACE:/home tbaudier/gatebenchmarks:9.1 /home/.github/workflows/runTest.sh
+        docker run --rm -e "TEST=${{ matrix.strategy_name }}" -v $GITHUB_WORKSPACE:/home tbaudier/gatebenchmarks:9.2 /home/.github/workflows/runTest.sh
 

.github/workflows/runTest.sh

@@ -36,9 +36,9 @@ if [ "$compile_torch" = true ] ; then
     cd /software
     mkdir torch
     cd torch
-    wget https://download.pytorch.org/libtorch/cpu/libtorch-shared-with-deps-1.4.0%2Bcpu.zip
-    unzip libtorch-shared-with-deps-1.4.0+cpu.zip
-    rm -rf libtorch-shared-with-deps-1.4.0+cpu.zip
+    wget https://download.pytorch.org/libtorch/cpu/libtorch-shared-with-deps-1.10.1%2Bcpu.zip
+    unzip libtorch-shared-with-deps-1.10.1+cpu.zip
+    rm -rf libtorch-shared-with-deps-1.10.1+cpu.zip
     export GATE_USE_TORCH=ON
     export TORCH_DIR=/software/torch/libtorch/share/cmake/Torch
 fi