From 9a5f41ed927aa50b12e87ab5bffe1fa8ebc760c1 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 29 Dec 2021 23:07:05 +0100 Subject: [PATCH] spns #26832: update ParaView section --- applications/SALOME-9.8.0-native.pyconf | 10 +- applications/SALOME-master-native.pyconf | 154 ++++++++---------- products/CONFIGURATION.pyconf | 6 + products/ParaView.pyconf | 2 +- ...ONFIGURATION.SalomeMacros.cmake.DB11.patch | 15 ++ 5 files changed, 95 insertions(+), 92 deletions(-) create mode 100644 products/patches/CONFIGURATION.SalomeMacros.cmake.DB11.patch diff --git a/applications/SALOME-9.8.0-native.pyconf b/applications/SALOME-9.8.0-native.pyconf index 6aa8753..9facf2e 100644 --- a/applications/SALOME-9.8.0-native.pyconf +++ b/applications/SALOME-9.8.0-native.pyconf @@ -209,8 +209,8 @@ __overwrite__ : # The standard patch is also needed to be able to build PARAVIS (same kind of issue). # What is more, ParaView 5.9 CMake procedure requires Qt 5.12 as minimum version (5.11 here). # As this version is compliant too, let's force it as the new minimum needed version. - __condition__ : "VARS.dist in ['DB10']" - 'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB10'} + __condition__ : "VARS.dist in ['DB10', 'DB11' ]" + 'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB10_DB11'} } { # CentOS 8 repositories don't include sphinxintl package which must be installed through pip. @@ -232,10 +232,14 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag:'2.5', base: 'no', section : 'version_2_5_no_pip'} } { - __condition__ : "VARS.dist in ['DB10', 'UB20.04']" + __condition__ : "VARS.dist in ['DB10', 'DB11', 'UB20.04']" 'APPLICATION.products.cminpack': 'native' 'APPLICATION.products.PyFMI' : {tag:'2.5', base : 'no', section : 'version_2_5_no_pip'} } + { + __condition__ : "VARS.dist in ['DB11']" + 'APPLICATION.products.CONFIGURATION' : {tag:'master', base : 'no', section : 'default_DB11'} + } { __condition__ : "VARS.dist in ['CO8']" 'APPLICATION.products.cminpack' : '1.3.6' diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 6ccc540..e3b357d 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -15,10 +15,10 @@ APPLICATION : { build : { - CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" - RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED" - SALOME_USE_64BIT_IDS : '1' - VTK_SMP_IMPLEMENTATION_TYPE : 'OpenMP' # OpenMP # choose among: sequential / OpenMP / TBB switches + CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" + RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED" + SALOME_USE_64BIT_IDS : '1' + VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches } launch : {PYTHONIOENCODING:"UTF_8"} # alternative is to encode every accentued string with .encode('utf-8') SALOME_trace : "local" # local/file:.../with_logger @@ -31,7 +31,7 @@ APPLICATION : alabaster : 'native' Babel : 'native' boost : 'native' - CAS : 'V7_5_3p1' + CAS : {tag: 'V7_5_3p1', section: 'version_V7_5_3p1'} certifi : 'native' # Standalone native cgns works well. Unfortunately, it's directly linked to native hdf which uses a higher version than us. # Rollback to embedded version to avoid versions mismatch between both of them (see imp_1538_cgns_export_import.py) @@ -68,7 +68,7 @@ APPLICATION : llvm : 'native' markupsafe : 'native' matplotlib : 'native' - medfile : {section: 'default_Autotools', tag: '4.1.1rc1'} + medfile : {section: 'default_Autotools', tag: '4.1.1'} mesa : 'native' MeshGems : '2.13-1' metis : 'native' @@ -127,7 +127,7 @@ APPLICATION : 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' : {tag :'V2_4_5'} + 'LIBBATCH' : {tag : 'V2_4_5'} 'KERNEL' 'MEDCOUPLING' 'GUI' @@ -162,8 +162,9 @@ APPLICATION : 'ADAO' 'ADAO_INTERFACE' 'PARAVISADDONS' - 'TESTBASE' - 'CEATESTBASE' : {tag: 'SalomeV9'} + 'YDEFX' + 'TESTBASE': {tag: 'master'} + 'CEATESTBASE' : {tag: 'SSL'} } profile : { @@ -181,7 +182,7 @@ APPLICATION : } properties : { - mesa_launcher_in_package : "yes" + mesa_launcher_in_package : "no" repo_dev : "yes" pip : 'yes' pip_install_dir : 'python' @@ -190,82 +191,59 @@ APPLICATION : } __overwrite__ : [ - { - # Although recent adaptations of GEOM CMake procedure to be compliant with openCV 4.X, some - # deeper investigations need to be done in its sources. Use embedded openCV product where - # native one is 4.X. - __condition__ : "VARS.dist in ['FD32', 'UB20.04', 'FD34']" - 'APPLICATION.products.opencv' : '3.2.0' - } - { - # - __condition__ : "VARS.dist in ['UB20.04', 'CO8', 'FD32']" - 'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch', - 'paraview.0005-ParaView_find_cgns.patch', - 'paraview.0010-ParaView_CATALYST_cmake.patch', - 'paraview.0008-ParaView_coincident_rendering.patch', - 'paraview.0017-ParaView_protobuf_crash.patch', - 'paraview.0015-Paraview_VTKM_ioss.patch' - 'paraview.0018-spns-26351-autoconvert.patch', - 'paraview.0019-spns-26344-VTK-OpenMP.patch' - ] - } - { - # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it - # from Qt5_DIR, going back from it in filesystem (hardcoded). - # The standard patch is also needed to be able to build PARAVIS (same kind of issue). - # What is more, ParaView 5.9 CMake procedure requires Qt 5.12 as minimum version (5.11 here). - # As this version is compliant too, let's force it as the new minimum needed version. - __condition__ : "VARS.dist in ['DB10']" - 'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch', - 'paraview.0005-ParaView_find_cgns.patch', - 'paraview-5.9_qt-minimum-version.patch', - 'paraview.0003-ParaViewClient_native.patch', - 'paraview.0010-ParaView_CATALYST_cmake.patch', - 'paraview.0008-ParaView_coincident_rendering.patch', - 'paraview.0017-ParaView_protobuf_crash.patch', - 'paraview.0015-Paraview_VTKM_ioss.patch' - 'paraview.0018-spns-26351-autoconvert.patch', - 'paraview.0019-spns-26344-VTK-OpenMP.patch' - ] - } - { - # CentOS 8 repositories don't include sphinxintl package which must be installed through pip. - # To avoid its missing (system_info pyconf key doesn't handle this use case), we embed it. - __condition__ : "VARS.dist in ['CO8']" - 'APPLICATION.products.sphinxintl' : '0.9.10' - 'PRODUCTS.sphinxintl.default.properties.pip' : "no" - 'APPLICATION.products.cmake' : '3.12.1' - } - { - # FD 34 qt5 package is qt5-qtbase-devel. - __condition__ : "VARS.dist in ['FD34']" - 'APPLICATION.products.omniORB' : '4.2.4' - 'APPLICATION.products.omniORBpy': '4.2.4' - 'PRODUCTS.root.version_6_22_02.patches' : ['root-6.22.02.patch', 'root-6.22.02-gcc-11.0.patch'] - 'PRODUCTS.qt.default.system_info.rpm' : [] - 'PRODUCTS.qt.default.system_info.rpm_dev' : ["qt5-qtbase-devel"] - 'PRODUCTS.PyFMI.version_2_5.properties.pip' : "no" - 'PRODUCTS.PyFMI.version_2_5.compil_script' : "PyFMI-2.5.sh" - } - { - __condition__ : "VARS.dist in ['FD32']" - 'PRODUCTS.PyFMI.version_2_5.properties.pip' : "no" - 'PRODUCTS.PyFMI.version_2_5.compil_script' : "PyFMI-2.5.sh" - } - { - __condition__ : "VARS.dist in ['DB10', 'UB20.04']" - 'APPLICATION.products.cminpack': 'native' - 'PRODUCTS.PyFMI.version_2_5.properties.pip' : "no" - 'PRODUCTS.PyFMI.version_2_5.compil_script' : "PyFMI-2.5.sh" - } - { - __condition__ : "VARS.dist in ['CO8']" - 'APPLICATION.products.statsmodels' : '0.6.1' # will fail otherwise - 0.8.0 does not match Cython. - 'APPLICATION.products.cminpack': '1.3.6' - 'PRODUCTS.PyFMI.version_2_5.properties.pip' : "no" - 'PRODUCTS.PyFMI.version_2_5.compil_script' : "PyFMI-2.5.sh" - 'PRODUCTS.statsmodels.version_0_6_1.properties.pip' : "no" - 'PRODUCTS.statsmodels.version_0_6_1.compil_script' : "statsmodels-0.6.1.sh" - } + { + # Although recent adaptations of GEOM CMake procedure to be compliant with openCV 4.X, some + # deeper investigations need to be done in its sources. Use embedded openCV product where + # native one is 4.X. + __condition__ : "VARS.dist in ['FD32', 'UB20.04', 'FD34']" + 'APPLICATION.products.opencv' : '3.2.0' + } + { + # + __condition__ : "VARS.dist in ['UB20.04', 'CO8', 'FD32']" + 'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_CO8_FD32_UB20_0_4'} + } + { + # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it + # from Qt5_DIR, going back from it in filesystem (hardcoded). + # The standard patch is also needed to be able to build PARAVIS (same kind of issue). + # What is more, ParaView 5.9 CMake procedure requires Qt 5.12 as minimum version (5.11 here). + # As this version is compliant too, let's force it as the new minimum needed version. + __condition__ : "VARS.dist in ['DB10', 'DB11' ]" + 'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB10_DB11'} + } + { + # CentOS 8 repositories don't include sphinxintl package which must be installed through pip. + # To avoid its missing (system_info pyconf key doesn't handle this use case), we embed it. + __condition__ : "VARS.dist in ['CO8']" + 'APPLICATION.products.sphinxintl' : {tag: '0.9.10', base : 'no', section : 'version_0_9_10_no_pip'} + 'APPLICATION.products.cmake' : '3.12.1' + } + { + # FD 34 qt5 package is qt5-qtbase-devel. + __condition__ : "VARS.dist in ['FD34']" + 'APPLICATION.products.omniORB' : '4.2.4' + 'APPLICATION.products.omniORBpy': '4.2.4' + 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip'} + 'APPLICATION.products.root' : {tag:'6.22.02', base : 'no', section : 'version_6_22_02_FD34'} + } + { + __condition__ : "VARS.dist in ['FD32']" + 'APPLICATION.products.PyFMI' : {tag:'2.5', base: 'no', section : 'version_2_5_no_pip'} + } + { + __condition__ : "VARS.dist in ['DB10', 'DB11', 'UB20.04']" + 'APPLICATION.products.cminpack': 'native' + 'APPLICATION.products.PyFMI' : {tag:'2.5', base : 'no', section : 'version_2_5_no_pip'} + } + { + __condition__ : "VARS.dist in ['DB11']" + 'APPLICATION.products.CONFIGURATION' : {tag:'master', base : 'no', section : 'default_DB11'} + } + { + __condition__ : "VARS.dist in ['CO8']" + 'APPLICATION.products.cminpack' : '1.3.6' + 'APPLICATION.products.PyFMI' : {tag:'2.5', base : 'no', section : 'version_2_5_no_pip'} + 'APPLICATION.products.statsmodels' : {tag:'0.6.1', base : 'no', section : 'version_0_6_1_no_pip'} + } ] diff --git a/products/CONFIGURATION.pyconf b/products/CONFIGURATION.pyconf index 69c917e..0a7a9b6 100755 --- a/products/CONFIGURATION.pyconf +++ b/products/CONFIGURATION.pyconf @@ -18,7 +18,13 @@ default : compilation : "no" configure_dependency : "yes" # the source of this module is required for the configuration of salome is_SALOME_module : "yes" + incremental : 'yes' } patches : [] } + +default_DB11: +{ + patches : ['CONFIGURATION.SalomeMacros.cmake.DB11.patch'] +} diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index e24d8e3..6749c4a 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -255,7 +255,7 @@ version_5_9_0_CO8_FD32_UB20_0_4 : ] } -version_5_9_0_DB10 : +version_5_9_0_DB10_DB11 : { compil_script : 'ParaView-5.9.0.sh' archive_info : {archive_name : "ParaView-5.9.0-lata.tar.gz"} diff --git a/products/patches/CONFIGURATION.SalomeMacros.cmake.DB11.patch b/products/patches/CONFIGURATION.SalomeMacros.cmake.DB11.patch new file mode 100644 index 0000000..8c37ac2 --- /dev/null +++ b/products/patches/CONFIGURATION.SalomeMacros.cmake.DB11.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/SalomeMacros.cmake b/cmake/SalomeMacros.cmake +index 805d05b..ed1ca49 100644 +--- a/cmake/SalomeMacros.cmake ++++ b/cmake/SalomeMacros.cmake +@@ -30,7 +30,9 @@ CMAKE_POLICY(SET CMP0053 NEW) # For correct Qt 5 detection procedure + IF(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12) + CMAKE_POLICY(SET CMP0074 NEW) # Use ROOT variables when detecting packages + ENDIF() +- ++IF(CMAKE_VERSION VERSION_GREATER_EQUAL 3.18) ++ CMAKE_POLICY(SET CMP0057 NEW) ++ENDIF() + #---------------------------------------------------------------------------- + # LIST_CONTAINS is a macro useful for determining whether a list has a + # particular entry -- 2.39.2