Skip to content

Commit 50cbe4e

Browse files
committed
Update for new docker image with G4 11.4.0
1 parent 6f9e41d commit 50cbe4e

File tree

2 files changed

+19
-23
lines changed

2 files changed

+19
-23
lines changed

.github/workflows/Dockerfile_gatebenchmarks

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#push: docker push tbaudier/gatebenchmarks
66
#interactive: docker run -ti --rm -v $(Pipeline.Workspace)/software:/home tbaudier/gatebenchmarks /bin/bash
77

8-
FROM rockylinux:8
8+
FROM rockylinux/rockylinux:10
99
RUN yum install -y make \
1010
libX11-devel.x86_64 \
1111
libXpm-devel.x86_64 \
@@ -14,7 +14,7 @@ RUN yum install -y make \
1414
libXmu-devel.x86_64 \
1515
libxml2-devel.x86_64 \
1616
binutils \
17-
qt5-qtbase-devel.x86_64 \
17+
qt6-qtbase-devel \
1818
git \
1919
cmake \
2020
unzip \
@@ -25,23 +25,24 @@ RUN yum install -y make \
2525
which \
2626
openssl-devel \
2727
patch \
28+
expat-devel \
2829
findutils \
2930
procps \
3031
libjpeg-devel
3132

3233
#create folder and install cmake
3334
RUN mkdir software \
3435
&& cd software \
35-
&& wget https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4-Linux-x86_64.tar.gz \
36-
&& tar xzvf cmake-3.18.4-Linux-x86_64.tar.gz \
37-
&& echo "export PATH=/software/cmake-3.18.4-Linux-x86_64/bin/:$PATH" >> /etc/mybashrc
36+
&& wget https://github.com/Kitware/CMake/releases/download/v3.31.11/cmake-3.31.11-Linux-x86_64.tar.gz \
37+
&& tar xzvf cmake-3.31.11-Linux-x86_64.tar.gz \
38+
&& echo "export PATH=/software/cmake-3.31.11-Linux-x86_64/bin/:$PATH" >> /etc/mybashrc
3839

3940
#Build root
4041
RUN mkdir software/root-cern \
4142
&& source /etc/mybashrc \
4243
&& cd software/root-cern \
4344
&& mkdir src bin install \
44-
&& git clone --branch v6-24-06 https://github.com/root-project/root.git src \
45+
&& git clone --branch v6-36-08 https://github.com/root-project/root.git src \
4546
&& cd bin \
4647
&& cmake ../src/ -DCMAKE_CXX_STANDARD=17 \
4748
-Dpython=OFF \
@@ -55,7 +56,7 @@ RUN mkdir software/geant4 \
5556
&& source /etc/mybashrc \
5657
&& cd software/geant4 \
5758
&& mkdir src bin install data \
58-
&& git clone --branch v11.3.0 https://github.com/Geant4/geant4.git src \
59+
&& git clone --branch v11.4.0 https://github.com/Geant4/geant4.git src \
5960
&& cd bin \
6061
&& cmake ../src/ -DGEANT4_INSTALL_DATA=OFF \
6162
-DGEANT4_INSTALL_DATADIR=/software/geant4/data \
@@ -77,26 +78,26 @@ RUN cd software/geant4 \
7778
&& mv G4* data
7879

7980
RUN cd software/geant4 \
80-
&& wget https://cern.ch/geant4-data/datasets/G4EMLOW.8.6.1.tar.gz \
81-
&& tar xzvf G4EMLOW.8.6.1.tar.gz \
81+
&& wget https://cern.ch/geant4-data/datasets/G4EMLOW.8.8.tar.gz \
82+
&& tar xzvf G4EMLOW.8.8.tar.gz \
8283
&& rm -f G4*.tar.gz \
8384
&& mv G4* data
8485

8586
RUN cd software/geant4 \
86-
&& wget https://cern.ch/geant4-data/datasets/G4PhotonEvaporation.6.1.tar.gz \
87+
&& wget https://cern.ch/geant4-data/datasets/G4PhotonEvaporation.6.1.2.tar.gz \
8788
&& wget https://cern.ch/geant4-data/datasets/G4RadioactiveDecay.6.1.2.tar.gz \
8889
&& wget https://cern.ch/geant4-data/datasets/G4RealSurface.2.2.tar.gz \
89-
&& tar xzvf G4PhotonEvaporation.6.1.tar.gz \
90+
&& tar xzvf G4PhotonEvaporation.6.1.2.tar.gz \
9091
&& tar xzvf G4RadioactiveDecay.6.1.2.tar.gz \
9192
&& tar xzvf G4RealSurface.2.2.tar.gz \
9293
&& rm -f G4*.tar.gz \
9394
&& mv PhotonEvaporation* RadioactiveDecay* RealSurface* data
9495

9596
RUN cd software/geant4 \
96-
&& wget https://cern.ch/geant4-data/datasets/G4PARTICLEXS.4.1.tar.gz \
97+
&& wget https://cern.ch/geant4-data/datasets/G4PARTICLEXS.4.2.tar.gz \
9798
&& wget https://cern.ch/geant4-data/datasets/G4PII.1.3.tar.gz \
9899
&& wget https://cern.ch/geant4-data/datasets/G4SAIDDATA.2.0.tar.gz \
99-
&& tar xzvf G4PARTICLEXS.4.1.tar.gz \
100+
&& tar xzvf G4PARTICLEXS.4.2.tar.gz \
100101
&& tar xzvf G4PII.1.3.tar.gz \
101102
&& tar xzvf G4SAIDDATA.2.0.tar.gz \
102103
&& rm -f G4*.tar.gz \
@@ -106,11 +107,11 @@ RUN cd software/geant4 \
106107
&& wget https://cern.ch/geant4-data/datasets/G4ABLA.3.3.tar.gz \
107108
&& wget https://cern.ch/geant4-data/datasets/G4INCL.1.2.tar.gz \
108109
&& wget https://cern.ch/geant4-data/datasets/G4ENSDFSTATE.3.0.tar.gz \
109-
&& wget https://cern.ch/geant4-data/datasets/G4CHANNELING.1.0.tar.gz \
110+
&& wget https://cern.ch/geant4-data/datasets/G4CHANNELING.2.0.tar.gz \
110111
&& tar xzvf G4ABLA.3.3.tar.gz \
111112
&& tar xzvf G4INCL.1.2.tar.gz \
112113
&& tar xzvf G4ENSDFSTATE.3.0.tar.gz \
113-
&& tar xzvf G4CHANNELING.1.0.tar.gz \
114+
&& tar xzvf G4CHANNELING.2.0.tar.gz \
114115
&& rm -f G4*.tar.gz \
115116
&& mv G4* data
116117

.github/workflows/runTest.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,12 @@ if [ "$TEST" = "t15_optical" ] || [ "$TEST" = "t29_optical_digi" ]; then
88
fi
99

1010
#update python
11-
yum install -y python39-pip.noarch
12-
rm /usr/bin/python3 /usr/bin/pip3
13-
ln -s /bin/python3.9 /usr/bin/python
14-
ln -s /bin/python3.9 /usr/bin/python3
1511
python3 -m pip install --upgrade pip
16-
ln -s /bin/pip3.9 /usr/bin/pip3
1712
which python3
1813
python3 --version
1914

2015
#source /etc/mybashrc
21-
export PATH=/software/cmake-3.18.4-Linux-x86_64/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
16+
export PATH=/software/cmake-3.31.11-Linux-x86_64/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
2217
source /software/geant4/install/bin/geant4.sh
2318
source /software/root-cern/install/bin/thisroot.sh
2419

@@ -27,7 +22,7 @@ mkdir /software/gatetools
2722
cd /software
2823
git clone https://github.com/OpenGATE/GateTools.git gatetools
2924
cd gatetools
30-
pip3 install itk==5.3.0
25+
pip3 install itk==5.4.5
3126
pip3 install -e .
3227
pip3 install uproot uproot3 xxhash lz4 pandas
3328

@@ -54,7 +49,7 @@ if [ "$compile_torch" = true ] ; then
5449
fi
5550
if [ "$TEST" = "t9_gaga_phsp" ] || [ "$TEST" = "t14_phsp_pairs" ]; then
5651
#install gaga
57-
pip3 install torch==1.10.0+cpu torchvision==0.11.1+cpu torchaudio==0.10.0+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
52+
pip3 install torch==2.2.0+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
5853
cd /software
5954
mkdir gaga-phsp
6055
git clone https://github.com/dsarrut/gaga-phsp.git gaga-phsp

0 commit comments

Comments
 (0)