Skip to content

Update to c++17 and root #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tbaudier merged 1 commit into from
Jan 20, 2022
Merged

Update to c++17 and root #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/Dockerfile_gatebenchmarks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 .. \
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

6 changes: 3 additions & 3 deletions .github/workflows/runTest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down