diff --git a/dockerfiles/full/scripts/configure_cuda_driver.sh b/dockerfiles/full/scripts/configure_cuda_driver.sh index abf29c8..5931a39 100755 --- a/dockerfiles/full/scripts/configure_cuda_driver.sh +++ b/dockerfiles/full/scripts/configure_cuda_driver.sh @@ -14,8 +14,24 @@ ARCH=`uname -m` if [ -e /usr/lib/libcuda.so.1 ]; then echo "Nvidia driver found (1)." + if [ -L "/usr/local/cuda/lib64/libcuda.so.1" ]; then + LINK=$(readlink "/usr/local/cuda/lib64/libcuda.so.1") + if [ "$LINK" = "/usr/local/cuda/lib64/stubs/libcuda.so" ]; then + echo "Removing symlink..." + rm -rf /usr/local/cuda/lib64/libcuda.so.1 + fi + fi + elif [ -e /usr/lib/${ARCH}-linux-gnu/libcuda.so.1 ]; then echo "Nvidia driver found (2)." + if [ -L "/usr/local/cuda/lib64/libcuda.so.1" ]; then + LINK=$(readlink "/usr/local/cuda/lib64/libcuda.so.1") + if [ "$LINK" = "/usr/local/cuda/lib64/stubs/libcuda.so" ]; then + echo "Removing symlink..." + rm -rf /usr/local/cuda/lib64/libcuda.so.1 + fi + fi + else echo "Nvidia driver not found. Use stub libcuda.so lib." if [ -e /usr/local/cuda/lib64/libcuda.so.1 ]; then diff --git a/dockerfiles/minimal/build_scripts/minimal_apt.sh b/dockerfiles/minimal/build_scripts/minimal_apt.sh index c7f21b4..95957a9 100755 --- a/dockerfiles/minimal/build_scripts/minimal_apt.sh +++ b/dockerfiles/minimal/build_scripts/minimal_apt.sh @@ -28,6 +28,9 @@ apt-get install -y --no-install-recommends \ clang-22 \ clang-20 \ \ + gfortran-15 \ + gfortran \ + \ make \ cmake \ ccache \ @@ -38,7 +41,6 @@ apt-get install -y --no-install-recommends \ python3-dev \ python3-pip \ git \ - gfortran \ libc6-dev \ libglib2.0-dev \ libboost-program-options-dev \ @@ -75,8 +77,15 @@ update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-20 90 #--------------------------------------------------------------------------- #--------------------------------------------------------------------------- -# https://github.com/open-mpi/ompi/issues/13886 ARCH=`uname -m` + +# Patch pour Alien +ln -s /usr/lib/gcc/${ARCH}-linux-gnu/15/libgfortran.so /usr/lib/${ARCH}-linux-gnu/libgfortran.so + +#--------------------------------------------------------------------------- +#--------------------------------------------------------------------------- + +# https://github.com/open-mpi/ompi/issues/13886 if [ ! -f /usr/lib/${ARCH}-linux-gnu/prrte3/share/prte/help-prun.txt ]; then # fix a packaging issue: https://bugs.launchpad.net/ubuntu/+source/openmpi/+bug/2155666 mkdir -p /usr/lib/${ARCH}-linux-gnu/prrte3/share/prte