X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=applications%2FMEDCOUPLING-master-MPI.pyconf;h=b393ffd23bdc848600d9761a4e45f7c21aeef96c;hb=117f1a5cd6138c104d0ff11386ba81bf236334af;hp=7ff24443ea9ff393f6a7d17c15a56ff8bccc368d;hpb=6fa6a8e7ff8f96e52fe408062b6c04b35a762888;p=tools%2Fsat_salome.git diff --git a/applications/MEDCOUPLING-master-MPI.pyconf b/applications/MEDCOUPLING-master-MPI.pyconf index 7ff2444..b393ffd 100644 --- a/applications/MEDCOUPLING-master-MPI.pyconf +++ b/applications/MEDCOUPLING-master-MPI.pyconf @@ -13,12 +13,12 @@ APPLICATION : { build : { - CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" - SALOME_USE_64BIT_IDS : '1' + CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" + SALOME_USE_64BIT_IDS : '1' } launch : { - PYTHONIOENCODING:"UTF_8" + PYTHONIOENCODING:"UTF_8" } } products : @@ -43,7 +43,7 @@ APPLICATION : lapack : '3.8.0' libxml2 : '2.9.1' markupsafe : '0.23' - medfile : {tag : '4.1.0', hpc : 'yes', section : 'default_Autotools' } + medfile : {tag : '4.1.1', hpc : 'yes', section : 'default_Autotools' } mpi4py: '3.0.3' numpy : '1.15.1' openmpi : '3.1.6' @@ -69,7 +69,7 @@ APPLICATION : # SALOME MODULES : 'CONFIGURATION' - 'MEDCOUPLING' : {tag : 'abn/icoco2', section: 'default_MPI'} + 'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI_STD', hpc: 'yes'} # FIXME } test_base : { @@ -86,8 +86,13 @@ APPLICATION : } __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 - } + { + __condition__ : "VARS.dist in ['FD32', 'FD34']" + '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 + } + { + # https://github.com/pyenv/pyenv/issues/1889 + __condition__: "VARS.dist in ['FD34']" + 'APPLICATION.products.Python' : {tag: '3.6.5', base: 'no', section: 'version_3_6_5_FD34'} + } ]