spns #13036 - add ParaView 5.8.0 standalone application and VTKM implementation type...

diff --git a/applications/ParaView-5.8.0.pyconf b/applications/ParaView-5.8.0.pyconf
new file mode 100644 (file)
index 0000000..f68a981
--- /dev/null
+++ b/applications/ParaView-5.8.0.pyconf
@@ -0,0 +1,170 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+APPLICATION :
+{
+    name : 'ParaView-5.8.0'
+    workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
+    tag : '5.8.0'
+    dev : 'no'
+    verbose :'no'
+    debug : 'no'
+    base : 'no'
+    python3 : 'yes'
+    environ :
+    {
+        build : 
+        {
+           CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
+           VTK_SMP_IMPLEMENTATION_TYPE : OpenMP
+        }
+        launch :
+        {
+            PYTHONIOENCODING:"UTF_8"
+        }
+        SALOME_trace : "local"
+    }
+    products :
+    {
+        # PREREQUISITES :
+        alabaster : '0.7.6'
+        Babel : '2.7.0'
+        boost : '1.58.0'
+        certifi : '2018.8.24'
+        cgns : '3.3.1'
+        chardet : '3.0.4'
+        click : '6.7'
+        cmake : '3.12.1'
+        cppunit : '1.13.2'
+        cycler : '0.10.0'
+        Cython : '0.25.2'
+        dateutil : '2.4.2'
+        docutils : '0.12'
+        doxygen : '1.8.14'
+        eigen : '3.3.4'
+        embree : '3.3.0'
+        freeimage : '3.16.0'
+        freetype : '2.9.1'
+        graphviz : '2.38.0'
+        hdf5 : '1.10.3'
+        idna : '2.7'
+        imagesize : '1.0.0'
+        ispc : '1.9.2'
+        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.0'
+        mesa : '19.0.8'
+        numpy : '1.15.1'
+        opencv : '3.2.0'
+        openssl : "native"
+        ospray : '1.8.4'
+        packaging : '17.1'
+        ParaView : '5.8.0'
+        Pillow : '7.1.1'
+        planegcs : '0.18-3cb6890'
+        pockets : '0.6.2'
+        Pygments : '2.0.2'
+        pyparsing : '2.0.3'
+        PyQt : '5.9'
+        pyreadline : '2.0'
+        Python : '3.6.5'
+        pytz : '2015.7'
+        qt : '5.9.1'
+        qwt : '6.1.2'
+        requests : '2.19.1'
+        scipy : '0.19.1'
+        setuptools : '38.4.0'
+        sip : '4.19.3'
+        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'
+        urllib3 : '1.23'
+
+        # SALOME MODULES :
+        'CONFIGURATION' : 'master'
+    }
+    profile :
+    {
+    }
+    test_base : 
+    {
+    }
+    properties :
+    {
+        repo_dev : "yes"
+        pip : 'yes'
+        pip_install_dir : 'python'
+        single_install_dir : "yes"
+    }
+}
+__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']
+    'PRODUCTS.ParaView.version_5_8_0.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 ['CO8']"
+    'PRODUCTS.ParaView.version_5_8_0.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'
+                                                ]
+  }
+]

diff --git a/products/compil_scripts/ParaView.sh b/products/compil_scripts/ParaView.sh
index 7816c571b977ed05ff18786f83228a57ff6533ff..959a954699f3193ee8f66075735af2dccfe0ae68 100755 (executable)
--- a/products/compil_scripts/ParaView.sh
+++ b/products/compil_scripts/ParaView.sh
@@ -95,6 +95,24 @@ then
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP -DVTKm_ENABLE_OPENMP=ON"
+elif [ -n "$VTK_SMP_IMPLEMENTATION_TYPE" ]
+then
+    echo "WARNING: VTK_SMP_IMPLEMENTATION_TYPE environment variable was found...."
+    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_MPI:BOOL=OFF"
+    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=`which g++`"
+    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=`which gcc`"
+    if [[ $VTK_SMP_IMPLEMENTATION_TYPE = "TBB" ]]
+    then
+        echo "WARNING: VTK_SMP_IMPLEMENTATION_TYPE was set to: TBB..."
+        CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_SMP_IMPLEMENTATION_TYPE=TBB -DVTKm_ENABLE_TBB:BOOL=ON"
+    elif [[ $VTK_SMP_IMPLEMENTATION_TYPE = "OpenMP" ]]
+    then
+        echo "WARNING: VTK_SMP_IMPLEMENTATION_TYPE was set to: OpenMP..."
+        CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP -DVTKm_ENABLE_OPENMP:BOOL=ON"
+    else
+        echo "ERROR: Unknown ${VTK_SMP_IMPLEMENTATION_TYPE} option.... aborting!"
+        exit 1
+    fi
 else
     echo "WARNING: MPI will not be supported!"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_MPI:BOOL=OFF"