Update numpy version for python over 3.10

docker/sofabuilder_fedora/Dockerfile

@@ -58,7 +58,6 @@ RUN yum install -y -q \
     xorg-x11-server-devel\
     gtk3-devel
 
-ENV VM_BUILDS_IMGUI="false"
 
 # Install pip, numpy, scipy, pybind11
 ARG PYBIND11_VERSION=2.11.1
@@ -71,10 +70,10 @@ ARG PYBIND11_VERSION=2.11.1
 RUN python3.10 -m pip install numpy==1.26.4 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 numpy==1.26.4 scipy matplotlib pybind11==$PYBIND11_VERSION
+    && python3.11 -m pip install numpy==2.2.2 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 numpy==1.26.4 scipy matplotlib pybind11==$PYBIND11_VERSION
+    && python3.12 -m pip install numpy==2.2.2 scipy matplotlib pybind11==$PYBIND11_VERSION
 ENV PYTHONPATH=""
 ENV VM_HAS_ASSIMP="true"
 ENV VM_HAS_OPENCASCADE="false"

docker/sofabuilder_ubuntu/Dockerfile

@@ -67,7 +67,7 @@ RUN apt-get install -y \
 
 ENV VM_BUILDS_IMGUI="true"
 # Install pip, numpy, scipy, pybind11
-ARG PYBIND11_VERSION=2.11.1
+ARG PYBIND11_VERSION=2.12.0
 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" \
@@ -79,11 +79,11 @@ RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
 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==1.26.4 scipy matplotlib pybind11==$PYBIND11_VERSION mypy pybind11-stubgen
+    && python3.11 -m pip install numpy==2.2.2 scipy matplotlib pybind11==$PYBIND11_VERSION mypy pybind11-stubgen
 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==1.26.4 scipy matplotlib pybind11==$PYBIND11_VERSION mypy pybind11-stubgen
+    && python3.12 -m pip install numpy==2.2.2 scipy matplotlib pybind11==$PYBIND11_VERSION mypy pybind11-stubgen
 ENV VM_HAS_ASSIMP="true"
 ENV VM_HAS_OPENCASCADE="true"
 

scripts/configure.sh

@@ -341,10 +341,6 @@ elif in-array "build-scope-standard" "$BUILD_OPTIONS"; then
     PRESETS="standard-dev"
     echo "Configuring with the default plugins/modules (scope = standard-dev)"
 
-    if [[ "$VM_BUILDS_IMGUI" == "false" ]]; then
-        add-cmake-option "-DPLUGIN_SOFAIMGUI=OFF"
-    fi
-
 
 # Build with as much plugins/modules as possible (scope = full)
 elif in-array "build-scope-full" "$BUILD_OPTIONS"; then
@@ -354,6 +350,8 @@ elif in-array "build-scope-full" "$BUILD_OPTIONS"; then
 
     if [[ "$VM_HAS_CGAL" == "false" ]]; then
         add-cmake-option "-DPLUGIN_CGALPLUGIN=OFF -DSOFA_FETCH_CGALPLUGIN=OFF"
+    elif  vm-is-ubuntu || vm-is-centos; then
+        add-cmake-option "-DSOFA_CGALPLUGIN_LIMIT_NINJA_JOB_POOL=ON"
     fi
 
     if [[ "$VM_HAS_ASSIMP" == "false" ]]; then
@@ -367,20 +365,18 @@ elif in-array "build-scope-full" "$BUILD_OPTIONS"; then
     if [[ "$VM_HAS_CUDA" == "true" ]]; then
         add-cmake-option "-DSOFACUDA_DOUBLE=ON"
         if in-array "build-release-package" "$BUILD_OPTIONS"; then
-            add-cmake-option "-DCUDA_ARCH_LIST=6.0;6.1;7.0;7.5;8.0;8.6;8.9"
+            add-cmake-option "-DCMAKE_CUDA_ARCHITECTURES=60;61;70;75;80;86;89"
         else
-            add-cmake-option "-DCUDA_ARCH_LIST=6.0;8.9"
+            add-cmake-option "-DCMAKE_CUDA_ARCHITECTURES=60;89"
         fi
         add-cmake-option "-DPLUGIN_VOLUMETRICRENDERING_CUDA=ON"
         add-cmake-option "-DPLUGIN_SOFADISTANCEGRID_CUDA=ON"
     else
-        add-cmake-option "-DPLUGIN_SOFACUDA=OFF"
+	add-cmake-option "-DPLUGIN_SOFACUDA=OFF"
+    	#Deactivate all CUDA modules based on naming convention 'XXX.CUDA" that creates a CMake flag "PLUGIN_XXX_CUDA" thus the double grep 
+ 	add-cmake-option "$(cat $SRC_DIR/CMakePresets.json | grep PLUGIN_ | grep _CUDA | awk -F'"' '{ print "-D"$2"=OFF" }' | sort | uniq)"
     fi
 
-    if [[ "$VM_BUILDS_IMGUI" == "false" ]]; then
-		    add-cmake-option "-DPLUGIN_SOFAIMGUI=OFF"
-		fi
-
 fi
 
 add-cmake-option "--preset=$PRESETS"

scripts/pre-builds.sh

@@ -54,6 +54,7 @@ if [[ "$DASH_COMMIT_BRANCH" == *"/PR-"* ]]; then
     export GITHUB_CONTEXT="[ci-depends-on]" # edit
     pr_has_dependencies="false"
     pr_is_mergeable="true"
+    pr_is_broken="false"
     github_comment_header='**[ci-depends-on]** detected during [build #'$BUILD_NUMBER']('$BUILD_URL').'
     github_comment_body='\n\n To unlock the merge button, you must'
 
@@ -86,12 +87,23 @@ if [[ "$DASH_COMMIT_BRANCH" == *"/PR-"* ]]; then
         flag_repository="-D${fixed_name}_GIT_REPOSITORY='$dependency_project_url'"
         flag_tag="-D${fixed_name}_GIT_TAG='$dependency_merge_commit'"
 
-        if [[ "$dependency_is_merged" != [Tt]"rue" ]]; then # this dependency is a merged PR
+        if [[ "$dependency_merge_commit" == "null" ]]; then 
+            github_comment_body=$github_comment_body'\n- **Please fix merging issues of '$dependency_url'. This build is aborted until these issues are fixed.**'
+            pr_is_broken="true"
+        elif [[ "$dependency_is_merged" != [Tt]"rue" ]]; then # this dependency is a merged PR
             github_comment_body=$github_comment_body'\n- **Merge or close '$dependency_url'**\n_For this build, the following CMake flags will be set_\n'${flag_repository}'\n'${flag_tag}
             pr_is_mergeable="false"
         fi
     done < <( echo "$pr_description" | grep '\[ci-depends-on' )
 
+    if [[ "$pr_is_broken" == "true" ]]; then
+            github-notify "success" "Dependencies are OK."
+            github-post-pr-comment "$pr_id" "$github_comment_header $github_comment_body"
+            echo "WARNING: Pr dependencies cannot be automatically merged, this builld is skipped."
+            echo "true" > "$output_dir/skip-this-build" # will be searched by Groovy script on launcher
+            exit 0
+    fi
+
     if [[ "$pr_has_dependencies" == "true" ]]; then
         if [[ "$pr_is_mergeable" == "true" ]]; then
             # PR has dependencies that are all closed/merged and ExternalProject pointers are up-to-date

setup/setup-windows_2.bat

@@ -45,11 +45,11 @@ pathed /MACHINE /REMOVE C:\Python311\
 pathed /MACHINE /REMOVE C:\Python312\Scripts\
 pathed /MACHINE /REMOVE C:\Python312\
 C:\Python310\python.exe -m pip install --upgrade pip
-C:\Python310\python.exe -m pip install numpy scipy pybind11==2.9.1 matplotlib mypy pybind11-stubgen
+C:\Python310\python.exe -m pip install numpy scipy pybind11==2.12.0 matplotlib mypy pybind11-stubgen
 C:\Python311\python.exe -m pip install --upgrade pip
-C:\Python311\python.exe -m pip install numpy scipy pybind11==2.9.1 matplotlib mypy pybind11-stubgen
+C:\Python311\python.exe -m pip install numpy scipy pybind11==2.12.0 matplotlib mypy pybind11-stubgen
 C:\Python312\python.exe -m pip install --upgrade pip
-C:\Python312\python.exe -m pip install numpy scipy pybind11==2.9.1 matplotlib mypy pybind11-stubgen
+C:\Python312\python.exe -m pip install numpy scipy pybind11==2.12.0 matplotlib mypy pybind11-stubgen
 
 
 REM Install plugins dependencies