From f95ece3d61d48d818218b5e3bd19c75bd628a453 Mon Sep 17 00:00:00 2001 From: Quentin Cozette Date: Mon, 12 Oct 2020 17:17:55 +0200 Subject: [PATCH] Use 64bits as default master configuration for both MEDCOUPLING and SALOME (master-int64 -> master-int32 specific one) --- ...pyconf => MEDCOUPLING-master-int32.pyconf} | 24 ++++++++-------- applications/MEDCOUPLING-master.pyconf | 22 +++++++-------- ...nt64.pyconf => SALOME-master-int32.pyconf} | 28 +++---------------- applications/SALOME-master.pyconf | 26 +++++++++++++++-- 4 files changed, 50 insertions(+), 50 deletions(-) rename applications/{MEDCOUPLING-master-int64.pyconf => MEDCOUPLING-master-int32.pyconf} (76%) rename applications/{SALOME-master-int64.pyconf => SALOME-master-int32.pyconf} (82%) diff --git a/applications/MEDCOUPLING-master-int64.pyconf b/applications/MEDCOUPLING-master-int32.pyconf similarity index 76% rename from applications/MEDCOUPLING-master-int64.pyconf rename to applications/MEDCOUPLING-master-int32.pyconf index aefa8c0..115c31b 100644 --- a/applications/MEDCOUPLING-master-int64.pyconf +++ b/applications/MEDCOUPLING-master-int32.pyconf @@ -3,7 +3,7 @@ APPLICATION : { - name : 'MEDCOUPLING-master-int64' + name : 'MEDCOUPLING-master-int32' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist tag : 'master' base : 'no' @@ -11,15 +11,8 @@ APPLICATION : python3 : 'yes' environ : { - build : - { - CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" - SALOME_USE_64BIT_IDS : '1' - } - launch : - { - PYTHONIOENCODING:"UTF_8" - } + build : {CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"} + launch : {PYTHONIOENCODING:"UTF_8"} } products : { @@ -43,7 +36,7 @@ APPLICATION : lapack : '3.8.0' libxml2 : '2.9.1' markupsafe : '0.23' - medfile : {section: 'default_Autotools', tag: '4.1.0'} + medfile : '4.1.0' metis : '5.1.0' numpy : '1.15.1' pockets : '0.6.2' @@ -67,7 +60,7 @@ APPLICATION : # SALOME MODULES : 'CONFIGURATION' - 'MEDCOUPLING' : {tag : 'master', section: 'default_int64'} + 'MEDCOUPLING' } test_base : { @@ -82,3 +75,10 @@ APPLICATION : single_install_dir : "no" } } +__overwrite__ : +[ + { + __condition__ : "VARS.dist in ['FD32']" + 'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version + } +] diff --git a/applications/MEDCOUPLING-master.pyconf b/applications/MEDCOUPLING-master.pyconf index 9b1e944..3932410 100644 --- a/applications/MEDCOUPLING-master.pyconf +++ b/applications/MEDCOUPLING-master.pyconf @@ -11,8 +11,15 @@ APPLICATION : python3 : 'yes' environ : { - build : {CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"} - launch : {PYTHONIOENCODING:"UTF_8"} + build : + { + CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" + SALOME_USE_64BIT_IDS : '1' + } + launch : + { + PYTHONIOENCODING:"UTF_8" + } } products : { @@ -36,7 +43,7 @@ APPLICATION : lapack : '3.8.0' libxml2 : '2.9.1' markupsafe : '0.23' - medfile : '4.1.0' + medfile : {section: 'default_Autotools', tag: '4.1.0'} metis : '5.1.0' numpy : '1.15.1' pockets : '0.6.2' @@ -60,7 +67,7 @@ APPLICATION : # SALOME MODULES : 'CONFIGURATION' - 'MEDCOUPLING' + 'MEDCOUPLING' : {tag : 'master', section: 'default_int64'} } test_base : { @@ -75,10 +82,3 @@ APPLICATION : single_install_dir : "no" } } -__overwrite__ : -[ - { - __condition__ : "VARS.dist in ['FD32']" - 'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version - } -] diff --git a/applications/SALOME-master-int64.pyconf b/applications/SALOME-master-int32.pyconf similarity index 82% rename from applications/SALOME-master-int64.pyconf rename to applications/SALOME-master-int32.pyconf index 97c8a7e..a3a196b 100644 --- a/applications/SALOME-master-int64.pyconf +++ b/applications/SALOME-master-int32.pyconf @@ -3,7 +3,7 @@ APPLICATION : { - name : 'SALOME-master-int64' + name : 'SALOME-master-int32' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist tag : 'master' dev : 'no' @@ -17,8 +17,6 @@ APPLICATION : { CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED" - SALOME_USE_64BIT_IDS : '1' - VTK_SMP_IMPLEMENTATION_TYPE : sequential # OpenMP # choose among: sequential / OpenMP / TBB switches } launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"} SALOME_trace : "local" # local/file:.../with_logger @@ -60,7 +58,7 @@ APPLICATION : llvm : '8.0.1-clang' markupsafe : '0.23' matplotlib : '2.2.2' - medfile : {section: 'default_Autotools', tag: '4.1.0'} + medfile : '4.1.0' mesa : '19.0.8' MeshGems : '2.11-5' metis : '5.1.0' @@ -113,7 +111,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : {tag :'V2_4_3'} 'KERNEL' - 'MEDCOUPLING' : {tag : 'master', section: 'default_int64'} # this will trigger other modules as int64 + 'MEDCOUPLING' 'GUI' 'GEOM' 'SMESH' @@ -132,7 +130,7 @@ APPLICATION : 'JOBMANAGER' 'YACS' 'YACSGEN' -# 'SOLVERLAB' + 'SOLVERLAB' 'DOCUMENTATION' 'SAMPLES' 'COMPONENT' @@ -218,24 +216,6 @@ __overwrite__ : ] } - { - __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'OpenMP'" - 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0003-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', - 'paraview.0011-vtkSMPSelection.patch', - 'pv_coincident.patch' - ] - } - - { - __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'TBB'" - 'APPLICATION.products.tbb' : '4.4' - } - { __condition__ : "VARS.dist in ['CO8']" 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch', diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index e163b40..0ca76ef 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -17,6 +17,8 @@ APPLICATION : { CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED" + SALOME_USE_64BIT_IDS : '1' + VTK_SMP_IMPLEMENTATION_TYPE : sequential # OpenMP # choose among: sequential / OpenMP / TBB switches } launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"} SALOME_trace : "local" # local/file:.../with_logger @@ -58,7 +60,7 @@ APPLICATION : llvm : '8.0.1-clang' markupsafe : '0.23' matplotlib : '2.2.2' - medfile : '4.1.0' + medfile : {section: 'default_Autotools', tag: '4.1.0'} mesa : '19.0.8' MeshGems : '2.11-5' metis : '5.1.0' @@ -111,7 +113,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : {tag :'V2_4_3'} 'KERNEL' - 'MEDCOUPLING' + 'MEDCOUPLING' : {tag : 'master', section: 'default_int64'} # this will trigger other modules as int64 'GUI' 'GEOM' 'SMESH' @@ -130,7 +132,7 @@ APPLICATION : 'JOBMANAGER' 'YACS' 'YACSGEN' - 'SOLVERLAB' +# 'SOLVERLAB' 'DOCUMENTATION' 'SAMPLES' 'COMPONENT' @@ -216,6 +218,24 @@ __overwrite__ : ] } + { + __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'OpenMP'" + 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0003-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', + 'paraview.0011-vtkSMPSelection.patch', + 'pv_coincident.patch' + ] + } + + { + __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'TBB'" + 'APPLICATION.products.tbb' : '4.4' + } + { __condition__ : "VARS.dist in ['CO8']" 'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch', -- 2.39.2