From 7fc02a49b9fc50b766589e7c4956053cccc2e80a Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 2 Feb 2022 16:17:08 +0100 Subject: [PATCH] add C3PO to standard archive now --- applications/SALOME-9.8.0-native.pyconf | 13 +++++-------- applications/SALOME-master-MPI.pyconf | 2 +- applications/SALOME-master-int32.pyconf | 2 +- applications/SALOME-master-native.pyconf | 16 +++++++--------- applications/SALOME-master.pyconf | 15 ++++++++------- products/ParaView.pyconf | 18 +++++++++--------- 6 files changed, 31 insertions(+), 35 deletions(-) diff --git a/applications/SALOME-9.8.0-native.pyconf b/applications/SALOME-9.8.0-native.pyconf index 0e97603..dedd843 100644 --- a/applications/SALOME-9.8.0-native.pyconf +++ b/applications/SALOME-9.8.0-native.pyconf @@ -191,16 +191,10 @@ 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']" + 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.cminpack': 'native' 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_UB20_0_4'} @@ -218,7 +212,8 @@ __overwrite__ : } { __condition__ : "VARS.dist in ['DB11']" - 'APPLICATION.products.cminpack': 'native' + 'APPLICATION.products.opencv' : '3.2.0' + 'APPLICATION.products.cminpack' : 'native' 'APPLICATION.products.PyFMI' : {tag:'2.5', base: 'no', section: 'version_2_5_no_pip'} 'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB11'} } @@ -234,6 +229,7 @@ __overwrite__ : } { __condition__ : "VARS.dist in ['FD32']" + 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip'} 'APPLICATION.products.openturns' : {tag: '1.17', base: 'no', section: 'version_1_17_FD32' } 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_FD32'} @@ -241,6 +237,7 @@ __overwrite__ : { # FD 34 qt5 package is qt5-qtbase-devel. __condition__ : "VARS.dist in ['FD34']" + 'APPLICATION.products.opencv' : '3.2.0' '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' } diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index e84ac2f..867d38c 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -166,7 +166,7 @@ APPLICATION : 'PARAVISADDONS' 'YDEFX' 'TESTBASE': {tag: 'master'} - 'CEATESTBASE' : {tag: 'SSL'} + 'CEATESTBASE' : {tag: 'SalomeV9'} } profile : { diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf index dba392f..a0d921b 100644 --- a/applications/SALOME-master-int32.pyconf +++ b/applications/SALOME-master-int32.pyconf @@ -160,7 +160,7 @@ APPLICATION : 'PARAVISADDONS' 'YDEFX' 'TESTBASE': {tag: 'master'} - 'CEATESTBASE' : {tag: 'SSL'} + 'CEATESTBASE' : {tag: 'SalomeV9'} } profile : { diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 8172068..e23448f 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -32,6 +32,7 @@ APPLICATION : Babel : 'native' boost : 'native' CAS : 'V7_5_3p1' + C3PO: 'v2.0' 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) @@ -72,6 +73,7 @@ APPLICATION : mesa : 'native' MeshGems : '2.14-1' metis : 'native' + mpi4py: 'native' netgen : '6.2.2101' nlopt : '2.4.2' numpy : 'native' @@ -166,7 +168,7 @@ APPLICATION : 'PARAVISADDONS' 'YDEFX' 'TESTBASE': {tag: 'master'} - 'CEATESTBASE' : {tag: 'SSL'} + 'CEATESTBASE' : {tag: 'SalomeV9'} } profile : { @@ -193,16 +195,10 @@ 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', 'DB11']" - 'APPLICATION.products.opencv' : '3.2.0' - } { # __condition__ : "VARS.dist in ['UB20.04']" + 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.cminpack': 'native' 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_UB20_0_4', hpc: 'yes'} @@ -220,6 +216,7 @@ __overwrite__ : } { __condition__ : "VARS.dist in ['DB11']" + 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.cminpack': 'native' 'APPLICATION.products.PyFMI' : {tag:'2.5', base: 'no', section: 'version_2_5_no_pip' } 'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB11', hpc: 'yes'} @@ -228,7 +225,7 @@ __overwrite__ : # 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.sphinxintl' : {tag: '0.9.10', base: 'no', section: 'version_0_9_10_no_pip' } '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' } @@ -243,6 +240,7 @@ __overwrite__ : { # FD 34 qt5 package is qt5-qtbase-devel. __condition__ : "VARS.dist in ['FD34']" + 'APPLICATION.products.opencv' : '3.2.0' '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' } diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index f70215f..bcc4c64 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -32,6 +32,7 @@ APPLICATION : Babel : '2.7.0' boost : '1.71.0' CAS : 'V7_5_3p1' + C3PO: 'v2.0' certifi : '2018.8.24' cgns : '4.1.1' chardet : '3.0.4' @@ -165,7 +166,7 @@ APPLICATION : 'PARAVISADDONS' 'YDEFX' 'TESTBASE': {tag: 'master'} - 'CEATESTBASE' : {tag: 'SSL'} + 'CEATESTBASE' : {tag: 'SalomeV9'} } profile : { @@ -203,12 +204,6 @@ __overwrite__ : 'APPLICATION.products.scipy' : '1.5.2' 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr', 'openmpi', 'mpi4py'] } - { - __condition__ : "VARS.dist in ['DB09']" - 'APPLICATION.products.ParaView' : {tag:'5.9.0', base: 'no', section: 'version_5_9_0_MPI', hpc: 'yes'} - 'APPLICATION.products.PARAVIS' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} - } { __condition__ : "VARS.dist in ['CO7']" 'APPLICATION.rm_products' : ['openmpi', 'mpi4py', 'gcc', 'gmp', 'mpc', 'mpfr'] @@ -217,6 +212,12 @@ __overwrite__ : __condition__ : "VARS.dist in ['CO8']" 'APPLICATION.rm_products' : ['openmpi', 'mpi4py', 'gcc', 'gmp', 'mpc', 'mpfr'] } + { + __condition__ : "VARS.dist in ['DB09']" + 'APPLICATION.products.ParaView' : {tag:'5.9.0', base: 'no', section: 'version_5_9_0_MPI', hpc: 'yes'} + 'APPLICATION.products.PARAVIS' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} + } { __condition__ : "VARS.dist in ['DB10']" 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index c4abaa7..f37fe28 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -163,7 +163,7 @@ version_5_9_0 : 'paraview.0010-ParaView_CATALYST_cmake.patch', 'paraview.0008-ParaView_coincident_rendering.patch', 'paraview.0011-ParaView_protobuf_crash.patch', - 'paraview.0015-Paraview_VTKM_ioss.patch' + 'paraview.0015-Paraview_VTKM_ioss.patch', 'paraview-5.9.0-gcc.11.0.patch', 'paraview.0018-spns-26351-autoconvert.patch', 'paraview.0019-spns-26344-VTK-OpenMP.patch' @@ -305,7 +305,7 @@ version_5_9_0_FD32 : '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.0011-ParaView_protobuf_crash.patch', 'paraview.0015-Paraview_VTKM_ioss.patch' 'paraview.0018-spns-26351-autoconvert.patch', 'paraview.0019-spns-26344-VTK-OpenMP.patch' @@ -321,7 +321,7 @@ version_5_9_0_UB_20_0_4 : '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.0011-ParaView_protobuf_crash.patch', 'paraview.0015-Paraview_VTKM_ioss.patch' 'paraview.0018-spns-26351-autoconvert.patch', 'paraview.0019-spns-26344-VTK-OpenMP.patch' @@ -337,8 +337,8 @@ version_5_9_0_CO8 : '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.0011-ParaView_protobuf_crash.patch', + 'paraview.0015-Paraview_VTKM_ioss.patch', 'paraview.0018-spns-26351-autoconvert.patch', 'paraview.0019-spns-26344-VTK-OpenMP.patch', 'paraview.0020.findMPI.patch' @@ -356,8 +356,8 @@ version_5_9_0_DB10 : '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.0011-ParaView_protobuf_crash.patch', + 'paraview.0015-Paraview_VTKM_ioss.patch', 'paraview.0018-spns-26351-autoconvert.patch', 'paraview.0019-spns-26344-VTK-OpenMP.patch', 'paraview.0020.findMPI.patch' @@ -375,8 +375,8 @@ version_5_9_0_DB11 : '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.0011-ParaView_protobuf_crash.patch', + 'paraview.0015-Paraview_VTKM_ioss.patch', 'paraview.0018-spns-26351-autoconvert.patch', 'paraview.0019-spns-26344-VTK-OpenMP.patch' ] -- 2.39.2