X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=applications%2FSALOME-9.7.0-int32.pyconf;h=5975d06c4a29c970ee85cd13b9c21d64762f0bf3;hb=e270e4d4a3ec653395de7090c52d2cadfcc62c81;hp=92ba73b873eb6d6941584b9b734d63fca4d23382;hpb=2fd386c62358f56b843cef22254f3f6978e713d9;p=tools%2Fsat_salome.git

diff --git a/applications/SALOME-9.7.0-int32.pyconf b/applications/SALOME-9.7.0-int32.pyconf
index 92ba73b..5975d06 100644
--- a/applications/SALOME-9.7.0-int32.pyconf
+++ b/applications/SALOME-9.7.0-int32.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-9.7.0-int32'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
-    tag : 'V9_7_0rc1'
+    tag : 'V9_7_0'
     dev : 'no'
     verbose :'no'
     debug : 'no'
@@ -17,10 +17,12 @@ 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
         }
         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 :
     {
@@ -28,7 +30,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.71.0'
-        CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
+        CAS : {tag: 'V7_5_0p1', section: 'version_V7_5_0'}
         certifi : '2018.8.24'
         cgns : '4.1.1'
         chardet : '3.0.4'
@@ -49,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'
@@ -67,19 +69,19 @@ APPLICATION :
         omniORB : '4.2.2'
         omniORBpy : '4.2.2'
         opencv : '3.2.0'
-        openssl : "native"
-        openturns : '1.16'
-        openVKL : '0.11.0'
+        openturns: '1.16'
+        openVKL: '0.11.0'
         ospray : '2.4.0'
         packaging : '17.1'
         ParaView : {tag : '5.9.0', section : 'version_5_9_0_int32'}
         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.15.3'
-        PyQtChart : '5.9'
+        #PyQtChart : '5.9'
         pyreadline : '2.0'
         Python : '3.6.5'
         pytz : '2015.7'
@@ -87,7 +89,8 @@ APPLICATION :
         qwt : '6.1.2'
         requests : '2.19.1'
         rkCommon : '1.5.1'
-        root : '6.22.02'
+        root: '6.22.02'
+        salome_system : 'native'
         scipy : '1.4.1'
         scotch : '6.0.4'
         setuptools : '38.4.0'
@@ -105,14 +108,13 @@ APPLICATION :
         tk : '8.6.0'
         urllib3 : '1.23'
         URANIE : '4.5.0'
-
         # SALOME MODULES :
         'CONFIGURATION'
         'SALOME'
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag :'V2_4_5rc1'}
+        'LIBBATCH' : {tag : 'V2_4_5'}
         'KERNEL'
         'MEDCOUPLING': {section: 'default_32BIT_IDS'}
         'GUI'
@@ -133,7 +135,7 @@ APPLICATION :
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
-        'SOLVERLAB' : {tag: 'master'}
+        'SOLVERLAB'
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'
@@ -175,54 +177,8 @@ 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'
-  }
-
-  {
-    #
-    __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',
-                                                 'paraview.0017-ParaView_protobuf_crash.patch'
-                                                ]
+   __condition__ : "VARS.dist in ['FD32']"
+   # https://github.com/scipy/scipy/issues/11611
+   'APPLICATION.products.scipy' : '1.5.2'
   }
 ]