From fb0cda84aaabbd7947dcad614d349c21b1cd507c Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 14 Oct 2021 14:55:30 +0200 Subject: [PATCH] align int-32 indices based build on int-64 build --- applications/MEDCOUPLING-master-int32.pyconf | 2 +- applications/SALOME-master-MPI.pyconf | 2 +- applications/SALOME-master-int32.pyconf | 97 ++++++-------------- applications/SALOME-master.pyconf | 2 +- products/CAS.pyconf | 36 ++++++++ products/MeshGems.pyconf | 1 - 6 files changed, 67 insertions(+), 73 deletions(-) diff --git a/applications/MEDCOUPLING-master-int32.pyconf b/applications/MEDCOUPLING-master-int32.pyconf index 382f80a..f7826e3 100644 --- a/applications/MEDCOUPLING-master-int32.pyconf +++ b/applications/MEDCOUPLING-master-int32.pyconf @@ -36,7 +36,7 @@ APPLICATION : lapack : '3.8.0' libxml2 : '2.9.1' markupsafe : '0.23' - medfile : '4.1.1rc1' + medfile : '4.1.1' metis : '5.1.0' numpy : '1.15.1' pockets : '0.6.2' diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index 5db2244..f324edb 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -31,7 +31,7 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.7.0' boost : '1.71.0' - CAS : {tag: '1e74e3eacd', section: 'version_V7_5_0'} + CAS : {tag: '1e74e3eacd', section: 'version_1e74e3eacd'} certifi : '2018.8.24' cgns : {tag : '4.1.1', hpc : 'yes'} chardet : '3.0.4' diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf index 3b4e742..b141fd4 100644 --- a/applications/SALOME-master-int32.pyconf +++ b/applications/SALOME-master-int32.pyconf @@ -27,10 +27,10 @@ APPLICATION : # PREREQUISITES : alabaster : '0.7.6' Babel : '2.7.0' - boost : '1.58.0' - CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'} + boost : '1.71.0' + CAS : {tag: '1e74e3eacd', section: 'version_1e74e3eacd'} certifi : '2018.8.24' - cgns : '3.3.1' + cgns : '4.1.1' chardet : '3.0.4' click : '6.7' cmake : '3.12.1' @@ -41,7 +41,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' gcc : '8.5.0' @@ -51,48 +51,52 @@ APPLICATION : gmsh : '4.8.4' graphviz : '2.38.0' hdf5 : '1.10.3' - homard_bin : '11.12_hdf51103med410' 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' libxml2 : '2.9.1' llvm : '8.0.1-clang' markupsafe : '0.23' - matplotlib : '2.2.2' - medfile : '4.1.1' + matplotlib : '3.0.3' + medfile : {section: 'default_Autotools', tag: '4.1.1'} mesa : '19.0.8' MeshGems : '2.13-1' metis : '5.1.0' - netgen : '5.3.1_with_CAS_7.2' + netgen : '6.2.2101' 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 : {tag : '5.8.0', section : 'version_5_8_0_int32'} + ParaView : '5.9.0' petsc : {tag : '3.15.0', section: 'version_3_15_0'} Pillow : '7.1.1' planegcs : '0.18-3cb6890' + 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' + rkCommon : '1.5.1' + root: '6.22.02' + salome_system : 'native' 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' @@ -101,18 +105,18 @@ APPLICATION : sphinxintl: '0.9.10' StaticMeshPlugin: '5.8.0' 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' 'SHAPER' 'SHAPERSTUDY' 'RESTRICTED' - 'LIBBATCH' : {tag :'V2_4_4'} + 'LIBBATCH' : {tag : 'V2_4_5'} 'KERNEL' 'MEDCOUPLING': {section: 'default_32BIT_IDS'} 'GUI' @@ -143,7 +147,7 @@ APPLICATION : 'PYHELLO' 'EFICAS' 'EFICAS_TOOLS' - 'PY2CPP' : {tag: 'v2.0'} + 'PY2CPP' 'ADAO' 'ADAO_INTERFACE' 'PARAVISADDONS' @@ -169,60 +173,15 @@ APPLICATION : repo_dev : "yes" pip : 'yes' pip_install_dir : 'python' - single_install_dir : "yes" + single_install_dir : "no" } } __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' - } - - { - # - __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 - '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'] - } - - { - # Adapt Paraview CMake files to be compliant with recent distributions - __condition__ : "VARS.dist in ['FD30', 'FD32', 'CO8']" - 'PRODUCTS.ParaView.version_5_8_0_int32.patches' : ['paraview.0010-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', - 'pv_coincident.patch' - ] + __condition__ : "VARS.dist in ['FD32']" + # https://github.com/scipy/scipy/issues/11611 + 'APPLICATION.products.scipy' : '1.5.2' } { __condition__ : "VARS.dist in ['FD30']" diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index c1a85a6..33f26ae 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -31,7 +31,7 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.7.0' boost : '1.71.0' - CAS : {tag: '1e74e3eacd', section: 'version_V7_5_0'} + CAS : {tag: '1e74e3eacd', section: 'version_1e74e3eacd'} certifi : '2018.8.24' cgns : '4.1.1' chardet : '3.0.4' diff --git a/products/CAS.pyconf b/products/CAS.pyconf index 6c4d2eb..5df952f 100755 --- a/products/CAS.pyconf +++ b/products/CAS.pyconf @@ -76,6 +76,42 @@ version_V7_5_0 : } } +version_1e74e3eacd : +{ + name : "CAS" + build_source : "cmake" + cmake_options : "-DUSE_TCL=OFF -DBUILD_MODULE_Draw=OFF -DUSE_FREETYPE=ON -D3RDPARTY_FREETYPE_DIR=$FREETYPEDIR -DUSE_FREEIMAGE=ON -D3RDPARTY_FREEIMAGE_DIR=$FREEIMAGEDIR" + get_source : "git" + #get_source : "archive" + git_info: + { + repo : "http://git.dev.opencascade.org/repos/occt.git" + repo_dev : $repo + } + environ : + { + CSF_ShadersDirectory : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "Shaders" + CSF_UnitsLexicon : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "UnitsAPI" + $VARS.sep + "Lexi_Expr.dat" + CSF_UnitsDefinition : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "UnitsAPI" + $VARS.sep + "Units.dat" + CSF_SHMessage : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "SHMessage" + CSF_XSMessage : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "XSMessage" + CSF_MDTVTexturesDirectory : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "Textures" + MMGT_REENTRANT : "1" + CSF_StandardDefaults : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "StdResource" + CSF_PluginDefaults : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "StdResource" + env_script : $name + ".py" + } + depend : ['freetype', 'freeimage'] + build_depend : ["cmake", "doxygen"] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name + install_dir : 'base' + properties: + { + incremental : "no" + } +} + version_1e74e3eacd_win : { name : "CAS" diff --git a/products/MeshGems.pyconf b/products/MeshGems.pyconf index 57b3d2b..986440f 100644 --- a/products/MeshGems.pyconf +++ b/products/MeshGems.pyconf @@ -53,7 +53,6 @@ version_2_13_1_win : licence : "libSalomeMeshGemsKeyGenerator" incremental : "yes" } - archive_info : {archive_name : "MeshGems_V2.13-1_windows.tar.gz"} } version_2_9_6 : -- 2.39.2