Skip to content

Commit 0b67aad

Browse files
AlexlHerAlexlHer
committed
[Minimal/Full] Backport from u24
[Full] Add vtk build install script [Full] Update CUDA [Minimal] Add mold linker [Minimal] Add script to build and install Lima [Minimal] Add jq package [Minimal] Add NumPy in PIP script
1 parent 0409f41 commit 0b67aad

File tree

10 files changed

+113
-21
lines changed

10 files changed

+113
-21
lines changed

‎.github/workflows/image_creator.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ jobs:
140140
type=raw, gcc-11_full_{{date 'YYYYMMDD'}}
141141
type=raw, clang-16_full_latest
142142
type=raw, clang-16_full_{{date 'YYYYMMDD'}}
143-
type=raw, cuda-125_full_latest
144-
type=raw, cuda-125_full_{{date 'YYYYMMDD'}}
143+
type=raw, cuda-126_full_latest
144+
type=raw, cuda-126_full_{{date 'YYYYMMDD'}}
145145
146146
- name: Build and push Docker image
147147
uses: docker/build-push-action@v5

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ images with Ubuntu 22.04 and:
66
- GCC 12
77
- GCC 11
88
- CLang 16
9-
- CUDA 12.5 (full only)
9+
- CUDA 12.6 (full only)
1010

1111
Two available architectures:
1212
- AMD64

‎dockerfiles/full/Dockerfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,9 @@ ENV LD_LIBRARY_PATH="/usr/local/cuda/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
8282

8383
# Installation de AdaptiveCPP.
8484
RUN /root/build_scripts/adaptivecpp.sh
85+
86+
#---------------------------------------------------------------------------
87+
#---------------------------------------------------------------------------
88+
89+
# Installation de VTK.
90+
RUN /root/build_scripts/vtk.sh

‎dockerfiles/full/build_scripts/cuda.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
# Script permettant de compiler et d'installer Cuda 12.5 (avec
3+
# Script permettant de compiler et d'installer Cuda 12.6 (avec
44
# un minimum de packages).
55

66
#---------------------------------------------------------------------------
@@ -18,23 +18,23 @@ else
1818
exit 1;
1919
fi
2020

21-
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/${ARCH_A}/cuda-keyring_1.1-1_all.deb
21+
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/${ARCH_A}/cuda-keyring_1.1-1_all.deb
2222
dpkg -i cuda-keyring_1.1-1_all.deb
2323

24-
# À noter que CUDA 12.5 est compatible uniquement avec g++-13 max et clang-17 max.
24+
# À noter que CUDA 12.6 est compatible uniquement avec g++-13 max et clang-18 max.
2525
# Le driver n'est pas inclus. Le driver de l'host sera utilisé.
26-
# Le package libcurand-dev-12-5 est nécessaire pour AdaptiveCpp.
26+
# Le package libcurand-dev-12-6 est nécessaire pour AdaptiveCpp.
2727
apt-get update
2828
apt-get -y install \
29-
cuda-compiler-12-5 \
30-
cuda-cudart-dev-12-5 \
31-
cuda-cupti-dev-12-5 \
32-
cuda-nvtx-12-5 \
33-
cuda-command-line-tools-12-5 \
34-
cuda-gdb-12-5 \
35-
cuda-nvdisasm-12-5 \
36-
cuda-toolkit-12-5-config-common \
37-
libcurand-dev-12-5
29+
cuda-compiler-12-6 \
30+
cuda-cudart-dev-12-6 \
31+
cuda-cupti-dev-12-6 \
32+
cuda-nvtx-12-6 \
33+
cuda-command-line-tools-12-6 \
34+
cuda-gdb-12-6 \
35+
cuda-nvdisasm-12-6 \
36+
cuda-toolkit-12-6-config-common \
37+
libcurand-dev-12-6
3838

3939
#---------------------------------------------------------------------------
4040
#---------------------------------------------------------------------------

‎dockerfiles/full/build_scripts/vtk.sh‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/sh
2+
3+
# Script permettant de compiler et d'installer VTK.
4+
5+
#---------------------------------------------------------------------------
6+
#---------------------------------------------------------------------------
7+
8+
# Initialisation
9+
cd /tmp
10+
git clone -b v9.4.0 --recursive https://gitlab.kitware.com/vtk/vtk.git vtk
11+
mkdir build
12+
13+
apt-get update -y
14+
apt-get install -y mesa-common-dev mesa-utils
15+
16+
# Configure
17+
cmake \
18+
-S /tmp/vtk \
19+
-B /tmp/build \
20+
-GNinja \
21+
-DBUILD_SHARED_LIBS=ON \
22+
-DCMAKE_BUILD_TYPE=Release \
23+
-DVTK_USE_MPI=ON \
24+
-DVTK_MODULE_ENABLE_VTK::IOXML=YES \
25+
-DVTK_MODULE_ENABLE_VTK::IOXdmf2=YES \
26+
-DVTK_MODULE_ENABLE_VTK::IOLegacy=YES
27+
28+
# Build and Installation
29+
cmake --build /tmp/build --target install
30+
31+
#---------------------------------------------------------------------------
32+
#---------------------------------------------------------------------------
33+
34+
# Cleanup
35+
cd /
36+
rm -rf /var/lib/apt/lists/*
37+
rm -rf /tmp/*

dockerfiles/full/scripts/use_cuda-125.sh renamed to dockerfiles/full/scripts/use_cuda-126.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
ARCH=`uname -m`
1212

1313
echo "---------------------------------------------------------------------------"
14-
echo "Configure CUDA-12.5"
14+
echo "Configure CUDA-12.6"
1515
echo "---------------------------------------------------------------------------"
1616

1717
if [ -e /usr/lib/libcuda.so.1 ]; then

‎dockerfiles/full/scripts/use_cuda.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
#---------------------------------------------------------------------------
66
#---------------------------------------------------------------------------
77

8-
. /root/scripts/use_cuda-125.sh
8+
. /root/scripts/use_cuda-126.sh

‎dockerfiles/minimal/Dockerfile‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ RUN apt-get update -y \
2323
make \
2424
ccache \
2525
ninja-build \
26+
mold \
2627
iputils-ping \
27-
python3 \
28+
python3-dev \
2829
python3-pip \
2930
git \
3031
gfortran \
@@ -37,10 +38,11 @@ RUN apt-get update -y \
3738
libhdf5-openmpi-dev \
3839
libopenmpi-dev \
3940
libmetis-dev \
40-
libtbb2-dev \
41+
libtbb-dev \
4142
libunwind-dev \
4243
ca-certificates \
4344
dotnet6 \
45+
jq \
4446
\
4547
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 90 \
4648
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 90 \
@@ -96,5 +98,11 @@ RUN /root/build_scripts/pip.sh
9698
#---------------------------------------------------------------------------
9799
#---------------------------------------------------------------------------
98100

101+
# Installation de Lima.
102+
RUN /root/build_scripts/lima.sh
103+
104+
#---------------------------------------------------------------------------
105+
#---------------------------------------------------------------------------
106+
99107
# Définition des programmes par défaut.
100108
RUN /root/scripts/default_alternatives.sh

‎dockerfiles/minimal/build_scripts/lima.sh‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#!/bin/sh
2+
3+
# Script permettant de compiler et d'installer Lima.
4+
5+
#---------------------------------------------------------------------------
6+
#---------------------------------------------------------------------------
7+
8+
# Initialisation
9+
cd /tmp
10+
11+
git clone -b 7.11.2 https://github.com/LIHPC-Computational-Geometry/lima lima
12+
mkdir build
13+
cmake \
14+
-S /tmp/lima \
15+
-B /tmp/build \
16+
-GNinja \
17+
-DCMAKE_Fortran_FLAGS="-fdefault-integer-8 -fdefault-real-8 -fdefault-double-8" \
18+
-DCMAKE_BUILD_TYPE=Release \
19+
-DCMAKE_VERBOSE_MAKEFILE=ON \
20+
-DBUILD_SHARED_LIBS=ON \
21+
-DBUILD_XLMLIMA=ON \
22+
-DBUILD_SCRIPTING=OFF \
23+
-DMACHINE_TYPES=OFF \
24+
-DSUMESH=ON \
25+
-DFORMAT_MLI2=ON \
26+
-DINT_8=ON \
27+
-DREAL_8=ON \
28+
-DFORMAT_MLI=OFF \
29+
-DSUMESH=OFF
30+
31+
cd /tmp/build
32+
ninja install
33+
34+
#---------------------------------------------------------------------------
35+
#---------------------------------------------------------------------------
36+
37+
# Cleanup
38+
cd /
39+
rm -rf /tmp/*

‎dockerfiles/minimal/build_scripts/pip.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
#---------------------------------------------------------------------------
77

88
# Installation de PythonNet.
9-
pip install pythonnet
9+
pip install \
10+
pythonnet \
11+
numpy
1012

1113
# Cleanup
1214
rm -rf ${HOME}/.cache

0 commit comments

Comments
 (0)