X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=applications%2FSALOME-master.pyconf;h=5f3ddc3bfac10a760d218c6eee522f92495a00ac;hb=d8a9b3e49127301d1843e489f1d79ccea0d83558;hp=a00547eef2fbc0ba357609fd724c2b7b630cd871;hpb=d4b4e237bb1d98a6722343a2ef0e1cd5ad09ba8d;p=tools%2Fsat_salome.git diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index a00547e..5f3ddc3 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -18,7 +18,7 @@ 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 + VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # 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 @@ -30,9 +30,9 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.7.0' boost : '1.58.0' - CAS : 'CR740-SALOME-PATCH' + CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'} certifi : '2018.8.24' - cgns : '3.3.1' + cgns : '4.1.1' chardet : '3.0.4' click : '6.7' cmake : '3.12.1' @@ -43,7 +43,7 @@ APPLICATION : docutils : '0.12' doxygen : '1.8.14' eigen : '3.3.4' - embree : '3.3.0' + embree : '3.12.2' freeimage : '3.16.0' freetype : '2.9.1' gmsh : '4.1.4' @@ -51,7 +51,7 @@ APPLICATION : hdf5 : '1.10.3' idna : '2.7' imagesize : '1.0.0' - ispc : '1.9.2' + ispc : '1.15.0' Jinja2 : '2.7.3' kiwisolver : '1.0.1' lapack : '3.8.0' @@ -64,46 +64,49 @@ APPLICATION : MeshGems : '2.12-1' metis : '5.1.0' netgen : '5.3.1_with_CAS_7.2' - nlopt : '2.4.2' - numpy : '1.15.1' + nlopt : '2.5.0' + numpy : '1.16.4' omniORB : '4.2.2' omniORBpy : '4.2.2' opencv : '3.2.0' openssl : "native" - ospray : '1.8.4' + openturns: '1.16' + openVKL: '0.11.0' + ospray : '2.4.0' packaging : '17.1' - ParaView : '5.8.0' + ParaView : '5.9.0' petsc : '3.14.0' Pillow : '7.1.1' planegcs : '0.18-3cb6890' - pockets : '0.6.2' + psutil : '5.7.2' Pygments : '2.0.2' pyparsing : '2.0.3' - PyQt : '5.9' - PyQtChart : '5.9' + PyQt : '5.15.3' + #PyQtChart : '5.9' pyreadline : '2.0' Python : '3.6.5' pytz : '2015.7' - qt : '5.9.1' + qt : '5.12.10' qwt : '6.1.2' requests : '2.19.1' - scipy : '0.19.1' + rkCommon : '1.5.1' + root: '6.22.02' + scipy : '1.4.1' scotch : '6.0.4' setuptools : '38.4.0' - sip : '4.19.3' + sip : '5.5.0' six : '1.10.0' snowballstemmer : '1.2.1' Sphinx : '1.7.6' - sphinxcontrib_napoleon : '0.6.1' sphinxcontrib_websupport : '1.1.0' sphinx_rtd_theme : '0.4.3' sphinxintl: '0.9.10' swig : '3.0.12' - tbb : 'native' + tbb : '2019_U8' tcl : '8.6.0' tk : '8.6.0' urllib3 : '1.23' - + URANIE : '4.5.0' # SALOME MODULES : 'CONFIGURATION' 'SALOME' @@ -125,13 +128,13 @@ APPLICATION : 'GMSHPLUGIN' 'HEXABLOCK' 'HEXABLOCKPLUGIN' - 'HOMARD' : {tag : 'gn/evol_01'} + 'HOMARD' 'FIELDS' 'PARAVIS' 'JOBMANAGER' 'YACS' 'YACSGEN' - 'SOLVERLAB' +# 'SOLVERLAB' 'DOCUMENTATION' 'SAMPLES' 'COMPONENT' @@ -144,7 +147,7 @@ APPLICATION : 'PY2CPP' : {tag: 'v2.0'} 'ADAO' 'ADAO_INTERFACE' - 'PARAVISADDONS' : {tag: 'spns/20440'} + 'PARAVISADDONS' 'CEATESTBASE' : {tag: 'SalomeV9'} } profile : @@ -173,74 +176,45 @@ APPLICATION : __overwrite__ : [ { - # GTK compilation issue - __condition__ : "VARS.dist in ['CO6']" - 'APPLICATION.products.opencv' : '2.4.13.5' - 'APPLICATION.products.tbb' : '4.4' - 'APPLICATION.products.llvm' : '3.9.1-clang' - 'APPLICATION.products.mesa' : '13.0.6' - 'PRODUCTS.embree.default.patches' : ['embree-3.5.2-centos6.patch'] - } - - { - # tbb as a mandatory native product since SMESH with tbb, not installed on DB8 (temporary) - __condition__ : "VARS.dist in ['DB08']" - 'APPLICATION.products.tbb' : '4.4' + # Dedicated builds to check new IMP SMESH 64bits support + __condition__ : "VARS.dist in ['FD32', 'FD30']" + 'APPLICATION.products.KERNEL' : {tag : 'occ/20256'} + 'PRODUCTS.KERNEL.default.cmake_options' : "-DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_USE_64BIT_IDS=ON" + 'APPLICATION.products.GUI' : {tag : 'occ/20256'} + 'APPLICATION.products.SMESH' : {tag : 'occ/20256'} + 'APPLICATION.products.HEXABLOCK' : {tag : 'occ/20256'} + 'PRODUCTS.HEXABLOCK.default.patches' : ['HEXABLOCK_occ20256.patch'] + 'APPLICATION.products.HEXABLOCKPLUGIN' : {tag : 'occ/20256'} + 'APPLICATION.products.NETGENPLUGIN' : {tag : 'occ/20256'} + 'APPLICATION.products.GHS3DPRLPLUGIN' : {tag : 'occ/20256'} + 'APPLICATION.products.GHS3DPLUGIN' : {tag : 'occ/20256'} + 'APPLICATION.products.GMSHPLUGIN' : {tag : 'occ/20256'} + 'APPLICATION.products.BLSURFPLUGIN' : {tag : 'occ/20256'} + 'APPLICATION.products.HexoticPLUGIN' : {tag : 'occ/20256'} + 'APPLICATION.products.HYBRIDPLUGIN' : {tag : 'occ/20256'} } - - { - # - __condition__ : "VARS.dist in ['FD26']" - 'APPLICATION.products.tbb' : '2017-7' - 'APPLICATION.products.embree' : '3.5.2' - } - - { - # - __condition__ : "VARS.dist in ['UB20.04']" - 'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch'] - } - { - __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 - # see https://bugs.gentoo.org/708730 + __condition__ : "VARS.dist in ['FD32']" + # https://github.com/scipy/scipy/issues/11611 + 'APPLICATION.products.scipy' : '1.5.2' + # https://bugs.gentoo.org/708730 : llvm 8.0.1 build issue with gcc/clang 10.X 'PRODUCTS.llvm.version_8_0_1_clang.patches' : ['llvm-8.0.1-clang-FD32.patch'] - 'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch', 'qt-5.9.1-mapbox-FD32.patch'] + # 'PRODUCTS.mesa.version_19_0_8.patches' : ['mesa-19.0.8-debug_symbol.patch'] + # + 'PRODUCTS.qt.version_5_12_10.patches' : ['qt-mapbox-FD32.patch'] } - { - __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', + __condition__ : "APPLICATION.debug == 'yes'" + # https://cplusplus.com/forum/general/250854 : DEBUG symbol is defined twice, need an additional patch + 'PRODUCTS.ParaView.version_5_9_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', - 'paraview-0012-LATA_64BITS_IDS.patch' - ] - } - - { - __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'TBB'" - 'APPLICATION.products.tbb' : '4.4' - } - - { - # Adapt Paraview CMake files to be compliant with recent distributions - __condition__ : "VARS.dist in ['FD30', 'FD32', 'CO8']" - 'PRODUCTS.ParaView.version_5_8_0.patches' : ['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.0010-ParaViewClient.patch', - 'paraview.0010-ParaView_find_python.patch', - 'pv_coincident.patch', - 'paraview-0012-LATA_64BITS_IDS.patch' - ] + 'paraview-0012-LATA_64BITS_IDS.patch', + 'ParaView-5.9.0-CATALYST_cmake.patch', + 'paraview.0008-ParaView_coincident_rendering.patch', + 'paraview.0015-Paraview_VTKM_ioss.patch'] } ]