Merge pull request #12314 from KratosMultiphysics/Release-9.5

Release 9.5

CMakeLists.txt

@@ -27,8 +27,8 @@ endif(POLICY CMP0057)
 
 # Set here the version number **** only update upon tagging a release!
 set (KratosMultiphysics_MAJOR_VERSION 9)
-set (KratosMultiphysics_MINOR_VERSION 4)
-set (KratosMultiphysics_PATCH_VERSION 6)
+set (KratosMultiphysics_MINOR_VERSION 5)
+set (KratosMultiphysics_PATCH_VERSION 0)
 
 # If KRATOS_SOURCE_DIR is not defined use the CMAKE_SOURCE_DIR
 if(NOT DEFINED KRATOS_SOURCE_DIR)

cmake_modules/FindTRILINOS.cmake

@@ -39,7 +39,9 @@ ELSE (TRILINOS_LIBRARY_DIR OR TRILINOS_INCLUDE_DIR OR TRILINOS_ROOT)
         GET_FILENAME_COMPONENT(TRILINOS_ROOT "${Trilinos_INCLUDE_DIRS}" DIRECTORY)
         SET(TRILINOS_LIBRARY_DIR "${TRILINOS_ROOT}/lib")
     ELSE (Trilinos_FOUND) # Not found. This will raise an error
-        MESSAGE(FATAL_ERROR ${ERROR_NOT_FOUND_MESSAGE})
+        IF(NOT DEFINED MAKE_TRILINOS_OPTIONAL)
+            MESSAGE(FATAL_ERROR ${ERROR_NOT_FOUND_MESSAGE})
+        ENDIF(NOT DEFINED MAKE_TRILINOS_OPTIONAL)
     ENDIF (Trilinos_FOUND)
 ENDIF (TRILINOS_LIBRARY_DIR OR TRILINOS_INCLUDE_DIR OR TRILINOS_ROOT)
 
@@ -251,5 +253,7 @@ IF(TRILINOS_FOUND)
     MESSAGE(STATUS "TRILINOS_INCLUDE_DIR: ${TRILINOS_INCLUDE_DIR}")
     MESSAGE(STATUS "TRILINOS_LIBRARIES: ${TRILINOS_LIBRARIES}")
 ELSE (TRILINOS_FOUND)
-    MESSAGE(FATAL_ERROR ${ERROR_NOT_FOUND_MESSAGE})
+    IF(NOT DEFINED MAKE_TRILINOS_OPTIONAL)
+        MESSAGE(FATAL_ERROR ${ERROR_NOT_FOUND_MESSAGE})
+    ENDIF(NOT DEFINED MAKE_TRILINOS_OPTIONAL)
 ENDIF(TRILINOS_FOUND)

scripts/docker_files/docker_file_wheelbuilder_windows/Dockerfile

@@ -83,6 +83,15 @@ RUN powershell.exe -Command \
     c:\python\311\python.exe -m pip install --upgrade pip; \
     c:\python\311\python.exe -m pip install --upgrade setuptools wheel
 
+#Install python 3.12
+RUN powershell.exe -Command \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+    wget https://www.python.org/ftp/python/3.12.0/python-3.12.0-amd64.exe -OutFile c:\temp\python312.exe; \
+    mkdir c:\python\312; \
+    Start-Process c:\temp\python312.exe -ArgumentList '/quiet InstallAllUsers=1 PrependPath=0 TargetDir=c:\\python\\312' -Wait; \
+    c:\python\312\python.exe -m pip install --upgrade pip; \
+    c:\python\312\python.exe -m pip install --upgrade setuptools wheel
+
 # Download and extract hdf5
 RUN powershell.exe -Command \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \

scripts/wheels/build_release_linux.ps1

@@ -1,4 +1,4 @@
-$RELEASE_BRANCH="Release-9.4.6"
+$RELEASE_BRANCH="Release-9.5"
 
 $HOST_SWAP="C:/data_swap_host"
 $GUEST_SWAP="/data_swap_guest"

scripts/wheels/build_release_windows.ps1

@@ -1,4 +1,4 @@
-$RELEASE_BRANCH="Release-9.4.6"
+$RELEASE_BRANCH="Release-9.5"
 
 $HOST_SWAP="C:/data_swap_host"
 $GUEST_SWAP="C:/data_swap_guest"

scripts/wheels/linux/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-PYTHONS=("cp38" "cp39" "cp310" "cp311")
-export KRATOS_VERSION="9.4.6"
+PYTHONS=("cp38" "cp39" "cp310" "cp311" "cp12")
+export KRATOS_VERSION="9.5"
 
 BASE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 export KRATOS_ROOT="/workspace/kratos/Kratos"

scripts/wheels/linux/build_mpi.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-PYTHONS=("cp38" "cp39" "cp310" "cp311")
-export KRATOS_VERSION="9.4.3"
+PYTHONS=("cp38" "cp39" "cp310" "cp311" "cp312")
+export KRATOS_VERSION="9.5"
 
 BASE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 export KRATOS_ROOT="/workspace/kratos/Kratos"

scripts/wheels/linux/configure.sh

@@ -68,7 +68,7 @@ cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
 -DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-8/root/usr/bin/g++             \
 -DCMAKE_CXX_FLAGS="-msse3 -std=c++11 "                                 \
 -DCMAKE_C_FLAGS="-msse3"                                               \
--DBOOST_ROOT="/workspace/boost/boost_1_71_0"                           \
+-DBOOST_ROOT="/workspace/boost/boost_1_74_0"                           \
 -DLAPACK_LIBRARIES="/usr/lib64/liblapack.so.3"                         \
 -DBLAS_LIBRARIES="/usr/lib64/libblas.so.3"                             \
 -DINCLUDE_MMG=ON                                                       \

scripts/wheels/linux/configure_mpi.sh

@@ -68,11 +68,12 @@ cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
 -DCMAKE_INSTALL_PREFIX=$2                                              \
 -DUSE_TRIANGLE_NONFREE_TPL=ON                                          \
 -DUSE_MPI=ON                                                           \
+-DMAKE_TRILINOS_OPTIONAL=ON                                            \
 -DCMAKE_C_COMPILER=gcc                                                 \
 -DCMAKE_CXX_COMPILER=g++                                               \
 -DCMAKE_CXX_FLAGS="-msse3 -std=c++11 "                                 \
 -DCMAKE_C_FLAGS="-msse3"                                               \
--DBOOST_ROOT="/workspace/boost/boost_1_71_0"                           \
+-DBOOST_ROOT="/workspace/boost/boost_1_74_0"                           \
 -DINCLUDE_MMG=ON                                                       \
 -DMMG_ROOT="/workspace/external_libraries/mmg/mmg_5_5_1"               \
 -DKRATOS_BUILD_TESTING=ON                                              \

scripts/wheels/windows/build.ps1

@@ -1,7 +1,7 @@
 param([System.String]$cotire="OFF")
 
-$pythons = "38", "39", "310", "311"
-$env:kratos_version = "9.4.6"
+$pythons = "38", "39", "310", "311", "312"
+$env:kratos_version = "9.5.0"
 
 $kratosRoot = "c:\kratos\kratos"
 $env:kratos_root = $kratosRoot