From b5d921e359fb7906ad260847fd6409961d975903 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 30 May 2022 12:31:10 +0200 Subject: [PATCH] align SALOME-master on SALOME 9.9.0 --- applications/MEDCOUPLING-9.9.0-MPI.pyconf | 17 ++++- applications/SALOME-9.9.0-MPI.pyconf | 5 +- applications/SALOME-master-MPI.pyconf | 22 ++++--- applications/SALOME-master-int32.pyconf | 79 +++++++++++++++++------ applications/SALOME-master-native.pyconf | 16 ++--- applications/SALOME-master-windows.pyconf | 7 +- applications/SALOME-master.pyconf | 20 +++--- 7 files changed, 106 insertions(+), 60 deletions(-) diff --git a/applications/MEDCOUPLING-9.9.0-MPI.pyconf b/applications/MEDCOUPLING-9.9.0-MPI.pyconf index 945254c..f484cc8 100644 --- a/applications/MEDCOUPLING-9.9.0-MPI.pyconf +++ b/applications/MEDCOUPLING-9.9.0-MPI.pyconf @@ -87,12 +87,23 @@ APPLICATION : __overwrite__ : [ { - __condition__ : "VARS.dist in ['FD32', 'FD34', 'DB11']" - '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 + __condition__ : "VARS.dist in ['FD32']" + # 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' } { - # https://github.com/pyenv/pyenv/issues/1889 __condition__: "VARS.dist in ['FD34']" + # 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' + # https://github.com/pyenv/pyenv/issues/1889 'APPLICATION.products.Python' : {tag: '3.6.5', base: 'no', section: 'version_3_6_5_FD34'} } + { + __condition__ : "VARS.dist in ['DB11']" + # 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/SALOME-9.9.0-MPI.pyconf b/applications/SALOME-9.9.0-MPI.pyconf index f33a839..7c335d6 100644 --- a/applications/SALOME-9.9.0-MPI.pyconf +++ b/applications/SALOME-9.9.0-MPI.pyconf @@ -207,8 +207,9 @@ APPLICATION : __overwrite__ : [ { - __condition__ : "VARS.dist in ['FD32']" - # https://github.com/scipy/scipy/issues/11611 + __condition__ : "VARS.dist in ['FD32', 'FD34', 'DB11']" + # 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/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index 7bd02c4..3fc83aa 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -25,6 +25,7 @@ APPLICATION : { PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH" + ROOT_SALOME_INSTALL: '$PRODUCT_ROOT_DIR' } SALOME_trace : "local" # local/file:.../with_logger SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER" # specify the first modules to display in gui @@ -78,7 +79,7 @@ APPLICATION : mpi4py: '3.0.3' ParMetis : '3.1.1' netgen : '5.3.1_with_CAS_7.2' - # comment out above line and uncomment the line below to use Netgen 6. + # comment out line above and uncomment the line below to use Netgen 6. #netgen : '6.2.2101' netcdf : {tag : '4.6.2', hpc : 'yes'} nlopt : '2.5.0' @@ -97,7 +98,7 @@ APPLICATION : patsy : '0.5.2' ParaView : {tag:'5.9.0', base: 'no', section: 'version_5_9_0_MPI', hpc: 'yes'} PERSALYS: 'v12.0' - petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'} + petsc : {tag : '3.16.0', hpc: 'yes'} Pillow : '7.1.1' planegcs : '0.18-3cb6890' psutil : '5.7.2' @@ -130,7 +131,6 @@ APPLICATION : tbb : '2019_U8' tcl : '8.6.0' tk : '8.6.0' - TopIIVolMesh: 'master' urllib3 : '1.23' zeromq: '4.3.1' URANIE : '4.5.0' @@ -140,7 +140,7 @@ APPLICATION : 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' : {tag : 'V2_4_5'} + 'LIBBATCH' : 'V2_4_5' 'KERNEL' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'} 'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI_STD', hpc: 'yes', verbose: 'yes'} 'GUI' : {verbose : 'yes'} @@ -157,12 +157,10 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'FIELDS' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'OPENTURNS_SALOME' 'PARAVIS' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'YACS' 'YACSGEN' - 'SOLVERLAB': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'DOCUMENTATION' 'SAMPLES' 'COMPONENT' @@ -176,10 +174,13 @@ APPLICATION : 'ADAO' 'ADAO_INTERFACE' 'PARAVISADDONS' + 'OPENTURNS_SALOME' 'YDEFX' 'pmml' - 'TESTBASE': {tag: 'master'} - 'CEATESTBASE' : {tag: 'SalomeV9'} + 'SOLVERLAB': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'TopIIVolMesh' + 'TESTBASE' + 'CEATESTBASE' : 'SalomeV9' } profile : { @@ -207,8 +208,9 @@ APPLICATION : __overwrite__ : [ { - __condition__ : "VARS.dist in ['FD32']" - # https://github.com/scipy/scipy/issues/11611 + __condition__ : "VARS.dist in ['FD32', 'FD34', 'DB11']" + # 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/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf index ec5dba4..7ebdb6f 100644 --- a/applications/SALOME-master-int32.pyconf +++ b/applications/SALOME-master-int32.pyconf @@ -17,11 +17,17 @@ APPLICATION : { CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED" + VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches + SALOME_GMSH_HEADERS_STD : '1' + } + launch : + { + PYTHONIOENCODING:"UTF_8", + SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH" + ROOT_SALOME_INSTALL: '$PRODUCT_ROOT_DIR' } - launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"} SALOME_trace : "local" # local/file:.../with_logger SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER" # specify the first modules to display in gui - SALOME_ACTOR_DELEGATE_TO_VTK : '1' } products : { @@ -29,9 +35,10 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.7.0' boost : '1.71.0' - CAS : 'V7_5_3p1' + CAS : 'V7_5_3p2' + C3PO: 'v2.0' certifi : '2018.8.24' - cgns : '4.1.1' + cgns : '4.2.0' chardet : '3.0.4' click : '6.7' cmake : '3.12.1' @@ -51,6 +58,7 @@ APPLICATION : mpc : 'native' gmp : 'native' mpfr : 'native' + gdal : '2.4.0' gmsh : '4.8.4' graphviz : '2.38.0' hdf5 : '1.10.3' @@ -64,23 +72,31 @@ APPLICATION : llvm : '8.0.1-clang' markupsafe : '0.23' matplotlib : '3.0.3' - medfile : {section: 'default_Autotools', tag: '4.1.1'} + medfile : '4.1.1' mesa : '19.0.8' MeshGems : '2.14-4' + mpi4py: '3.0.3' metis : '5.1.0' - netgen : '6.2.2101' + netgen : '5.3.1_with_CAS_7.2' + # comment out line above and uncomment the line below to use Netgen 6. + #netgen : '6.2.2101' + netcdf : '4.6.2' nlopt : '2.5.0' + nose: '1.3.7' numpy : '1.16.4' + numpydoc : '0.9.0' omniORB : '4.2.2' omniORBpy : '4.2.2' opencv : '3.2.0' - openturns: '1.17' + openmpi : '3.1.6' + openturns: '1.18' openVKL: '0.11.0' ospray : '2.4.0' packaging : '17.1' pandas : '0.25.2' patsy : '0.5.2' - ParaView : '5.9.0' + ParaView : {tag:'5.9.0', base: 'no', section: 'version_5_9_0_MPI', hpc: 'yes'} + PERSALYS: 'v12.0' petsc : {tag : '3.16.0', section: 'version_3_16_0'} Pillow : '7.1.1' planegcs : '0.18-3cb6890' @@ -89,7 +105,6 @@ APPLICATION : Pygments : '2.0.2' pyparsing : '2.0.3' PyQt : '5.15.3' - #PyQtChart : '5.9' pyreadline : '2.0' Python : '3.6.5' pytz : '2017.2' @@ -100,7 +115,7 @@ APPLICATION : root: '6.22.02' salome_system : 'native' scipy : '1.4.1' - scotch : '6.0.4' + scotch : {tag: '6.1.2', section: 'version_6_1_2_MPI', hpc: 'yes', base: 'no'} setuptools : '38.4.0' sip : '5.5.0' six : '1.10.0' @@ -116,6 +131,7 @@ APPLICATION : tcl : '8.6.0' tk : '8.6.0' urllib3 : '1.23' + zeromq: '4.3.1' URANIE : '4.5.0' # SALOME MODULES : 'CONFIGURATION' @@ -123,9 +139,9 @@ APPLICATION : 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' : {tag : 'V2_4_5'} + 'LIBBATCH' : 'V2_4_5' 'KERNEL' - 'MEDCOUPLING': {section: 'default_32BIT_IDS'} + 'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_32BIT_IDS', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -140,11 +156,10 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' + 'PARAVIS' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' - 'SOLVERLAB' 'DOCUMENTATION' 'SAMPLES' 'COMPONENT' @@ -158,9 +173,13 @@ APPLICATION : 'ADAO' 'ADAO_INTERFACE' 'PARAVISADDONS' + 'OPENTURNS_SALOME' 'YDEFX' - 'TESTBASE': {tag: 'master'} - 'CEATESTBASE' : {tag: 'SalomeV9'} + 'pmml' + 'SOLVERLAB' + 'TopIIVolMesh' + 'TESTBASE' + 'CEATESTBASE' : 'SalomeV9' } profile : { @@ -187,18 +206,38 @@ APPLICATION : } __overwrite__ : [ + { + __condition__ : "VARS.dist in ['FD30']" + 'APPLICATION.products.gcc' : '9.3.0' + } { __condition__ : "VARS.dist in ['FD32']" # https://github.com/scipy/scipy/issues/11611 'APPLICATION.products.scipy' : '1.5.2' + 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] + 'APPLICATION.products.gdal': {tag:'2.4.0', base: 'no', section: 'version_2_4_0_FD32'} # spns #29324 } { - __condition__ : "VARS.dist in ['FD30']" - # https://github.com/scipy/scipy/issues/11611 - 'APPLICATION.products.gcc' : '9.3.0' + __condition__ : "VARS.dist in ['CO7']" + 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] + } + { + __condition__ : "VARS.dist in ['CO8']" + 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr', 'zeromq'] + 'APPLICATION.products.gdal': {tag:'2.4.0', base: 'no', section: 'version_2_4_0_CO8'} # spns #29324 + } + { + __condition__ : "VARS.dist in ['DB10']" + 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] + 'APPLICATION.products.gdal': {tag:'2.4.0', base: 'no', section: 'version_2_4_0_DB10'} # spns #29324 + } + { + __condition__ : "VARS.dist in ['UB18.04']" + 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] } { - __condition__ : "VARS.dist not in ['DB08','DB09', 'FD30']" + __condition__ : "VARS.dist in ['UB20.04']" 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] + 'APPLICATION.products.gdal': {tag:'2.4.0', base: 'no', section: 'version_2_4_0_UB20_04'} # spns #29324 } ] diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 7500ff0..3b5045e 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -24,7 +24,7 @@ APPLICATION : launch : { PYTHONIOENCODING:"UTF_8", - SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH", + SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH" ROOT_SALOME_INSTALL: '$PRODUCT_ROOT_DIR' } SALOME_trace : "local" # local/file:.../with_logger @@ -58,13 +58,11 @@ APPLICATION : freetype : 'native' gl2ps : 'native' gdal : 'native' - # 'native' too difficult here : need python-pip package (gmsh-sdk) besides system packages gmsh : '4.8.4' graphviz : 'native' hdf5 : '1.10.3' idna : 'native' imagesize : 'native' - # 'native' not exists (only available on Fedora platform) ispc : '1.15.0' Jinja2 : 'native' kiwisolver : 'native' @@ -130,7 +128,6 @@ APPLICATION : tbb : 'native' tcl : 'native' tk : 'native' - TopIIVolMesh urllib3 : 'native' zeromq: '4.3.1' URANIE : '4.5.0' @@ -158,12 +155,10 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'OPENTURNS_SALOME' 'PARAVIS': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' - 'SOLVERLAB' 'DOCUMENTATION' 'SAMPLES' 'COMPONENT' @@ -177,10 +172,13 @@ APPLICATION : 'ADAO' 'ADAO_INTERFACE' 'PARAVISADDONS' + 'OPENTURNS_SALOME' 'YDEFX' 'pmml' - 'TESTBASE': {tag: 'master'} - 'CEATESTBASE' : {tag: 'SalomeV9'} + 'SOLVERLAB' + 'TopIIVolMesh' + 'TESTBASE' + 'CEATESTBASE' : 'SalomeV9' } profile : { @@ -255,10 +253,8 @@ __overwrite__ : __condition__ : "VARS.dist in ['FD34']" 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.qwt' : '6.1.6' - 'APPLICATION.products.swig' : '3.0.12' 'APPLICATION.products.omniORB' : '4.2.4' 'APPLICATION.products.omniORBpy' : '4.2.4' - 'APPLICATION.products.PyQt' : '5.15.3' 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } 'APPLICATION.products.openturns' : {tag: '1.18', base: 'no', section: 'version_1_18_FD34' } 'APPLICATION.products.root' : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34' } diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index ed79203..0b995c4 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -76,10 +76,11 @@ APPLICATION : matplotlib : '3.1.0' medfile : '4.1.1' mesa : '19.2.3' - MeshGems : '2.13-1' # FIXME: to be removed once CEA License for 2.14-4 is renewed. + MeshGems : '2.14-4' metis : '5.1.0' msvc : '2017' netgen : '5.3.1_with_CAS_7.2' + # comment out line above and uncomment the line below to use Netgen 6. #netgen : '6.2.2101' nlopt : '2.5.0' numpy : '1.16.4' @@ -168,8 +169,8 @@ APPLICATION : 'ADAO' 'PARAVISADDONS' 'pmml' - 'TESTBASE': {tag: 'master'} - 'CEATESTBASE' : {tag: 'SalomeV9'} + 'TESTBASE' + 'CEATESTBASE' : 'SalomeV9' } profile : { diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index d28b801..be070cc 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -57,7 +57,6 @@ APPLICATION : freetype : '2.9.1' gcc : '8.5.0' mpc : 'native' - mpi4py: '3.0.3' gmp : 'native' mpfr : 'native' gdal : '2.4.0' @@ -77,8 +76,10 @@ APPLICATION : medfile : '4.1.1' mesa : '19.0.8' MeshGems : '2.14-4' + mpi4py: '3.0.3' metis : '5.1.0' netgen : '5.3.1_with_CAS_7.2' + # comment out line above and uncomment the line below to use Netgen 6. #netgen : '6.2.2101' netcdf : '4.6.2' nlopt : '2.5.0' @@ -130,7 +131,6 @@ APPLICATION : tbb : '2019_U8' tcl : '8.6.0' tk : '8.6.0' - TopIIVolMesh urllib3 : '1.23' zeromq: '4.3.1' URANIE : '4.5.0' @@ -140,7 +140,7 @@ APPLICATION : 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' : {tag : 'V2_4_5'} + 'LIBBATCH' : 'V2_4_5' 'KERNEL' 'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'GUI' @@ -157,12 +157,10 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'OPENTURNS_SALOME' 'PARAVIS' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' - 'SOLVERLAB' 'DOCUMENTATION' 'SAMPLES' 'COMPONENT' @@ -176,10 +174,13 @@ APPLICATION : 'ADAO' 'ADAO_INTERFACE' 'PARAVISADDONS' + 'OPENTURNS_SALOME' 'YDEFX' 'pmml' - 'TESTBASE': {tag: 'master'} - 'CEATESTBASE' : {tag: 'SalomeV9'} + 'SOLVERLAB' + 'TopIIVolMesh' + 'TESTBASE' + 'CEATESTBASE' : 'SalomeV9' } profile : { @@ -240,9 +241,4 @@ __overwrite__ : 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] 'APPLICATION.products.gdal': {tag:'2.4.0', base: 'no', section: 'version_2_4_0_UB20_04'} # spns #29324 } - - { - __condition__ : "VARS.dist not in ['DB09', 'DB10', 'DB11']" - 'APPLICATION.products.MeshGems' : '2.13-1' - } ] -- 2.39.2