From c153da7f5fb086f3ce060622422cc4ddbf5183f6 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 24 May 2022 13:11:47 +0200 Subject: [PATCH] SALOME 9.9.0 rc2: still EFICAS, EFICAS_TOOLS and OPENTURNS_SALOME use rc1 tag --- applications/MEDCOUPLING-9.9.0-MPI.pyconf | 4 +-- applications/MEDCOUPLING-9.9.0-windows.pyconf | 2 +- applications/SALOME-9.8.0-MPI.pyconf | 4 +-- applications/SALOME-9.9.0-MPI.pyconf | 34 +++++++++---------- applications/SALOME-9.9.0-native.pyconf | 24 ++++++------- applications/SALOME-9.9.0-windows.pyconf | 10 +++--- applications/SALOME-9.9.0.pyconf | 24 ++++++------- products/HOMARD.pyconf | 6 ++++ 8 files changed, 57 insertions(+), 51 deletions(-) diff --git a/applications/MEDCOUPLING-9.9.0-MPI.pyconf b/applications/MEDCOUPLING-9.9.0-MPI.pyconf index c71dace..c696a65 100644 --- a/applications/MEDCOUPLING-9.9.0-MPI.pyconf +++ b/applications/MEDCOUPLING-9.9.0-MPI.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.9.0-MPI' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_9_BR' + tag : 'V9_9_0rc2' base : 'no' debug : 'no' python3 : 'yes' @@ -69,7 +69,7 @@ APPLICATION : # SALOME MODULES : 'CONFIGURATION' - 'MEDCOUPLING' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI_STD', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'V9_9_0rc2', base: 'no', section: 'version_V9_9_0_MPI_STD', hpc: 'yes'} } test_base : { diff --git a/applications/MEDCOUPLING-9.9.0-windows.pyconf b/applications/MEDCOUPLING-9.9.0-windows.pyconf index 9e92826..0ad6d59 100644 --- a/applications/MEDCOUPLING-9.9.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.9.0-windows.pyconf @@ -6,7 +6,7 @@ APPLICATION : name : 'MEDCOUPLING-9.9.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name cmake_generator : 'Visual Studio 15 2017 Win64' - tag : 'V9_9_BR' + tag : 'V9_9_0rc2' debug : 'no' base : 'no' python3 : 'yes' diff --git a/applications/SALOME-9.8.0-MPI.pyconf b/applications/SALOME-9.8.0-MPI.pyconf index 5ad85ed..d14f613 100644 --- a/applications/SALOME-9.8.0-MPI.pyconf +++ b/applications/SALOME-9.8.0-MPI.pyconf @@ -85,7 +85,7 @@ APPLICATION : pandas : '0.25.2' patsy : '0.5.2' ParaView : {tag : '5.9.0', hpc : 'yes', section: 'version_5_9_0_MPI'} - petsc : {tag : '3.16.0', section: 'version_3_16_0'} + petsc : {tag : '3.16.0', section: 'version_3_16_0', hpc: 'yes'} Pillow : '7.1.1' planegcs : '0.18-3cb6890' psutil : '5.7.2' @@ -142,7 +142,7 @@ APPLICATION : 'GMSHPLUGIN' 'HEXABLOCK' : {section : "default_MPI", verbose: 'yes'} 'HEXABLOCKPLUGIN' - 'HOMARD' + 'HOMARD' : {tag:'V9_8_0', base: 'no', section: 'version_V9_8_0_MPI', hpc: 'yes'} 'FIELDS' : {section : "default_MPI", verbose: 'yes'} 'PARAVIS' : {section : "default_MPI", verbose: 'yes'} 'JOBMANAGER' : {section : "default_MPI", verbose: 'yes'} diff --git a/applications/SALOME-9.9.0-MPI.pyconf b/applications/SALOME-9.9.0-MPI.pyconf index 04a5ad0..ecaf1af 100644 --- a/applications/SALOME-9.9.0-MPI.pyconf +++ b/applications/SALOME-9.9.0-MPI.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.9.0-MPI' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_9_BR' + tag : 'V9_9_0rc2' dev : 'no' verbose :'no' debug : 'no' @@ -141,8 +141,8 @@ APPLICATION : 'SHAPERSTUDY' 'RESTRICTED' 'LIBBATCH' : 'V2_4_5' - 'KERNEL' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} - 'MEDCOUPLING' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI_STD', hpc: 'yes'} + 'KERNEL' : {tag:'V9_9_0rc2', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'V9_9_0rc2', base: 'no', section: 'version_V9_9_0_MPI_STD', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -153,12 +153,12 @@ APPLICATION : 'HYBRIDPLUGIN' 'HexoticPLUGIN' 'GMSHPLUGIN' - 'HEXABLOCK' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} + 'HEXABLOCK' : {tag:'V9_9_0rc2', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} 'HEXABLOCKPLUGIN' - 'HOMARD' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} - 'FIELDS' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} - 'PARAVIS' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} - 'JOBMANAGER' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} + 'HOMARD' : {tag:'V9_9_0rc2', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} + 'FIELDS' : {tag:'V9_9_0rc2', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_9_0rc2', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} + 'JOBMANAGER' : {tag:'V9_9_0rc2', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} 'YACS' 'YACSGEN' 'DOCUMENTATION' @@ -170,16 +170,16 @@ APPLICATION : 'PYHELLO' 'EFICAS' : 'V9_9_0rc1' 'EFICAS_TOOLS' : 'V9_9_0rc1' - 'PY2CPP' : 'V9_9_0rc1' - 'ADAO' : 'V9_9_0rc1' - 'ADAO_INTERFACE' : 'V9_9_0rc1' - 'PARAVISADDONS' : 'V9_9_0rc1' + 'PY2CPP' : 'V9_9_0rc2' + 'ADAO' : 'V9_9_0rc2' + 'ADAO_INTERFACE' : 'V9_9_0rc2' + 'PARAVISADDONS' : 'V9_9_0rc2' 'OPENTURNS_SALOME' : 'V9_9_0rc1' - 'YDEFX' : 'V9_9_0rc1' - 'pmml' : 'V9_9_0rc1' - 'SOLVERLAB' : {tag:'V9_9_0rc1', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} - 'TopIIVolMesh' : 'V9_9_0rc1' - 'CEATESTBASE' : {tag: 'SalomeV9'} + 'YDEFX' : 'V9_9_0rc2' + 'pmml' : 'V9_9_0rc2' + 'SOLVERLAB' : {tag:'V9_9_0rc2', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} + 'TopIIVolMesh' : 'V9_9_0rc2' + 'CEATESTBASE' : 'V9_9_0rc2' } profile : { diff --git a/applications/SALOME-9.9.0-native.pyconf b/applications/SALOME-9.9.0-native.pyconf index f238320..4f3e2e4 100644 --- a/applications/SALOME-9.9.0-native.pyconf +++ b/applications/SALOME-9.9.0-native.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.9.0-native' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_9_BR' + tag : 'V9_9_0rc2' dev : 'no' verbose :'no' debug : 'no' @@ -140,7 +140,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : {tag : 'V2_4_5'} 'KERNEL' - 'MEDCOUPLING' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'V9_9_0rc2', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -155,7 +155,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_9_0rc2', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' @@ -168,16 +168,16 @@ APPLICATION : 'PYHELLO' 'EFICAS' : 'V9_9_0rc1' 'EFICAS_TOOLS' : 'V9_9_0rc1' - 'PY2CPP' : 'V9_9_0rc1' - 'ADAO' : 'V9_9_0rc1' - 'ADAO_INTERFACE' : 'V9_9_0rc1' - 'PARAVISADDONS' : 'V9_9_0rc1' + 'PY2CPP' : 'V9_9_0rc2' + 'ADAO' : 'V9_9_0rc2' + 'ADAO_INTERFACE' : 'V9_9_0rc2' + 'PARAVISADDONS' : 'V9_9_0rc2' 'OPENTURNS_SALOME' : 'V9_9_0rc1' - 'YDEFX' : 'V9_9_0rc1' - 'pmml' : 'V9_9_0rc1' - 'SOLVERLAB' : 'V9_9_0rc1' - 'TopIIVolMesh' : 'V9_9_0rc1' - 'CEATESTBASE' : {tag: 'SalomeV9'} + 'YDEFX' : 'V9_9_0rc2' + 'pmml' : 'V9_9_0rc2' + 'SOLVERLAB' : 'V9_9_0rc2' + 'TopIIVolMesh' : 'V9_9_0rc2' + 'CEATESTBASE' : 'V9_9_0rc2' } profile : { diff --git a/applications/SALOME-9.9.0-windows.pyconf b/applications/SALOME-9.9.0-windows.pyconf index bade401..f1349eb 100644 --- a/applications/SALOME-9.9.0-windows.pyconf +++ b/applications/SALOME-9.9.0-windows.pyconf @@ -6,7 +6,7 @@ APPLICATION : name : 'SALOME-9.9.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name cmake_generator : 'Visual Studio 15 2017 Win64' - tag : 'V9_9_BR' + tag : 'V9_9_0rc2' dev : 'no' verbose : 'no' debug : 'no' @@ -166,10 +166,10 @@ APPLICATION : 'PYHELLO' 'EFICAS' : 'V9_9_0rc1' 'EFICAS_TOOLS' : 'V9_9_0rc1' - 'ADAO' : 'V9_9_0rc1' - 'PARAVISADDONS' : 'V9_9_0rc1' - 'pmml' : 'V9_9_0rc1' - 'CEATESTBASE' : {tag: 'SalomeV9'} + 'ADAO' : 'V9_9_0rc2' + 'PARAVISADDONS' : 'V9_9_0rc2' + 'pmml' : 'V9_9_0rc2' + 'CEATESTBASE' : 'V9_9_0rc2' } profile : { diff --git a/applications/SALOME-9.9.0.pyconf b/applications/SALOME-9.9.0.pyconf index 2432687..4d37707 100644 --- a/applications/SALOME-9.9.0.pyconf +++ b/applications/SALOME-9.9.0.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.9.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_9_BR' + tag : 'V9_9_0rc2' dev : 'no' verbose :'no' debug : 'no' @@ -142,7 +142,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : 'V2_4_5' 'KERNEL' - 'MEDCOUPLING' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'V9_9_0rc2', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -157,7 +157,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_9_0rc2', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' @@ -170,16 +170,16 @@ APPLICATION : 'PYHELLO' 'EFICAS' : 'V9_9_0rc1' 'EFICAS_TOOLS' : 'V9_9_0rc1' - 'PY2CPP' : 'V9_9_0rc1' - 'ADAO' : 'V9_9_0rc1' - 'ADAO_INTERFACE' : 'V9_9_0rc1' - 'PARAVISADDONS' : 'V9_9_0rc1' + 'PY2CPP' : 'V9_9_0rc2' + 'ADAO' : 'V9_9_0rc2' + 'ADAO_INTERFACE' : 'V9_9_0rc2' + 'PARAVISADDONS' : 'V9_9_0rc2' 'OPENTURNS_SALOME' : 'V9_9_0rc1' - 'YDEFX' : 'V9_9_0rc1' - 'pmml' : 'V9_9_0rc1' - 'SOLVERLAB' : 'V9_9_0rc1' - 'TopIIVolMesh' : 'V9_9_0rc1' - 'CEATESTBASE' : {tag: 'SalomeV9'} + 'YDEFX' : 'V9_9_0rc2' + 'pmml' : 'V9_9_0rc2' + 'SOLVERLAB' : 'V9_9_0rc2' + 'TopIIVolMesh' : 'V9_9_0rc2' + 'CEATESTBASE' : 'V9_9_0rc2' } profile : { diff --git a/products/HOMARD.pyconf b/products/HOMARD.pyconf index b5e48e2..a7b7440 100644 --- a/products/HOMARD.pyconf +++ b/products/HOMARD.pyconf @@ -46,6 +46,12 @@ version_V9_9_0_MPI : opt_depend : ['openmpi'] } +version_V9_8_0_MPI : +{ + cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER} -DSALOME_USE_MPI=ON " + opt_depend : ['openmpi'] +} + version_gn_evol_01 : { patches : ['HOMARD_SMESH_SSL_support.patch'] -- 2.39.2