From 292341a3f1daa8c40cf0b698b7936d409c1da6af Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 23 Oct 2023 16:52:02 +0200 Subject: [PATCH] move back to master branches --- applications/SALOME-master-native.pyconf | 20 +++++++++++--------- applications/SALOME-master-windows.pyconf | 4 ++-- applications/SALOME-master.pyconf | 9 +++++---- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 2d00b84..f2e9690 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-master-native' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_0a2' + tag : 'master' dev : 'no' verbose :'no' debug : 'no' @@ -145,7 +145,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : 'V2_5_0' 'KERNEL' - 'MEDCOUPLING' : {tag:'V9_12_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'abn/cpp_ptr', base: 'no', section: 'default_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -159,7 +159,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS': {tag:'V9_12_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' @@ -246,12 +246,14 @@ __overwrite__ : 'APPLICATION.products.scipy' : {tag: '1.5.2', base: 'no', section: 'version_1_5_2_no_pip' } # scipy >= 1.4 - system one too old 'APPLICATION.products.swig' : '4.0.2' 'APPLICATION.products.openmpi' : '4.1.5' + 'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} } { __condition__ : "VARS.dist in ['DB11']" 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.cminpack' : 'native' 'APPLICATION.products.PyFMI' : {tag:'2.6', base: 'no', section: 'version_2_6_no_pip'} + 'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} } { # CentOS 8 repositories don't include sphinxintl package which must be installed through pip. @@ -311,8 +313,8 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_FD37' } 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD37' } 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_FD37', hpc: 'yes'} - 'APPLICATION.products.CONFIGURATION' : {tag:'V9_12_0a2', base: 'no', section: 'default' } - 'APPLICATION.products.SHAPER' : {tag:'V9_12_0a2', base: 'no', section: 'default', hpc: 'no' } + 'APPLICATION.products.CONFIGURATION' : {tag:'master', base: 'no', section: 'default' } + 'APPLICATION.products.SHAPER' : {tag:'master', base: 'no', section: 'default', hpc: 'no' } } { @@ -331,9 +333,9 @@ __overwrite__ : 'APPLICATION.products.catalyst' : {tag: '2.0', base: 'no', section: 'version_2_0_FD38' } 'APPLICATION.products.gmsh' : {tag: '4.10.3', base: 'no', section: 'version_4_10_3_FD38' } 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_FD38', hpc: 'yes' } - 'APPLICATION.products.CONFIGURATION' : {tag:'V9_12_0a2', base: 'no', section: 'default' } - 'APPLICATION.products.SHAPER' : {tag:'V9_12_0a2', base: 'no', section: 'default', hpc: 'no' } - 'APPLICATION.products.NETGENPLUGIN' : {tag:'V9_12_0a2', base: 'no', section: 'version_V9_11_0_FD38' } - 'APPLICATION.products.YACS' : {tag:'V9_12_0a2', base: 'no', section: 'version_V9_11_0_FD38' } + 'APPLICATION.products.CONFIGURATION' : {tag:'master', base: 'no', section: 'default' } + 'APPLICATION.products.SHAPER' : {tag:'master', base: 'no', section: 'default', hpc: 'no' } + 'APPLICATION.products.NETGENPLUGIN' : {tag:'master', base: 'no', section: 'version_V9_11_0_FD38' } + 'APPLICATION.products.YACS' : {tag:'master', base: 'no', section: 'version_V9_11_0_FD38' } } ] diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index 5aa55e0..459badb 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -6,7 +6,7 @@ APPLICATION : name : 'SALOME-master' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name cmake_generator : 'Visual Studio 15 2017 Win64' - tag : 'V9_12_0a2' + tag : 'master' dev : 'no' verbose : 'no' debug : 'no' @@ -148,7 +148,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : {tag :'V2_5_0'} 'KERNEL' - 'MEDCOUPLING' + 'MEDCOUPLING': 'abn/cpp_ptr' 'GUI' 'GEOM' 'SMESH' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 9a26ec1..f0c74b2 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-master' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_0a2' + tag : 'master' dev : 'no' verbose :'no' debug : 'no' @@ -148,7 +148,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : 'V2_5_0' 'KERNEL' - 'MEDCOUPLING' : {tag:'V9_12_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'abn/cpp_ptr', base: 'no', section: 'default_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -162,7 +162,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_12_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' @@ -183,7 +183,7 @@ APPLICATION : 'YDEFX' 'pmml' 'SALOMEBOOTSTRAP' - 'SOLVERLAB' : {tag: 'V9_12_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'SOLVERLAB' : {tag: 'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' @@ -240,6 +240,7 @@ __overwrite__ : { __condition__ : "VARS.dist in ['DB09']" 'APPLICATION.products.openturns' : {tag: '1.21', base: 'no', section: 'version_1_21_DB09' } + 'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} } { __condition__ : "VARS.dist in ['UB18.04']" -- 2.39.2