From: Nabil Ghodbane Date: Tue, 29 Mar 2022 15:33:52 +0000 (+0200) Subject: ptscotch: as agreed between EDF/CEA use embedded version 6.1.2 for native builds... X-Git-Tag: V9_9_0~115 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e57afe5b5a17349fe7cc66fe9243e1e8284b9003;p=tools%2Fsat_salome.git ptscotch: as agreed between EDF/CEA use embedded version 6.1.2 for native builds as well. Add ROOT_SALOME_INSTALL environment variable for OPENTURNS_SALOME/PERSALYS --- diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index b2da229..ab2d0db 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -21,7 +21,12 @@ APPLICATION : VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches SALOME_GMSH_HEADERS_STD : '1' } - launch : {PYTHONIOENCODING:"UTF_8"} # alternative is to encode every accentued string with .encode('utf-8') + launch : + { + 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 SALOME_ACTOR_DELEGATE_TO_VTK : '1' @@ -111,7 +116,7 @@ APPLICATION : rkCommon : '1.5.1' root: '6.22.02' scipy : 'native' - scotch : {tag: 'native', section: 'version_6_1_2_MPI', hpc: 'yes', base: 'no'} + scotch : {tag: '6.1.2', section: 'version_6_1_2_MPI', hpc: 'yes', base: 'no'} setuptools : 'native' sip : 'native' six : 'native' @@ -235,7 +240,6 @@ __overwrite__ : 'APPLICATION.products.cminpack' : '1.3.6' 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } 'APPLICATION.products.statsmodels' : {tag: '0.6.1', base: 'no', section: 'version_0_6_1_no_pip' } - 'APPLICATION.products.scotch' : {tag:'6.1.2', base: 'no', section: 'version_6_1_2_MPI', hpc: 'yes' } } { __condition__ : "VARS.dist in ['FD32']" @@ -243,7 +247,6 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } 'APPLICATION.products.openturns' : {tag: '1.17', base: 'no', section: 'version_1_17_FD32' } 'APPLICATION.products.Sphinx' : {tag: '1.7.6', base: 'no', section: 'version_1_7_6_no_pip' } - 'APPLICATION.products.scotch' : {tag:'6.1.2', base: 'no', section: 'version_6_1_2_MPI', hpc: 'yes' } } { __condition__ : "VARS.dist in ['FD34']" @@ -253,6 +256,5 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } 'APPLICATION.products.root' : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34' } 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_FD34' } # spns #29324 - 'APPLICATION.products.scotch' : {tag:'6.1.2', base: 'no', section: 'version_6_1_2_MPI', hpc: 'yes' } } ] diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index a661321..96c5295 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -21,7 +21,12 @@ APPLICATION : 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"} + launch : + { + 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 SALOME_ACTOR_DELEGATE_TO_VTK : '1' diff --git a/products/compil_scripts/scotch-6.1.2.sh b/products/compil_scripts/scotch-6.1.2.sh index c23ae7a..e32a1fa 100755 --- a/products/compil_scripts/scotch-6.1.2.sh +++ b/products/compil_scripts/scotch-6.1.2.sh @@ -40,13 +40,15 @@ then exit 2 fi -DO_CHECK=1 -LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" -case $LINUX_DISTRIBUTION in - CO*|FD*) - DO_CHECK=0 - ;; -esac +# TODO: Open ARTIFACT +DO_CHECK=0 +# DO_CHECK=1 +# LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" +# case $LINUX_DISTRIBUTION in +# CO*|FD*) +# DO_CHECK=0 +# ;; +# esac if [ $DO_CHECK -eq 1 ]; then echo