Merge pull request #12055 from KratosMultiphysics/Release-9.4.6

Bump version to 9.4.6

CMakeLists.txt

@@ -28,7 +28,7 @@ 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 3)
+set (KratosMultiphysics_PATCH_VERSION 6)
 
 # If KRATOS_SOURCE_DIR is not defined use the CMAKE_SOURCE_DIR
 if(NOT DEFINED KRATOS_SOURCE_DIR)

applications/MedApplication/CMakeLists.txt

@@ -79,6 +79,33 @@ endif(${INSTALL_TESTING_FILES} MATCHES ON)
 install(TARGETS KratosMedCore DESTINATION libs )
 install(TARGETS KratosMedApplication DESTINATION libs )
 
+file(TO_CMAKE_PATH "${HDF5_ROOT}/bin" HDF5_ROOT_DEP)
+file(TO_CMAKE_PATH "${MED_ROOT}/lib" MED_ROOT_DEP)
+
+# Track down DLL and install them along with Kratos libs.
+# This is disabled until I can make it work in linux. Please do not delete it.
+# install(CODE "set(HDF5_ROOT_DEP \"${HDF5_ROOT_DEP}\")")
+# install(CODE "set(MED_ROOT_DEP \"${MED_ROOT_DEP}\")")
+# install(CODE [[
+#   file(GET_RUNTIME_DEPENDENCIES
+#     RESOLVED_DEPENDENCIES_VAR RES
+#     UNRESOLVED_DEPENDENCIES_VAR UNRES
+#     CONFLICTING_DEPENDENCIES_PREFIX CONFLICTING_DEPENDENCIES
+#     DIRECTORIES ${HDF5_ROOT_DEP} ${MED_ROOT_DEP}
+#     LIBRARIES $<TARGET_FILE:KratosMedCore>
+#     PRE_EXCLUDE_REGEXES "api-ms-" "ext-ms-"
+#     POST_EXCLUDE_REGEXES ".*system32/.*\\.dll"
+#   )
+
+#   foreach(_file ${RES})
+#     file(INSTALL
+#       DESTINATION "${CMAKE_INSTALL_PREFIX}/libs"
+#       TYPE SHARED_LIBRARY
+#       FILES "${_file}"
+#     )
+#   endforeach()
+# ]])
+
 # Define custom targets
 set(KRATOS_KERNEL "${KRATOS_KERNEL};KratosMedCore" PARENT_SCOPE)
 set(KRATOS_PYTHON_INTERFACE "${KRATOS_PYTHON_INTERFACE};KratosMedApplication" PARENT_SCOPE)

scripts/docker_files/docker_file_wheelbuilder_windows/Dockerfile

@@ -21,6 +21,7 @@ RUN C:\TEMP\vs_buildtools.exe --quiet --wait --norestart --nocache \
  	$ErrorActionPreference = 'Stop'
 
 #install chocolatey
+ENV chocolateyVersion '1.4.0'
 RUN powershell.exe -Command \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
     iex ((New-Object System.Net.WebClient).DownloadString('http://chocolatey.org/install.ps1'))
@@ -82,7 +83,7 @@ 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
 
-# Download and extract boost
+# Download and extract hdf5
 RUN powershell.exe -Command \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
     wget https://hdf-wordpress-1.s3.amazonaws.com/wp-content/uploads/manual/HDF5/HDF5_1_12_2/source/hdf5-1.12.2.zip -OutFile c:\TEMP\hdf5.zip; \
@@ -92,12 +93,25 @@ RUN powershell.exe -Command \
     mkdir c:\hdf5\source; \
     7z x c:\TEMP\hdf5.zip -o"c:\hdf5\source"
 
+# Download and extract med
+RUN powershell.exe -Command \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+    wget 'https://www.salome-platform.org/?sdm_process_download=1"&"download_id=2540' -OutFile c:\TEMP\med.tar.bz; \
+    mkdir c:\med\build; \
+    mkdir c:\med\bin; \
+    mkdir c:\med\source; \
+    7z x c:\TEMP\med.tar.bz -o"c:\TEMP\med.tar"; \
+    7z x c:\TEMP\med.tar -o"c:\med\source"; \
+    dir "c:\med\source"
+
 # Build Hdf5 lib
 RUN powershell.exe -Command \
     cd 'c:/Program Files/CMake/bin/'; \
     ./cmake.exe -H"c:\hdf5\source\hdf5-1.12.2" -B"c:\hdf5\build" -DCMAKE_INSTALL_PREFIX="c:\hdf5\bin" -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON; \
     ./cmake.exe --build "c:\hdf5\build" --target install -- /property:configuration=Release
 
+# Build med lib
+Run dir c:\med\source
 RUN powershell.exe -Command \
     cd 'c:/Program Files/CMake/bin/'; \
     ./cmake.exe -H"c:\med\source\med-5.0.0" -B"c:\med\build" -DCMAKE_INSTALL_PREFIX="c:\med\bin" -DMEDFILE_BUILD_TESTS=OFF -DMEDFILE_BUILD_SHARED_LIBS=ON -DHDF5_ROOT="c:\hdf5\bin"; \

scripts/wheels/build_release_linux.ps1

@@ -1,4 +1,4 @@
-$RELEASE_BRANCH="Release-9.4.3"
+$RELEASE_BRANCH="Release-9.4.6"
 
 $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.3"
+$RELEASE_BRANCH="Release-9.4.6"
 
 $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.3"
+export KRATOS_VERSION="9.4.6"
 
 BASE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 export KRATOS_ROOT="/workspace/kratos/Kratos"

scripts/wheels/windows/build.ps1

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