Skip to content

Commit

Permalink
push more images to cpp20
Browse files Browse the repository at this point in the history
  • Loading branch information
paulgessinger committed Jul 8, 2024
1 parent 0d41982 commit 4166734
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 8 deletions.
2 changes: 2 additions & 0 deletions ubuntu2204/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ ENV DEBIAN_FRONTEND noninteractive
#
# see also https://root.cern.ch/build-prerequisites
RUN apt-get update -y \
&& apt-get upgrade -y \
&& apt-get install -y \
build-essential \
cmake \
Expand Down Expand Up @@ -46,6 +47,7 @@ RUN apt-get update -y \
rsync \
zlib1g-dev \
ccache \
libsqlite3-dev \
&& apt-get clean -y

# manual builds for hep-specific packages
Expand Down
15 changes: 11 additions & 4 deletions ubuntu2204_clang/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ ENV DEBIAN_FRONTEND noninteractive
#
# see also https://root.cern.ch/build-prerequisites
RUN apt-get update -y \
&& apt-get upgrade -y \
&& apt-get install -y \
build-essential \
clang \
Expand Down Expand Up @@ -47,6 +48,7 @@ RUN apt-get update -y \
rsync \
zlib1g-dev \
ccache \
libsqlite3-dev \
&& apt-get remove -y gcc g++ \
&& apt-get clean -y

Expand All @@ -66,7 +68,7 @@ RUN mkdir src \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_CXX_STANDARD=20 \
-DGEANT4_BUILD_TLS_MODEL=global-dynamic \
-DGEANT4_INSTALL_DATA=OFF \
-DGEANT4_USE_GDML=ON \
Expand All @@ -82,6 +84,7 @@ RUN mkdir src \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-DCMAKE_CXX_STANDARD=20 \
-DHEPMC3_BUILD_STATIC_LIBS=OFF \
-DHEPMC3_ENABLE_PYTHON=OFF \
-DHEPMC3_ENABLE_ROOTIO=OFF \
Expand All @@ -95,7 +98,7 @@ RUN mkdir src \
&& ${GET} https://pythia.org/download/pythia83/pythia8309.tgz\
| ${UNPACK_TO_SRC} \
&& cd src \
&& ./configure --enable-shared --prefix=${PREFIX} \
&& ./configure --enable-shared --prefix=${PREFIX} --cxx-common="-O2 -std=c++20 -pedantic -W -Wall -Wshadow -fPIC -pthread"\
&& make -j$(nproc) install \
&& cd .. \
&& rm -rf src
Expand All @@ -106,6 +109,8 @@ RUN mkdir src \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src -GNinja \
-DJSON_BuildTests=OFF \
-DCMAKE_CXX_STANDARD=20 \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
&& cmake --build build -- install \
&& rm -rf build src

Expand All @@ -115,7 +120,7 @@ RUN mkdir src \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_CXX_STANDARD=20 \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-Dfail-on-missing=ON \
-Dgminimal=ON \
Expand All @@ -136,6 +141,7 @@ RUN mkdir src \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-DCMAKE_CXX_STANDARD=20 \
-DBUILD_TESTING=OFF \
-USE_EXTERNAL_CATCH2=OFF \
&& cmake --build build -- install \
Expand All @@ -149,6 +155,7 @@ RUN pip3 install jinja2 pyyaml \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-DCMAKE_CXX_STANDARD=20 \
-DBUILD_TESTING=OFF \
-DUSE_EXTERNAL_CATCH2=OFF \
&& cmake --build build -- install \
Expand All @@ -161,7 +168,7 @@ RUN mkdir src \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_CXX_STANDARD=20 \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-DCMAKE_PREFIX_PATH=${PREFIX} \
-DBUILD_TESTING=OFF \
Expand Down
12 changes: 8 additions & 4 deletions ubuntu2004_exatrkx/Dockerfile → ubuntu2204_exatrkx/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04

FROM nvidia/cuda:12.4.1-cudnn-devel-ubuntu22.04
LABEL description="Ubuntu 20.04 with Acts dependencies for the Exa.TrkX Plugin"
LABEL maintainer="Paul Gessinger <[email protected]"
# increase whenever any of the RUN commands change
Expand All @@ -12,6 +12,7 @@ ENV DEBIAN_FRONTEND noninteractive
#
# see also https://root.cern.ch/build-prerequisites
RUN apt-get update -y \
&& apt-get upgrade -y \
&& apt-get install -y \
build-essential \
curl \
Expand Down Expand Up @@ -45,6 +46,7 @@ RUN apt-get update -y \
unzip \
zlib1g-dev \
ccache \
libsqlite3-dev \
&& apt-get clean -y

# manual builds for hep-specific packages
Expand All @@ -68,6 +70,7 @@ RUN mkdir -p src \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src/cmake_unofficial -GNinja\
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_CXX_STANDARD=20 \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
&& cmake --build build -- install \
&& rm -rf build src
Expand All @@ -78,6 +81,7 @@ RUN mkdir src \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_CXX_STANDARD=20 \
-DJSON_BuildTests=OFF \
&& cmake --build build -- install \
&& rm -rf build src
Expand All @@ -98,7 +102,7 @@ RUN mkdir src \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_CXX_STANDARD=20 \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-DWITH_CUDA=ON \
-DCMAKE_CUDA_FLAGS=-D__CUDA_NO_HALF_CONVERSIONS__ \
Expand All @@ -112,7 +116,7 @@ RUN mkdir src \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_CXX_STANDARD=20 \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-Dfail-on-missing=ON \
-Dgminimal=ON \
Expand All @@ -128,7 +132,7 @@ RUN mkdir src \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src/cpp -GNinja \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_CXX_STANDARD=20 \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCH} \
-DBUILD_TESTS=OFF \
Expand Down
1 change: 1 addition & 0 deletions ubuntu2404/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ ENV DEBIAN_FRONTEND noninteractive
#
# see also https://root.cern.ch/build-prerequisites
RUN apt-get update -y \
&& apt-get upgrade -y \
&& apt-get install -y \
build-essential \
curl \
Expand Down

0 comments on commit 4166734

Please sign in to comment.