From 7be0ebad4125fccab97805814e0dac2df3d4dc95 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 28 Mar 2022 18:16:20 +0200 Subject: [PATCH] use PERSALYS v12, openturns 1.18. Use OPENTURNS_SALOME git repository instead of archive. --- applications/SALOME-master-native.pyconf | 6 +-- applications/SALOME-master.pyconf | 6 +-- products/OPENTURNS_SALOME.pyconf | 7 ++-- products/PERSALYS.pyconf | 5 +++ products/patches/PERSALYS-v12-001.patch | 51 ++++++++++++++++++++++++ products/patches/PERSALYS-v12-002.patch | 11 +++++ 6 files changed, 77 insertions(+), 9 deletions(-) create mode 100644 products/patches/PERSALYS-v12-001.patch create mode 100644 products/patches/PERSALYS-v12-002.patch diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index bee642b..b2da229 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -87,12 +87,12 @@ APPLICATION : opencv : 'native' openmpi: 'native' openVKL : '0.11.0' - openturns: '1.17' + openturns: '1.18' ospray : '2.4.0' packaging : 'native' pandas : 'native' ParaView : {tag:'5.9.0', base: 'no', section: 'version_5_9_0_MPI', hpc: 'yes'} - PERSALYS: 'v11.0' + PERSALYS: 'v12.0' petsc : {tag : '3.16.0', section: 'version_3_16_0'} Pillow : 'native' # 'native' not exists : freeCAD part but not delivered with it from package handler @@ -156,7 +156,7 @@ APPLICATION : 'HOMARD' 'FIELDS' 'PARAVIS': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'OPENTURNS_SALOME': '9.8.0' + 'OPENTURNS_SALOME' 'JOBMANAGER' 'YACS' 'YACSGEN' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index ef9fa4d..a661321 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -84,14 +84,14 @@ APPLICATION : omniORBpy : '4.2.2' opencv : '3.2.0' openmpi : '3.1.6' - openturns: '1.17' + openturns: '1.18' openVKL: '0.11.0' ospray : '2.4.0' packaging : '17.1' pandas : '0.25.2' patsy : '0.5.2' ParaView : {tag:'5.9.0', base: 'no', section: 'version_5_9_0_MPI', hpc: 'yes'} - PERSALYS: 'v11.0' + PERSALYS: 'v12.0' petsc : {tag : '3.16.0', section: 'version_3_16_0'} Pillow : '7.1.1' planegcs : '0.18-3cb6890' @@ -152,7 +152,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'OPENTURNS_SALOME' : '9.8.0' + 'OPENTURNS_SALOME' 'PARAVIS' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' diff --git a/products/OPENTURNS_SALOME.pyconf b/products/OPENTURNS_SALOME.pyconf index e303c50..a19366c 100644 --- a/products/OPENTURNS_SALOME.pyconf +++ b/products/OPENTURNS_SALOME.pyconf @@ -4,10 +4,11 @@ default : build_source : "cmake" cmake_options: " -DOTGUI_ROOT_DIR=$PERSALYS_ROOT_DIR" compil_script : $name + "-" + $APPLICATION.products.OPENTURNS_SALOME + $VARS.scriptExtension - get_source : "archive" - archive_info : + get_source : "git" + git_info: { - archive_name : "OPENTURNS-" + $APPLICATION.products.OPENTURNS_SALOME + ".tar.gz" + repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/openturns_salome.git" + repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "openturns_salome.git" } environ : { diff --git a/products/PERSALYS.pyconf b/products/PERSALYS.pyconf index f620e33..185d117 100644 --- a/products/PERSALYS.pyconf +++ b/products/PERSALYS.pyconf @@ -56,6 +56,11 @@ default_win : } } +version_v12_0 : +{ + patches : ['PERSALYS-v12-001.patch', 'PERSALYS-v12-002.patch'] +} + version_v11_0 : { patches : ['PERSALYS-v11-001.patch', 'PERSALYS-v11-002.patch'] diff --git a/products/patches/PERSALYS-v12-001.patch b/products/patches/PERSALYS-v12-001.patch new file mode 100644 index 0000000..13c0b22 --- /dev/null +++ b/products/patches/PERSALYS-v12-001.patch @@ -0,0 +1,51 @@ +--- PERSALYS_ref/CMakeLists.txt 2022-01-11 16:27:50.000000000 +0100 ++++ PERSALYS_new/CMakeLists.txt 2022-02-27 12:45:01.757523273 +0100 +@@ -10,6 +10,10 @@ + option (USE_COTIRE "Use cotire for unity builds" OFF) + option (USE_PARAVIEW "use ParaView" ON) + set (PERSALYS_QT_VERSION 5 CACHE STRING "Qt version") ++SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") ++SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI") ++SET(YACS_ROOT_DIR $ENV{YACS_ROOT_DIR} CACHE PATH "Path to the Salome YACS") ++SET(ADAO_ROOT_DIR $ENV{ADAO_ROOT_DIR} CACHE PATH "Path to the Salome ADAO") + + # By default, build in Release mode. Must appear before project() command + if ( NOT DEFINED CMAKE_BUILD_TYPE ) +@@ -27,6 +31,17 @@ + # set module dir to find custom scripts + list ( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) + ++# Common CMake macros ++# =================== ++if (USE_SALOME) ++ SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files") ++ IF(EXISTS ${CONFIGURATION_ROOT_DIR}) ++ LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake") ++ INCLUDE(SalomeMacros NO_POLICY_SCOPE) ++ ELSE() ++ MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !") ++ ENDIF() ++endif() + + if (USE_COTIRE) + if (POLICY CMP0058) +@@ -63,6 +78,9 @@ + list (APPEND PERSALYS_DEFINITIONS "-DPERSALYS_STATIC -DPYINTERP_STATIC -DPYCONSOLE_STATIC") + endif () + ++if (USE_SALOME) ++ FIND_PACKAGE(SalomeBoost REQUIRED) ++endif(USE_SALOME) + find_package (Boost COMPONENTS filesystem locale REQUIRED) + if (TARGET Boost::filesystem) + set (Boost_LIBRARIES Boost::filesystem Boost::locale) +@@ -91,6 +109,9 @@ + endmacro () + endif () + ++ if (USE_SALOME) ++ find_package (SalomeQwt) ++ endif() + find_package (Qwt 6 REQUIRED) + + if (USE_PARAVIEW) diff --git a/products/patches/PERSALYS-v12-002.patch b/products/patches/PERSALYS-v12-002.patch new file mode 100644 index 0000000..1198c4b --- /dev/null +++ b/products/patches/PERSALYS-v12-002.patch @@ -0,0 +1,11 @@ +--- PERSALYS_ref/python/src/CMakeLists.txt 2022-01-11 16:27:50.000000000 +0100 ++++ PERSALYS_new/python/src/CMakeLists.txt 2022-02-27 13:51:05.719828647 +0100 +@@ -308,7 +308,7 @@ + endif () + endforeach() + +- set (SPHINX_FLAGS "-W" CACHE STRING "sphinx flags") ++ set (SPHINX_FLAGS "" CACHE STRING "sphinx flags") + separate_arguments (SPHINX_FLAGS) + + # generate sphinx rule for each format -- 2.39.2