From 289ecd0f386f913d212ff0a76c3e0931008bc826 Mon Sep 17 00:00:00 2001 From: Carlos Roig Date: Tue, 22 Aug 2023 10:13:40 +0200 Subject: [PATCH 1/9] Upgrading version --- CMakeLists.txt | 4 ++-- INSTALL.md | 2 +- scripts/wheels/build_release_linux.ps1 | 2 +- scripts/wheels/build_release_windows.ps1 | 2 +- scripts/wheels/linux/build.sh | 2 +- scripts/wheels/linux/build_mpi.sh | 3 +-- scripts/wheels/windows/build.ps1 | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2aaa0efa1125..8a09f4068a9b 100644 --- a/CMakeLists.txt +++ b/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 3) -set (KratosMultiphysics_PATCH_VERSION 1) +set (KratosMultiphysics_MINOR_VERSION 4) +set (KratosMultiphysics_PATCH_VERSION 0) # If KRATOS_SOURCE_DIR is not defined use the CMAKE_SOURCE_DIR if(NOT DEFINED KRATOS_SOURCE_DIR) diff --git a/INSTALL.md b/INSTALL.md index d59c2c80ffd2..66cf1d3afcac 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -505,7 +505,7 @@ The result should be: ' / __| _` | __| _ \ __| . \ | ( | | ( |\__ \ _|\_\_| \__,_|\__|\___/ ____/ - Multi-Physics 9.2."0"-4afb88094a-Release-ARM64 + Multi-Physics 9.X.Y-4afb88094a-Release-ARM64 Compiled for GNU/Linux and Python3.8 with GCC-8.5 Compiled with threading and MPI support. Maximum number of threads: 1. diff --git a/scripts/wheels/build_release_linux.ps1 b/scripts/wheels/build_release_linux.ps1 index b6ce37c5b2fc..4f5c6d741323 100644 --- a/scripts/wheels/build_release_linux.ps1 +++ b/scripts/wheels/build_release_linux.ps1 @@ -1,4 +1,4 @@ -$RELEASE_BRANCH="Release-9.3.1" +$RELEASE_BRANCH="Release-9.4" $HOST_SWAP="C:/data_swap_host" $GUEST_SWAP="/data_swap_guest" diff --git a/scripts/wheels/build_release_windows.ps1 b/scripts/wheels/build_release_windows.ps1 index 52fc8e8a25cf..06f7f58ea3d6 100644 --- a/scripts/wheels/build_release_windows.ps1 +++ b/scripts/wheels/build_release_windows.ps1 @@ -1,4 +1,4 @@ -$RELEASE_BRANCH="Release-9.3.1" +$RELEASE_BRANCH="Release-9.4" $HOST_SWAP="C:/data_swap_host" $GUEST_SWAP="C:/data_swap_guest" diff --git a/scripts/wheels/linux/build.sh b/scripts/wheels/linux/build.sh index 1b07d21a2c20..36645cc4ad00 100644 --- a/scripts/wheels/linux/build.sh +++ b/scripts/wheels/linux/build.sh @@ -1,6 +1,6 @@ #!/bin/bash PYTHONS=("cp38" "cp39" "cp310" "cp311") -export KRATOS_VERSION="9.3.1" +export KRATOS_VERSION="9.4" BASE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH export KRATOS_ROOT="/workspace/kratos/Kratos" diff --git a/scripts/wheels/linux/build_mpi.sh b/scripts/wheels/linux/build_mpi.sh index 2d73248eed22..e0cca474b69d 100644 --- a/scripts/wheels/linux/build_mpi.sh +++ b/scripts/wheels/linux/build_mpi.sh @@ -1,7 +1,6 @@ #!/bin/bash PYTHONS=("cp38" "cp39" "cp310" "cp311") -# PYTHONS=("cp38") -export KRATOS_VERSION="9.3.1" +export KRATOS_VERSION="9.4" BASE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH export KRATOS_ROOT="/workspace/kratos/Kratos" diff --git a/scripts/wheels/windows/build.ps1 b/scripts/wheels/windows/build.ps1 index d19f6ecd044b..0cb000781e10 100644 --- a/scripts/wheels/windows/build.ps1 +++ b/scripts/wheels/windows/build.ps1 @@ -1,7 +1,7 @@ param([System.String]$cotire="OFF") $pythons = "38", "39", "310", "311" -$env:kratos_version = "9.3.1" +$env:kratos_version = "9.4" $kratosRoot = "c:\kratos\kratos" $env:kratos_root = $kratosRoot From 2682f623806f2842124fca23c482374dffeef1ec Mon Sep 17 00:00:00 2001 From: Carlos Roig Date: Tue, 22 Aug 2023 10:16:13 +0200 Subject: [PATCH 2/9] Enable testing in releases --- scripts/wheels/linux/configure.sh | 2 +- scripts/wheels/linux/configure_mpi.sh | 2 +- scripts/wheels/windows/configure.bat | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/wheels/linux/configure.sh b/scripts/wheels/linux/configure.sh index 352ec72f24f8..8f94ccd27926 100644 --- a/scripts/wheels/linux/configure.sh +++ b/scripts/wheels/linux/configure.sh @@ -74,6 +74,6 @@ cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \ -DBLAS_LIBRARIES="/usr/lib64/libblas.so.3" \ -DINCLUDE_MMG=ON \ -DMMG_ROOT="/workspace/external_libraries/mmg/mmg_5_5_1" \ --DKRATOS_BUILD_TESTING=OFF \ +-DKRATOS_BUILD_TESTING=ON \ -DINSTALL_RUNKRATOS=OFF \ -DKRATOS_GENERATE_PYTHON_STUBS=ON \ diff --git a/scripts/wheels/linux/configure_mpi.sh b/scripts/wheels/linux/configure_mpi.sh index 6a362b19ce6f..66f0a25199ca 100644 --- a/scripts/wheels/linux/configure_mpi.sh +++ b/scripts/wheels/linux/configure_mpi.sh @@ -75,6 +75,6 @@ cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \ -DBOOST_ROOT="/workspace/boost/boost_1_71_0" \ -DINCLUDE_MMG=ON \ -DMMG_ROOT="/workspace/external_libraries/mmg/mmg_5_5_1" \ --DKRATOS_BUILD_TESTING=OFF \ +-DKRATOS_BUILD_TESTING=ON \ -DINSTALL_RUNKRATOS=OFF \ -DKRATOS_GENERATE_PYTHON_STUBS=ON \ diff --git a/scripts/wheels/windows/configure.bat b/scripts/wheels/windows/configure.bat index 300ba90ddbce..8277f873622b 100644 --- a/scripts/wheels/windows/configure.bat +++ b/scripts/wheels/windows/configure.bat @@ -61,7 +61,7 @@ cmake -G"Visual Studio 16 2019" -H"%KRATOS_SOURCE%" -B"%KRATOS_BUILD%\%KRATOS_BU -DCMAKE_C_FLAGS="/MP24 /Gm- /Zm10" ^ -DCMAKE_CXX_FLAGS="/MP24 /Gm- /Zm10" ^ -DBOOST_ROOT=%BOOST_ROOT% ^ --DKRATOS_BUILD_TESTING=OFF ^ +-DKRATOS_BUILD_TESTING=ON ^ -DINSTALL_RUNKRATOS=OFF ^ -DHDF5_ROOT="c:\hdf5\bin" ^ -DKRATOS_GENERATE_PYTHON_STUBS=ON From c3d14030311a5ca67b9e2bcf1821e3212a66fe7b Mon Sep 17 00:00:00 2001 From: Carlos Roig Date: Tue, 22 Aug 2023 10:36:53 +0200 Subject: [PATCH 3/9] Disable multilevelmc --- scripts/wheels/linux/configure.sh | 1 - scripts/wheels/linux/configure_mpi.sh | 1 - scripts/wheels/windows/configure.bat | 1 - 3 files changed, 3 deletions(-) diff --git a/scripts/wheels/linux/configure.sh b/scripts/wheels/linux/configure.sh index 8f94ccd27926..fe24ca966f47 100644 --- a/scripts/wheels/linux/configure.sh +++ b/scripts/wheels/linux/configure.sh @@ -50,7 +50,6 @@ add_app ${KRATOS_APP_DIR}/CompressiblePotentialFlowApplication; # add_app ${KRATOS_APP_DIR}/HDF5Application; add_app ${KRATOS_APP_DIR}/IgaApplication; add_app ${KRATOS_APP_DIR}/ChimeraApplication; -add_app ${KRATOS_APP_DIR}/MultilevelMonteCarloApplication; add_app ${KRATOS_APP_DIR}/StatisticsApplication; add_app ${KRATOS_APP_DIR}/RomApplication; add_app ${KRATOS_APP_DIR}/ShallowWaterApplication; diff --git a/scripts/wheels/linux/configure_mpi.sh b/scripts/wheels/linux/configure_mpi.sh index 66f0a25199ca..117720617dc9 100644 --- a/scripts/wheels/linux/configure_mpi.sh +++ b/scripts/wheels/linux/configure_mpi.sh @@ -51,7 +51,6 @@ add_app ${KRATOS_APP_DIR}/CompressiblePotentialFlowApplication; # add_app ${KRATOS_APP_DIR}/HDF5Application; add_app ${KRATOS_APP_DIR}/IgaApplication; add_app ${KRATOS_APP_DIR}/ChimeraApplication; -add_app ${KRATOS_APP_DIR}/MultilevelMonteCarloApplication; add_app ${KRATOS_APP_DIR}/StatisticsApplication; add_app ${KRATOS_APP_DIR}/RomApplication; add_app ${KRATOS_APP_DIR}/ShallowWaterApplication; diff --git a/scripts/wheels/windows/configure.bat b/scripts/wheels/windows/configure.bat index 8277f873622b..4b8418b2622d 100644 --- a/scripts/wheels/windows/configure.bat +++ b/scripts/wheels/windows/configure.bat @@ -41,7 +41,6 @@ CALL :add_app %KRATOS_APP_DIR%\CompressiblePotentialFlowApplication; CALL :add_app %KRATOS_APP_DIR%\HDF5Application; CALL :add_app %KRATOS_APP_DIR%\IgaApplication; CALL :add_app %KRATOS_APP_DIR%\ChimeraApplication; -CALL :add_app %KRATOS_APP_DIR%\MultilevelMonteCarloApplication; CALL :add_app %KRATOS_APP_DIR%\StatisticsApplication; CALL :add_app %KRATOS_APP_DIR%\RomApplication; CALL :add_app %KRATOS_APP_DIR%\ShallowWaterApplication; From 6c689607611088c91b676dec23ed31f3cc5f3791 Mon Sep 17 00:00:00 2001 From: Carlos Roig Date: Tue, 22 Aug 2023 10:37:42 +0200 Subject: [PATCH 4/9] Test Laplacian Element --- .../auxiliar_files_for_cpp_unnitest/test_laplacian_element.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_laplacian_element.h b/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_laplacian_element.h index 92d9c1ec0a0f..3fd4d8a4ae5a 100644 --- a/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_laplacian_element.h +++ b/kratos/tests/cpp_tests/auxiliar_files_for_cpp_unnitest/test_laplacian_element.h @@ -31,7 +31,7 @@ namespace Kratos::Testing * @details It is designed to create a simple LHS and RHS in order to test strategies, processes. etc.... This way the common interface of the elements/conditions can be used to minimize the difference between the actual implementation and the test * @author Vicente Mataix Ferrandiz */ -class TestLaplacianElement +class KRATOS_API(KRATOS_CORE) TestLaplacianElement : public Element { public: From 687b6df2f6097b0d4914693eba9b4683304f7f63 Mon Sep 17 00:00:00 2001 From: Carlos Roig Date: Wed, 4 Oct 2023 09:45:17 +0200 Subject: [PATCH 5/9] 9.4 -> 9.4.1 --- CMakeLists.txt | 2 +- scripts/wheels/build_release_linux.ps1 | 2 +- scripts/wheels/build_release_windows.ps1 | 2 +- scripts/wheels/linux/build.sh | 2 +- scripts/wheels/linux/build_mpi.sh | 2 +- scripts/wheels/windows/build.ps1 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc69778d9054..37df9d7b424c 100644 --- a/CMakeLists.txt +++ b/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 0) +set (KratosMultiphysics_PATCH_VERSION 1) # If KRATOS_SOURCE_DIR is not defined use the CMAKE_SOURCE_DIR if(NOT DEFINED KRATOS_SOURCE_DIR) diff --git a/scripts/wheels/build_release_linux.ps1 b/scripts/wheels/build_release_linux.ps1 index 4f5c6d741323..de5ff71a1756 100644 --- a/scripts/wheels/build_release_linux.ps1 +++ b/scripts/wheels/build_release_linux.ps1 @@ -1,4 +1,4 @@ -$RELEASE_BRANCH="Release-9.4" +$RELEASE_BRANCH="Release-9.4.1" $HOST_SWAP="C:/data_swap_host" $GUEST_SWAP="/data_swap_guest" diff --git a/scripts/wheels/build_release_windows.ps1 b/scripts/wheels/build_release_windows.ps1 index 06f7f58ea3d6..da5e9cefcb8b 100644 --- a/scripts/wheels/build_release_windows.ps1 +++ b/scripts/wheels/build_release_windows.ps1 @@ -1,4 +1,4 @@ -$RELEASE_BRANCH="Release-9.4" +$RELEASE_BRANCH="Release-9.4.1" $HOST_SWAP="C:/data_swap_host" $GUEST_SWAP="C:/data_swap_guest" diff --git a/scripts/wheels/linux/build.sh b/scripts/wheels/linux/build.sh index 36645cc4ad00..8bd54c454923 100644 --- a/scripts/wheels/linux/build.sh +++ b/scripts/wheels/linux/build.sh @@ -1,6 +1,6 @@ #!/bin/bash PYTHONS=("cp38" "cp39" "cp310" "cp311") -export KRATOS_VERSION="9.4" +export KRATOS_VERSION="9.4.1" BASE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH export KRATOS_ROOT="/workspace/kratos/Kratos" diff --git a/scripts/wheels/linux/build_mpi.sh b/scripts/wheels/linux/build_mpi.sh index e0cca474b69d..bff59da7f8b2 100644 --- a/scripts/wheels/linux/build_mpi.sh +++ b/scripts/wheels/linux/build_mpi.sh @@ -1,6 +1,6 @@ #!/bin/bash PYTHONS=("cp38" "cp39" "cp310" "cp311") -export KRATOS_VERSION="9.4" +export KRATOS_VERSION="9.4.1" BASE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH export KRATOS_ROOT="/workspace/kratos/Kratos" diff --git a/scripts/wheels/windows/build.ps1 b/scripts/wheels/windows/build.ps1 index 0cb000781e10..53a8c6c84ba6 100644 --- a/scripts/wheels/windows/build.ps1 +++ b/scripts/wheels/windows/build.ps1 @@ -1,7 +1,7 @@ param([System.String]$cotire="OFF") $pythons = "38", "39", "310", "311" -$env:kratos_version = "9.4" +$env:kratos_version = "9.4.1" $kratosRoot = "c:\kratos\kratos" $env:kratos_root = $kratosRoot From f9c12e14924e67f0e98d029d735d11ea8c462553 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 4 Oct 2023 11:54:33 +0200 Subject: [PATCH 6/9] Fixing path again? --- applications/DamApplication/DamApplication.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/DamApplication/DamApplication.json b/applications/DamApplication/DamApplication.json index b180724f6860..e36e986cf399 100644 --- a/applications/DamApplication/DamApplication.json +++ b/applications/DamApplication/DamApplication.json @@ -7,5 +7,5 @@ "author": "Kratos Team", "author_email": "kratos@listas.cimne.upc.edu", "description": "KRATOS Multiphysics (\"Kratos\") is a framework for building parallel, multi-disciplinary simulation software, aiming at modularity, extensibility, and high performance. Kratos is written in C++, and counts with an extensive Python interface.", - "readme": "scripts/wheels/README.md" + "readme": "applications/DamApplication/README.md" } From e3c6e007413e666d14cb04fb5486e7fedb20c6c9 Mon Sep 17 00:00:00 2001 From: Carlos Roig Date: Wed, 4 Oct 2023 12:53:29 +0200 Subject: [PATCH 7/9] Fixing HDF5App tests in win --- kratos/testing/testing.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kratos/testing/testing.h b/kratos/testing/testing.h index 282c43996404..d43e9d4abe81 100644 --- a/kratos/testing/testing.h +++ b/kratos/testing/testing.h @@ -26,6 +26,6 @@ namespace Kratos::Testing { -DataCommunicator& GetDefaultDataCommunicator(); +DataCommunicator& KRATOS_API(KRATOS_CORE) GetDefaultDataCommunicator(); } From 741b7c63f64d28c84aad1d214fd21af0ce5584f1 Mon Sep 17 00:00:00 2001 From: Carlos Roig Date: Wed, 4 Oct 2023 12:53:29 +0200 Subject: [PATCH 8/9] Fixing HDF5App tests in win From 4672904a94f33a480d5b331a5bed127dbbcae268 Mon Sep 17 00:00:00 2001 From: Carlos Roig Date: Wed, 4 Oct 2023 13:39:57 +0200 Subject: [PATCH 9/9] Typo --- kratos/testing/testing.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kratos/testing/testing.h b/kratos/testing/testing.h index d43e9d4abe81..7c400896266b 100644 --- a/kratos/testing/testing.h +++ b/kratos/testing/testing.h @@ -26,6 +26,6 @@ namespace Kratos::Testing { -DataCommunicator& KRATOS_API(KRATOS_CORE) GetDefaultDataCommunicator(); +KRATOS_API(KRATOS_CORE) DataCommunicator& GetDefaultDataCommunicator(); }