Merge branch 'new_ubuntu_builder' into builders_transition

sofa-framework · Jan 3, 2024 · 45732ee · 45732ee
2 parents 6134c92 + 238eb0a
commit 45732ee
Show file tree

Hide file tree

Showing 9 changed files with 101 additions and 76 deletions.
diff --git a/docker/sofa_nightly_ubuntu/Dockerfile b/docker/sofa_nightly_ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 SHELL ["/bin/bash", "-c"]
 

diff --git a/docker/sofabuilder_fedora/Dockerfile b/docker/sofabuilder_fedora/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:34
+FROM fedora:36
 
 SHELL ["/bin/bash", "-c"]
 
@@ -14,7 +14,7 @@ ENV HOME="/home/ci"
 # RUN yum install -y -q centos-release-scl-rh
 # RUN yum install -y -q http://repo.okay.com.mx/centos/7/x86_64/release/okay-release-1-5.el7.noarch.rpm
 # RUN yum install -y -q https://packages.endpoint.com/rhel/7/os/x86_64/endpoint-repo-1.9-1.x86_64.rpm
-RUN yum install -y -q http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-34.noarch.rpm
+RUN yum install -y -q http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-36.noarch.rpm
 RUN yum update -y && yum upgrade -y && yum clean all
 
 # Install system tools
@@ -43,54 +43,53 @@ RUN yum install -y -q \
 # Install plugin deps
 RUN yum install -y -q \
     python2.7 \
-    python3.7 \
-    python3.8 \
-    python3.9 \
     python3.10 \
+    python3.11 \
+    python3.12 \
     libpng-devel libjpeg-turbo-devel libtiff-devel \
     blas-devel \
     lapack-devel \
     suitesparse-devel \
     ffmpeg-devel \
     assimp-devel \
     opencascade-devel \
-    libXrandr-devel
+    libXrandr-devel \
+    tinyxml2-devel
 
 # Install pip, numpy, scipy, pybind11
-ARG PYBIND11_VERSION=2.6.2
-RUN curl -L https://bootstrap.pypa.io/pip/2.7/get-pip.py --output /tmp/get-pip2.py \
-    && python2.7 /tmp/get-pip2.py \
-    && python2.7 -m pip install --upgrade "pip == 20.3.4" \
-    && python2.7 -m pip install "numpy == 1.16.6" "scipy == 1.2.3" "matplotlib == 2.2.5"
+ARG PYBIND11_VERSION=2.9.1
+#RUN curl -L https://bootstrap.pypa.io/pip/2.7/get-pip.py --output /tmp/get-pip2.py \
+#    && python2.7 /tmp/get-pip2.py \
+#    && python2.7 -m pip install --upgrade "pip == 20.3.4" \
+#    && python2.7 -m pip install "numpy == 1.16.6" "scipy == 1.2.3" "matplotlib == 2.2.5"
+#RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py
+#RUN python3.10 /tmp/get-pip3.py
+RUN python3.10 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
 RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
-    && python3.7 /tmp/get-pip3.py \
-    && python3.7 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
+    && python3.11 /tmp/get-pip3.py \
+    && python3.11 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
 RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
-    && python3.8 /tmp/get-pip3.py \
-    && python3.8 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
-RUN python3.9 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
-RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
-    && python3.10 /tmp/get-pip3.py \
-    && python3.10 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
+    && python3.12 /tmp/get-pip3.py \
+    && python3.12 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
 ENV PYTHONPATH=""
 ENV VM_HAS_ASSIMP="true"
 ENV VM_HAS_OPENCASCADE="true"
 
 ###################################
 
 # Install CMake
-ARG CMAKE_VERSION=3.16.3
+ARG CMAKE_VERSION=3.22.1
 ADD https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-x86_64.sh /tmp/cmake.sh
 RUN chmod a+x /tmp/cmake.sh
 RUN /tmp/cmake.sh --skip-license --prefix=/usr/local
 
 # Install Qt
-ARG QT_VERSION=5.12.8
+ARG QT_VERSION=5.12.12
 ARG QT_INSTALLDIR="/opt/Qt"
-RUN python3.8 -m pip install aqtinstall \
-    && python3.8 -m aqt install-qt --outputdir $QT_INSTALLDIR linux desktop $QT_VERSION gcc_64 -m qtcharts qtwebengine
+RUN python3.10 -m pip install aqtinstall \
+    && python3.10 -m aqt install-qt --outputdir $QT_INSTALLDIR linux desktop $QT_VERSION gcc_64 -m qtcharts qtwebengine
 RUN yum install -y -q libxkbcommon-x11 libwayland-cursor xcb-util-* \
-    && python3.8 -m aqt install-tool --outputdir $QT_INSTALLDIR linux desktop tools_ifw \
+    && python3.10 -m aqt install-tool --outputdir $QT_INSTALLDIR linux desktop tools_ifw \
     || true
 ENV QT_INSTALLDIR="$QT_INSTALLDIR"
 ENV QTDIR="$QT_INSTALLDIR/$QT_VERSION/gcc_64"
@@ -105,8 +104,8 @@ ENV LD_LIBRARY_PATH="${BOOST_LIBRARYDIR}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
 
 # Install CGAL
 # Due to dependencies on Boost and Qt, we have to build CGAL
-ARG CGAL_VERSION=5.0.2
-ADD https://github.com/CGAL/cgal/releases/download/releases/CGAL-$CGAL_VERSION/CGAL-$CGAL_VERSION.tar.xz /tmp/CGAL.tar.xz
+ARG CGAL_VERSION=5.4.5
+ADD https://github.com/CGAL/cgal/releases/download/v$CGAL_VERSION/CGAL-$CGAL_VERSION.tar.xz /tmp/CGAL.tar.xz
 RUN yum install -y -q gmp-devel mpfr-devel
 RUN tar -xJf /tmp/CGAL.tar.xz --directory /tmp \
     && cd /tmp/CGAL-$CGAL_VERSION \
@@ -119,6 +118,14 @@ RUN tar -xJf /tmp/CGAL.tar.xz --directory /tmp \
 ENV VM_HAS_CGAL="true"
 ENV VM_CGAL_PATH="/usr/local/lib64/cmake/CGAL"
 
+
+# Install METIS
+RUN git clone https://github.com/bakpaul/METIS.git \
+    && cd METIS \
+    && git checkout v5.1.1-ModernInstall \
+    && cd .. && mkdir build && cd build \
+    && cmake ../METIS \
+    && make --silent install -j 5
 ###################################
 
 # Disable core dumps
@@ -132,8 +139,8 @@ ENV PYTHONIOENCODING="UTF-8"
 ENV PYTHONUSERBASE="/tmp/pythonuserbase"
 RUN mkdir -p "$PYTHONUSERBASE" && chmod -R 777 "$PYTHONUSERBASE"
 ENV VM_PYTHON_EXECUTABLE="/usr/bin/python2.7"
-ENV VM_PYTHON3_EXECUTABLE="/usr/bin/python3.8"
-ENV VM_PYBIND11_CONFIG_EXECUTABLE="/usr/bin/python3.8 -m pybind11"
+ENV VM_PYTHON3_EXECUTABLE="/usr/bin/python3.10"
+ENV VM_PYBIND11_CONFIG_EXECUTABLE="/usr/bin/python3.10 -m pybind11"
 RUN git config --system user.name 'SOFA Bot' || git config --global user.name 'SOFA Bot'
 RUN git config --system user.email '<>' || git config --global user.email '<>'
 

diff --git a/docker/sofabuilder_ubuntu/Dockerfile b/docker/sofabuilder_ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 SHELL ["/bin/bash", "-c"]
 
@@ -32,26 +32,26 @@ RUN apt-get install -y \
 RUN apt-get install -y \
     build-essential \
     ninja-build=1.10.\* \
-    gcc=4:9.3.\* \
-    g++=4:9.3.\* \
-    clang=1:10.0-\* \
-    ccache=3.7.\*
+    gcc=4:11.\* \
+    g++=4:11.\* \
+    clang=1:14.0-\* \
+    ccache=4.5.\*
 
 # Install core deps
 RUN apt-get install -y \
-    libboost-all-dev=1.71.\* \
-    libglew-dev=2.1.\* \
+    libboost-all-dev=1.74.\* \
+    libglew-dev=2.2.\* \
     freeglut3-dev=2.8.\* \
     zlib1g-dev=1:1.2.\* \
-    libeigen3-dev=3.3.\*
+    libeigen3-dev=3.4.\*
 
 # Install plugins deps
+ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get install -y \
     python2.7-dev \
-    python3.7-dev python3.7-distutils \
-    python3.8-dev python3-distutils=3.8.\* \
-    python3.9-dev python3.9-distutils \
     python3.10-dev python3.10-distutils \
+    python3.11-dev python3.11-distutils \
+    python3.12-dev python3.12-distutils \
     libpng-dev libjpeg-dev libtiff-dev \
     libblas-dev \
     liblapack-dev \
@@ -60,48 +60,45 @@ RUN apt-get install -y \
     libassimp-dev \
     liboce-ocaf-dev \
     libzmq3-dev liboscpack-dev \
-    libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev
+    libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev \
+    libtinyxml2-dev
 
 # Install pip, numpy, scipy, pybind11
-ARG PYBIND11_VERSION=2.6.2
+ARG PYBIND11_VERSION=2.9.1
 RUN curl -L https://bootstrap.pypa.io/pip/2.7/get-pip.py --output /tmp/get-pip2.py \
     && python2.7 /tmp/get-pip2.py \
     && python2.7 -m pip install --upgrade "pip == 20.3.4" \
     && python2.7 -m pip install "numpy == 1.16.6" "scipy == 1.2.3" "matplotlib == 2.2.5"
-RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
-    && python3.7 /tmp/get-pip3.py \
-    && python3.7 -m pip install --upgrade pip \
-    && python3.7 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
-RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
-    && python3.8 /tmp/get-pip3.py \
-    && python3.8 -m pip install --upgrade pip \
-    && python3.8 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
-RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
-    && python3.9 /tmp/get-pip3.py \
-    && python3.9 -m pip install --upgrade pip \
-    && python3.9 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
 RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
     && python3.10 /tmp/get-pip3.py \
     && python3.10 -m pip install --upgrade pip \
     && python3.10 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
+RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
+    && python3.11 /tmp/get-pip3.py \
+    && python3.11 -m pip install --upgrade pip \
+    && python3.11 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
+RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
+    && python3.12 /tmp/get-pip3.py \
+    && python3.12 -m pip install --upgrade pip \
+    && python3.12 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
 ENV VM_HAS_ASSIMP="true"
 ENV VM_HAS_OPENCASCADE="true"
 
 ###################################
 
 # Install CMake
-ARG CMAKE_VERSION=3.16.3
+ARG CMAKE_VERSION=3.22.1
 ADD https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-x86_64.sh /tmp/cmake.sh
 RUN chmod a+x /tmp/cmake.sh
 RUN /tmp/cmake.sh --skip-license --prefix=/usr/local
 
 # Install Qt
-ARG QT_VERSION=5.12.8
+ARG QT_VERSION=5.12.12
 ARG QT_INSTALLDIR="/opt/Qt"
-RUN python3.8 -m pip install aqtinstall \
-    && python3.8 -m aqt install-qt --outputdir $QT_INSTALLDIR linux desktop $QT_VERSION gcc_64 -m qtcharts qtwebengine
+RUN python3.10 -m pip install aqtinstall \
+    && python3.10 -m aqt install-qt --outputdir $QT_INSTALLDIR linux desktop $QT_VERSION gcc_64 -m qtcharts qtwebengine
 RUN apt-get install -y libxkbcommon-x11-0 libwayland-cursor0 libxcb-* \
-    && python3.8 -m aqt install-tool --outputdir $QT_INSTALLDIR linux desktop tools_ifw \
+    && python3.10 -m aqt install-tool --outputdir $QT_INSTALLDIR linux desktop tools_ifw \
     || true
 ENV QT_INSTALLDIR="$QT_INSTALLDIR"
 ENV QTDIR="$QT_INSTALLDIR/$QT_VERSION/gcc_64"
@@ -110,8 +107,8 @@ ENV PATH="$QTDIR/bin${PATH:+:${PATH}}"
 
 # Install CGAL
 # Due to dependencies on Boost and Qt, we have to build CGAL
-ARG CGAL_VERSION=5.0.2
-ADD https://github.com/CGAL/cgal/releases/download/releases/CGAL-$CGAL_VERSION/CGAL-$CGAL_VERSION.tar.xz /tmp/CGAL.tar.xz
+ARG CGAL_VERSION=5.4.5
+ADD https://github.com/CGAL/cgal/releases/download/v$CGAL_VERSION/CGAL-$CGAL_VERSION.tar.xz /tmp/CGAL.tar.xz
 RUN apt-get install -y libgmp-dev libmpfr-dev
 RUN tar -xJf /tmp/CGAL.tar.xz --directory /tmp \
     && cd /tmp/CGAL-$CGAL_VERSION \
@@ -122,13 +119,27 @@ RUN tar -xJf /tmp/CGAL.tar.xz --directory /tmp \
 ENV VM_HAS_CGAL="true"
 ENV VM_CGAL_PATH="/usr/local/lib/cmake/CGAL"
 
+
+# Install METIS
+RUN git clone https://github.com/bakpaul/METIS.git \
+    && cd METIS \
+    && git checkout v5.1.1-ModernInstall \
+    && cd .. && mkdir build && cd build \
+    && cmake ../METIS \
+    && make --silent install -j 5
+
 # Install CUDA
-RUN apt-get install -y nvidia-cuda-toolkit
+ENV DEBIAN_FRONTEND noninteractive
+RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.0-1_all.deb
+RUN dpkg -i cuda-keyring_1.0-1_all.deb
+RUN apt-get update
+RUN apt-get -y install cuda-toolkit-11-8
 ENV VM_HAS_CUDA="true"
-ENV VM_CUDA_HOST_COMPILER="/usr/bin/gcc-8"
+ENV PATH=$PATH:/usr/local/cuda/bin
+
 
 # Install NodeEditor (needed by SofaQtQuick)
-ARG NODEEDITOR_VERSION=2.1.3
+ARG NODEEDITOR_VERSION=2.2.4
 RUN git clone -b $NODEEDITOR_VERSION --depth 1 https://github.com/paceholder/nodeeditor.git /tmp/nodeeditor/src \
     && mkdir /tmp/nodeeditor/build && cd /tmp/nodeeditor/build \
     && cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF ../src \
@@ -147,8 +158,8 @@ ENV PYTHONIOENCODING="UTF-8"
 ENV PYTHONUSERBASE="/tmp/pythonuserbase"
 RUN mkdir -p "$PYTHONUSERBASE" && chmod -R 777 "$PYTHONUSERBASE"
 ENV VM_PYTHON_EXECUTABLE="/usr/bin/python2.7"
-ENV VM_PYTHON3_EXECUTABLE="/usr/bin/python3.8"
-ENV VM_PYBIND11_CONFIG_EXECUTABLE="/usr/bin/python3.8 -m pybind11"
+ENV VM_PYTHON3_EXECUTABLE="/usr/bin/python3.10"
+ENV VM_PYBIND11_CONFIG_EXECUTABLE="/usr/bin/python3.10 -m pybind11"
 RUN git config --system user.name 'SOFA Bot' || git config --global user.name 'SOFA Bot'
 RUN git config --system user.email '<>' || git config --global user.email '<>'
 

diff --git a/docker/sofabuilder_ubuntu/test b/docker/sofabuilder_ubuntu/test
@@ -0,0 +1 @@
+./ci/scripts/configure.sh /workspace/build/ /workspace/src/ ubuntu_gcc options "run-regression-tests run-scene-tests run-unit-tests force-full-build build-scope-full build-all-plugins"
diff --git a/scripts/env/sofa-ci-dev-ubuntu2204-0 b/scripts/env/sofa-ci-dev-ubuntu2204-0
@@ -18,9 +18,11 @@ export VM_MAKE_OPTIONS="-j7"
 
 export VM_MAX_PARALLEL_TESTS="7"
 
-export VM_CUDA_HOST_COMPILER="/usr/bin/gcc-8"
+export VM_HAS_CUDA="true"
+
 export VM_CUDA_ARCH="sm_50"
 
+
 if [ ! -f /.dockerenv ]; then # not in Docker
     export VM_HAS_BULLET="false"
 
@@ -34,7 +36,7 @@ if [ ! -f /.dockerenv ]; then # not in Docker
 
     export VM_CUDA_ARCH="sm_50"
 
-    export VM_CUDA_HOST_COMPILER="/usr/bin/gcc-6"
+#    export VM_CUDA_HOST_COMPILER="/usr/bin/gcc-6"
 
     # Load Qt environment
     if [ -e "/opt/qt512/bin/qt512-env.sh" ]; then

diff --git a/scripts/env/sofa-ci-dev-ubuntu2204-1 b/scripts/env/sofa-ci-dev-ubuntu2204-1
@@ -18,7 +18,8 @@ export VM_MAKE_OPTIONS="-j7"
 
 export VM_MAX_PARALLEL_TESTS="7"
 
-export VM_CUDA_HOST_COMPILER="/usr/bin/gcc-8"
+export VM_HAS_CUDA="true"
+
 export VM_CUDA_ARCH="sm_50"
 
 if [ ! -f /.dockerenv ]; then # not in Docker
@@ -34,7 +35,7 @@ if [ ! -f /.dockerenv ]; then # not in Docker
 
     export VM_CUDA_ARCH="sm_50"
 
-    export VM_CUDA_HOST_COMPILER="/usr/bin/gcc-6"
+#    export VM_CUDA_HOST_COMPILER="/usr/bin/gcc-6"
 
     # Load Qt environment
     if [ -e "/opt/qt512/bin/qt512-env.sh" ]; then

diff --git a/scripts/env/sofa-ci-dev-ubuntu2204-2 b/scripts/env/sofa-ci-dev-ubuntu2204-2
@@ -18,7 +18,8 @@ export VM_MAKE_OPTIONS="-j7"
 
 export VM_MAX_PARALLEL_TESTS="7"
 
-export VM_CUDA_HOST_COMPILER="/usr/bin/gcc-8"
+export VM_HAS_CUDA="true"
+
 export VM_CUDA_ARCH="sm_50"
 
 if [ ! -f /.dockerenv ]; then # not in Docker
@@ -34,7 +35,7 @@ if [ ! -f /.dockerenv ]; then # not in Docker
 
     export VM_CUDA_ARCH="sm_50"
 
-    export VM_CUDA_HOST_COMPILER="/usr/bin/gcc-6"
+#    export VM_CUDA_HOST_COMPILER="/usr/bin/gcc-6"
 
     # Load Qt environment
     if [ -e "/opt/qt512/bin/qt512-env.sh" ]; then

diff --git a/scripts/env/sofa-ci-dev-ubuntu2204-3 b/scripts/env/sofa-ci-dev-ubuntu2204-3
@@ -18,7 +18,8 @@ export VM_MAKE_OPTIONS="-j7"
 
 export VM_MAX_PARALLEL_TESTS="7"
 
-export VM_CUDA_HOST_COMPILER="/usr/bin/gcc-8"
+export VM_HAS_CUDA="true"
+
 export VM_CUDA_ARCH="sm_50"
 
 if [ ! -f /.dockerenv ]; then # not in Docker
@@ -34,7 +35,7 @@ if [ ! -f /.dockerenv ]; then # not in Docker
 
     export VM_CUDA_ARCH="sm_50"
 
-    export VM_CUDA_HOST_COMPILER="/usr/bin/gcc-6"
+#    export VM_CUDA_HOST_COMPILER="/usr/bin/gcc-6"
 
     # Load Qt environment
     if [ -e "/opt/qt512/bin/qt512-env.sh" ]; then

diff --git a/scripts/env/sofa-ci-dev-ubuntu2204-4 b/scripts/env/sofa-ci-dev-ubuntu2204-4
@@ -18,7 +18,8 @@ export VM_MAKE_OPTIONS="-j7"
 
 export VM_MAX_PARALLEL_TESTS="7"
 
-export VM_CUDA_HOST_COMPILER="/usr/bin/gcc-8"
+export VM_HAS_CUDA="true"
+
 export VM_CUDA_ARCH="sm_50"
 
 if [ ! -f /.dockerenv ]; then # not in Docker
@@ -34,7 +35,7 @@ if [ ! -f /.dockerenv ]; then # not in Docker
 
     export VM_CUDA_ARCH="sm_50"
 
-    export VM_CUDA_HOST_COMPILER="/usr/bin/gcc-6"
+#    export VM_CUDA_HOST_COMPILER="/usr/bin/gcc-6"
 
     # Load Qt environment
     if [ -e "/opt/qt512/bin/qt512-env.sh" ]; then
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		./ci/scripts/configure.sh /workspace/build/ /workspace/src/ ubuntu_gcc options "run-regression-tests run-scene-tests run-unit-tests force-full-build build-scope-full build-all-plugins"