From 1df89f47170ab25a158d8c6bd81cb9332d47663e Mon Sep 17 00:00:00 2001 From: "Quentin COZETTE (qc784398)" Date: Fri, 13 Nov 2020 17:52:12 +0100 Subject: [PATCH] Prepare applications' master configurations aligning them with the current versions 9.6.0 (final) --- applications/MEDCOUPLING-master-int32.pyconf | 4 +- .../MEDCOUPLING-master-windows.pyconf | 4 +- applications/MEDCOUPLING-master.pyconf | 6 +-- applications/SALOME-master-MPI.pyconf | 39 ++++--------------- applications/SALOME-master-int32.pyconf | 13 ++----- applications/SALOME-master-windows.pyconf | 2 +- applications/SALOME-master.pyconf | 15 ++----- applications/SOLVERLAB-master.pyconf | 2 +- 8 files changed, 24 insertions(+), 61 deletions(-) diff --git a/applications/MEDCOUPLING-master-int32.pyconf b/applications/MEDCOUPLING-master-int32.pyconf index 115c31b..2c6155b 100644 --- a/applications/MEDCOUPLING-master-int32.pyconf +++ b/applications/MEDCOUPLING-master-int32.pyconf @@ -22,7 +22,7 @@ APPLICATION : boost : '1.58.0' certifi : '2018.8.24' click : '6.7' - cmake : '3.12.1' + cmake : '3.12.1' cppunit : '1.13.2' chardet : '3.0.4' Cython : '0.25.2' @@ -62,7 +62,7 @@ APPLICATION : 'CONFIGURATION' 'MEDCOUPLING' } - test_base : + test_base : { name : "SALOME" tag : "SalomeV9" diff --git a/applications/MEDCOUPLING-master-windows.pyconf b/applications/MEDCOUPLING-master-windows.pyconf index c9a42bd..e6d9e23 100644 --- a/applications/MEDCOUPLING-master-windows.pyconf +++ b/applications/MEDCOUPLING-master-windows.pyconf @@ -31,7 +31,7 @@ APPLICATION : boost : '1.67.0' certifi : '2019.6.16' click : '7.0' - cmake : '3.12.1' + cmake : '3.12.1' colorama: '0.4.1' cppunit : '1.13.2' chardet : '3.0.4' @@ -83,7 +83,7 @@ APPLICATION : 'CONFIGURATION': {dev: 'yes'} 'MEDCOUPLING': {dev: 'yes'} } - test_base : + test_base : { name : "SALOME" tag : "SalomeV9" diff --git a/applications/MEDCOUPLING-master.pyconf b/applications/MEDCOUPLING-master.pyconf index d95b11a..bcf114f 100644 --- a/applications/MEDCOUPLING-master.pyconf +++ b/applications/MEDCOUPLING-master.pyconf @@ -29,7 +29,7 @@ APPLICATION : boost : '1.58.0' certifi : '2018.8.24' click : '6.7' - cmake : '3.12.1' + cmake : '3.12.1' cppunit : '1.13.2' chardet : '3.0.4' Cython : '0.25.2' @@ -67,9 +67,9 @@ APPLICATION : # SALOME MODULES : 'CONFIGURATION' - 'MEDCOUPLING' : {tag : 'master', section: 'default_int64'} + 'MEDCOUPLING' : {section: 'default_int64'} } - test_base : + test_base : { name : "SALOME" tag : "SalomeV9" diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index 2b1cae8..61f5523 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -61,7 +61,7 @@ APPLICATION : matplotlib : '2.2.2' medfile : {tag : '4.1.0', hpc : 'yes', section : 'default_Autotools' } mesa : '19.0.8' - MeshGems : {tag : '2.10-4', hpc : 'yes'} + MeshGems : {tag : '2.11-5', hpc : 'yes'} ParMetis : '3.1.1' netgen : '5.3.1_with_CAS_7.2' nlopt : '2.4.2' @@ -74,6 +74,7 @@ APPLICATION : ospray : '1.8.4' packaging : '17.1' ParaView : {tag : '5.8.0', hpc : 'yes', section: 'version_5_8_0_MPI'} + petsc : '3.14.0' Pillow : '7.1.1' planegcs : '0.18-3cb6890' pockets : '0.6.2' @@ -110,7 +111,7 @@ APPLICATION : 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' : {tag :'V2_4_3'} + 'LIBBATCH' : {tag :'V2_4_4'} 'KERNEL' : {section : 'default_MPI', verbose : 'yes'} 'MEDCOUPLING' : {section : 'default_MPI', verbose : 'yes'} 'GUI' : {verbose : 'yes'} @@ -123,14 +124,15 @@ APPLICATION : 'HYBRIDPLUGIN' 'HexoticPLUGIN' 'GMSHPLUGIN' - 'HEXABLOCK' : {tag: 'master', section : "default_MPI", verbose: 'yes'} + 'HEXABLOCK' : {section : "default_MPI", verbose: 'yes'} 'HEXABLOCKPLUGIN' 'HOMARD' - 'FIELDS' : {tag: 'master', section : "default_MPI", verbose: 'yes'} - 'PARAVIS' : {tag: 'master', section : "default_MPI", verbose: 'yes'} - 'JOBMANAGER' : {tag: 'master', section : "default_MPI", verbose: 'yes'} + 'FIELDS' : {section : "default_MPI", verbose: 'yes'} + 'PARAVIS' : {section : "default_MPI", verbose: 'yes'} + 'JOBMANAGER' : {section : "default_MPI", verbose: 'yes'} 'YACS' 'YACSGEN' + 'SOLVERLAB' : {section : "default_MPI", hpc: 'yes'} 'DOCUMENTATION' 'SAMPLES' 'COMPONENT' @@ -168,28 +170,3 @@ APPLICATION : single_install_dir : "yes" } } -__overwrite__ : -[ - { - # GTK compilation issue - __condition__ : "VARS.dist in ['CO6']" - 'APPLICATION.products.opencv' : '2.4.13.5' - 'APPLICATION.products.tbb' : '4.4' - 'APPLICATION.products.llvm' : '3.9.1-clang' - 'APPLICATION.products.mesa' : '13.0.6' - 'PRODUCTS.embree.default.patches' : ['embree-3.5.2-centos6.patch'] - } - - { - # tbb as a mandatory native product since SMESH with tbb, not installed on DB8 (temporary) - __condition__ : "VARS.dist in ['DB08']" - 'APPLICATION.products.tbb' : '4.4' - } - - { - # - __condition__ : "VARS.dist in ['FD26']" - 'APPLICATION.products.tbb' : '2017-7' - 'APPLICATION.products.embree' : '3.5.2' - } -] diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf index a3a196b..852e2d3 100644 --- a/applications/SALOME-master-int32.pyconf +++ b/applications/SALOME-master-int32.pyconf @@ -109,7 +109,7 @@ APPLICATION : 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' : {tag :'V2_4_3'} + 'LIBBATCH' : {tag :'V2_4_4'} 'KERNEL' 'MEDCOUPLING' 'GUI' @@ -206,18 +206,11 @@ __overwrite__ : 'PRODUCTS.llvm.version_8_0_1_clang.patches' : ['llvm-8.0.1-clang-FD32.patch'] 'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch', 'qt-5.9.1-mapbox-FD32.patch'] 'PRODUCTS.mesa.version_19_0_8.patches' : ['mesa-19.0.8-debug_symbol.patch'] - 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch', - 'paraview.0004-ParaView_hdf5.patch', - 'paraview.0005-ParaView_find_cgns.patch', - 'paraview.0006-ParaView_find_libxml2.patch', - 'paraview.0007-ParaView_find_freetype.patch', - 'paraview.0009-ParaView_volume_mapper.patch', - 'pv_coincident.patch' - ] } { - __condition__ : "VARS.dist in ['CO8']" + # Adapt Paraview CMake files to be compliant with recent distributions + __condition__ : "VARS.dist in ['FD30', 'FD32', 'CO8']" 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch', 'paraview.0004-ParaView_hdf5.patch', 'paraview.0005-ParaView_find_cgns.patch', diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index f955f7d..1809f60 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -126,7 +126,7 @@ APPLICATION : 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' : {tag :'V2_4_3'} + 'LIBBATCH' : {tag :'V2_4_4'} 'KERNEL' 'MEDCOUPLING' 'GUI' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index a2b90c9..5b0286f 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -111,9 +111,9 @@ APPLICATION : 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' + 'LIBBATCH' : {tag : 'V2_4_4'} 'KERNEL' - 'MEDCOUPLING' : {tag : 'master', section: 'default_int64'} # this will trigger other modules as int64 + 'MEDCOUPLING' : {section: 'default_int64'} # this will trigger other modules as int64 'GUI' 'GEOM' 'SMESH' @@ -208,14 +208,6 @@ __overwrite__ : 'PRODUCTS.llvm.version_8_0_1_clang.patches' : ['llvm-8.0.1-clang-FD32.patch'] 'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch', 'qt-5.9.1-mapbox-FD32.patch'] 'PRODUCTS.mesa.version_19_0_8.patches' : ['mesa-19.0.8-debug_symbol.patch'] - 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch', - 'paraview.0004-ParaView_hdf5.patch', - 'paraview.0005-ParaView_find_cgns.patch', - 'paraview.0006-ParaView_find_libxml2.patch', - 'paraview.0007-ParaView_find_freetype.patch', - 'paraview.0009-ParaView_volume_mapper.patch', - 'pv_coincident.patch' - ] } { @@ -237,7 +229,8 @@ __overwrite__ : } { - __condition__ : "VARS.dist in ['CO8']" + # Adapt Paraview CMake files to be compliant with recent distributions + __condition__ : "VARS.dist in ['FD30', 'FD32', 'CO8']" 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch', 'paraview.0004-ParaView_hdf5.patch', 'paraview.0005-ParaView_find_cgns.patch', diff --git a/applications/SOLVERLAB-master.pyconf b/applications/SOLVERLAB-master.pyconf index eea7f4d..e8b15b4 100644 --- a/applications/SOLVERLAB-master.pyconf +++ b/applications/SOLVERLAB-master.pyconf @@ -78,7 +78,7 @@ APPLICATION : # SALOME MODULES : 'CONFIGURATION' - 'MEDCOUPLING' : {tag : 'master', section: 'default_int64'} # this will trigger other modules as int64 + 'MEDCOUPLING' : {section: 'default_int64'} # this will trigger other modules as int64 'SOLVERLAB' } profile : -- 2.39.2