From a156cd4c06c3c4cb1f177f07c57f42f1a0d45578 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 20 Dec 2023 13:35:49 +0100 Subject: [PATCH] Move back to V9_12_BR --- applications/MEDCOUPLING-9.12.0-MPI.pyconf | 6 ++--- applications/MEDCOUPLING-9.12.0-int32.pyconf | 2 +- applications/MEDCOUPLING-9.12.0-native.pyconf | 4 ++-- .../MEDCOUPLING-9.12.0-windows.pyconf | 2 +- applications/MEDCOUPLING-9.12.0.pyconf | 2 +- applications/SALOME-9.12.0-MPI.pyconf | 18 +++++++-------- applications/SALOME-9.12.0-int32.pyconf | 10 ++++----- applications/SALOME-9.12.0-native.pyconf | 22 +++++++++---------- applications/SALOME-9.12.0-windows.pyconf | 2 +- applications/SALOME-9.12.0.pyconf | 10 ++++----- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/applications/MEDCOUPLING-9.12.0-MPI.pyconf b/applications/MEDCOUPLING-9.12.0-MPI.pyconf index 86d1ee0..e58785e 100644 --- a/applications/MEDCOUPLING-9.12.0-MPI.pyconf +++ b/applications/MEDCOUPLING-9.12.0-MPI.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.12.0-MPI' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_0rc1' + tag : 'V9_12_BR' base : 'no' debug : 'no' python3 : 'yes' @@ -71,7 +71,7 @@ APPLICATION : # SALOME MODULES : 'CONFIGURATION' - 'MEDCOUPLING' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI_STD', hpc: 'yes'} # FIXME + 'MEDCOUPLING' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI_STD', hpc: 'yes'} # FIXME } test_base : { @@ -95,7 +95,7 @@ __overwrite__ : 'APPLICATION.products.scipy' : '1.5.2' } { - __condition__: "VARS.dist in ['FD34', 'FD36', 'FD37']" + __condition__: "VARS.dist in ['FD34', 'FD36', 'FD37', 'FD38']" # gcc https://github.com/scipy/scipy/issues/11611 # either patch numpy to include -fallow-argument-mismatch or move to that version 'APPLICATION.products.scipy' : '1.5.2' diff --git a/applications/MEDCOUPLING-9.12.0-int32.pyconf b/applications/MEDCOUPLING-9.12.0-int32.pyconf index 175a8ab..73b1262 100644 --- a/applications/MEDCOUPLING-9.12.0-int32.pyconf +++ b/applications/MEDCOUPLING-9.12.0-int32.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.12.0-int32' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_0rc1' + tag : 'V9_12_BR' base : 'no' debug : 'no' python3 : 'yes' diff --git a/applications/MEDCOUPLING-9.12.0-native.pyconf b/applications/MEDCOUPLING-9.12.0-native.pyconf index 339cae8..479450d 100644 --- a/applications/MEDCOUPLING-9.12.0-native.pyconf +++ b/applications/MEDCOUPLING-9.12.0-native.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.12.0-native' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_0rc1' + tag : 'V9_12_BR' base : 'no' debug : 'no' python3 : 'yes' @@ -69,7 +69,7 @@ APPLICATION : # SALOME MODULES : 'CONFIGURATION' - 'MEDCOUPLING' : {tag:'V9_12_0rc1', base:'no', section:'default_MPI', hpc:'yes'} + 'MEDCOUPLING' : {tag:'V9_12_BR', base:'no', section:'default_MPI', hpc:'yes'} } test_base : { diff --git a/applications/MEDCOUPLING-9.12.0-windows.pyconf b/applications/MEDCOUPLING-9.12.0-windows.pyconf index 17edbe7..0599ec2 100644 --- a/applications/MEDCOUPLING-9.12.0-windows.pyconf +++ b/applications/MEDCOUPLING-9.12.0-windows.pyconf @@ -6,7 +6,7 @@ APPLICATION : name : 'MEDCOUPLING-9.12.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name cmake_generator : 'Visual Studio 15 2017 Win64' - tag : 'V9_12_0rc1' + tag : 'V9_12_BR' debug : 'no' base : 'no' python3 : 'yes' diff --git a/applications/MEDCOUPLING-9.12.0.pyconf b/applications/MEDCOUPLING-9.12.0.pyconf index 0ed600b..5bba24a 100644 --- a/applications/MEDCOUPLING-9.12.0.pyconf +++ b/applications/MEDCOUPLING-9.12.0.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'MEDCOUPLING-9.12.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_0rc1' + tag : 'V9_12_BR' base : 'no' debug : 'no' python3 : 'yes' diff --git a/applications/SALOME-9.12.0-MPI.pyconf b/applications/SALOME-9.12.0-MPI.pyconf index 1890726..9794fcc 100644 --- a/applications/SALOME-9.12.0-MPI.pyconf +++ b/applications/SALOME-9.12.0-MPI.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.12.0-MPI' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_0rc1' + tag : 'V9_12_BR' dev : 'no' verbose :'no' debug : 'no' @@ -147,8 +147,8 @@ APPLICATION : 'SHAPERSTUDY' 'RESTRICTED' 'LIBBATCH' : 'V2_5_0' - 'KERNEL' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'} - 'MEDCOUPLING' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI_STD', hpc: 'yes', verbose: 'yes'} + 'KERNEL' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'} + 'MEDCOUPLING' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI_STD', hpc: 'yes', verbose: 'yes'} 'GUI' : {verbose : 'yes'} 'GEOM' 'SMESH' @@ -158,12 +158,12 @@ APPLICATION : 'HYBRIDPLUGIN' 'HexoticPLUGIN' 'GMSHPLUGIN' - 'HEXABLOCK' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'} + 'HEXABLOCK' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'} 'HEXABLOCKPLUGIN' - 'HOMARD' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'FIELDS' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'PARAVIS' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'JOBMANAGER': {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'HOMARD' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'FIELDS' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'JOBMANAGER': {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} 'YACS' 'YACSGEN' 'DOCUMENTATION' @@ -183,7 +183,7 @@ APPLICATION : 'YDEFX' 'pmml' 'SALOMEBOOTSTRAP' - 'SOLVERLAB' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'SOLVERLAB' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' diff --git a/applications/SALOME-9.12.0-int32.pyconf b/applications/SALOME-9.12.0-int32.pyconf index 3cbebd7..027af4f 100644 --- a/applications/SALOME-9.12.0-int32.pyconf +++ b/applications/SALOME-9.12.0-int32.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.12.0-int32' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_0rc1' + tag : 'V9_12_BR' dev : 'no' verbose :'no' debug : 'no' @@ -146,8 +146,8 @@ APPLICATION : 'SHAPERSTUDY' 'RESTRICTED' 'LIBBATCH' : 'V2_5_0' - 'KERNEL' : {tag:'V9_12_0rc1', base: 'no', section: 'default_32BIT_IDS', hpc: 'no' } - 'MEDCOUPLING' : {tag:'V9_12_0rc1', base: 'no', section: 'default_32BIT_IDS_MPI_STD', hpc: 'yes'} + 'KERNEL' : {tag:'V9_12_BR', base: 'no', section: 'default_32BIT_IDS', hpc: 'no' } + 'MEDCOUPLING' : {tag:'V9_12_BR', base: 'no', section: 'default_32BIT_IDS_MPI_STD', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -161,7 +161,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' @@ -182,7 +182,7 @@ APPLICATION : 'YDEFX' 'pmml' 'SALOMEBOOTSTRAP' - 'SOLVERLAB' : {tag: 'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'SOLVERLAB' : {tag: 'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' diff --git a/applications/SALOME-9.12.0-native.pyconf b/applications/SALOME-9.12.0-native.pyconf index 79ca126..72ec1b5 100644 --- a/applications/SALOME-9.12.0-native.pyconf +++ b/applications/SALOME-9.12.0-native.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.12.0-native' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_0rc1' + tag : 'V9_12_BR' dev : 'no' verbose :'no' debug : 'no' @@ -145,7 +145,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : 'V2_5_0' 'KERNEL' - 'MEDCOUPLING' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -159,7 +159,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS': {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS': {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' @@ -246,14 +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:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'APPLICATION.products.MEDCOUPLING' : {tag:'V9_12_BR', 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:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'APPLICATION.products.MEDCOUPLING' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} } { # CentOS 8 repositories don't include sphinxintl package which must be installed through pip. @@ -285,8 +285,8 @@ __overwrite__ : 'APPLICATION.products.statsmodels' : {tag: '0.6.1', base: 'no', section: 'version_0_6_1_no_pip' } 'APPLICATION.products.nose' : {tag: '1.3.7', base: 'no', section: 'version_1_3_7_no_pip' } 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO9', hpc: 'yes'} - 'APPLICATION.products.YDEFX' : {tag: 'V9_12_0rc1',base: 'no', section: 'version_V9_12_0_CO9' } - 'APPLICATION.products.YACS' : {tag: 'V9_12_0rc1',base: 'no',section: 'version_V9_12_0_CO9' } + 'APPLICATION.products.YDEFX' : {tag: 'V9_12_BR',base: 'no', section: 'version_V9_12_0_CO9' } + 'APPLICATION.products.YACS' : {tag: 'V9_12_BR',base: 'no',section: 'version_V9_12_0_CO9' } } { __condition__ : "VARS.dist in ['FD32']" @@ -334,8 +334,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_0rc1', base: 'no', section: 'default' } - 'APPLICATION.products.SHAPER' : {tag:'V9_12_0rc1', base: 'no', section: 'default', hpc: 'no' } + 'APPLICATION.products.CONFIGURATION' : {tag:'V9_12_BR', base: 'no', section: 'default' } + 'APPLICATION.products.SHAPER' : {tag:'V9_12_BR', base: 'no', section: 'default', hpc: 'no' } } { @@ -355,7 +355,7 @@ __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_0rc1', base: 'no', section: 'default' } - 'APPLICATION.products.SHAPER' : {tag:'V9_12_0rc1', base: 'no', section: 'default', hpc: 'no' } + 'APPLICATION.products.CONFIGURATION' : {tag:'V9_12_BR', base: 'no', section: 'default' } + 'APPLICATION.products.SHAPER' : {tag:'V9_12_BR', base: 'no', section: 'default', hpc: 'no' } } ] diff --git a/applications/SALOME-9.12.0-windows.pyconf b/applications/SALOME-9.12.0-windows.pyconf index 704a20c..cad38b5 100644 --- a/applications/SALOME-9.12.0-windows.pyconf +++ b/applications/SALOME-9.12.0-windows.pyconf @@ -6,7 +6,7 @@ APPLICATION : name : 'SALOME-9.12.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name cmake_generator : 'Visual Studio 15 2017 Win64' - tag : 'V9_12_0rc1' + tag : 'V9_12_BR' dev : 'no' verbose : 'no' debug : 'no' diff --git a/applications/SALOME-9.12.0.pyconf b/applications/SALOME-9.12.0.pyconf index 5270286..23ee66b 100644 --- a/applications/SALOME-9.12.0.pyconf +++ b/applications/SALOME-9.12.0.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.12.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_12_0rc1' + tag : 'V9_12_BR' dev : 'no' verbose :'no' debug : 'no' @@ -148,7 +148,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : 'V2_5_0' 'KERNEL' - 'MEDCOUPLING' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -162,7 +162,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' @@ -183,7 +183,7 @@ APPLICATION : 'YDEFX' 'pmml' 'SALOMEBOOTSTRAP' - 'SOLVERLAB' : {tag: 'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'SOLVERLAB' : {tag: 'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' @@ -240,7 +240,7 @@ __overwrite__ : { __condition__ : "VARS.dist in ['DB09']" 'APPLICATION.products.openturns' : {tag: '1.21', base: 'no', section: 'version_1_21_DB09' } - 'MEDCOUPLING' : {tag:'V9_12_0rc1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'V9_12_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} } { __condition__ : "VARS.dist in ['UB18.04']" -- 2.39.2