From 411b868742f8a5e236feb2df4e557a743457e99e Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 7 Nov 2023 10:26:23 +0100 Subject: [PATCH] bos #38525: Append PYTHONPATH for PARAVIS: import MEDReader directly in VTK without paraview --- applications/SALOME-9.10.0-int32.pyconf | 2 +- applications/SALOME-9.10.0-native.pyconf | 2 +- applications/SALOME-9.10.0.pyconf | 2 +- applications/SALOME-9.11.0-int32.pyconf | 2 +- applications/SALOME-9.11.0-native.pyconf | 2 +- applications/SALOME-9.11.0.pyconf | 2 +- products/PARAVIS.pyconf | 43 ++++++++++++++++++++---- products/env_scripts/PARAVIS.py | 14 ++++++++ 8 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 products/env_scripts/PARAVIS.py diff --git a/applications/SALOME-9.10.0-int32.pyconf b/applications/SALOME-9.10.0-int32.pyconf index b3d5401..7184c62 100644 --- a/applications/SALOME-9.10.0-int32.pyconf +++ b/applications/SALOME-9.10.0-int32.pyconf @@ -161,7 +161,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_10_0', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_10_0', base: 'no', section: 'version_V9_10_0_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' diff --git a/applications/SALOME-9.10.0-native.pyconf b/applications/SALOME-9.10.0-native.pyconf index d7a3460..dd59af9 100644 --- a/applications/SALOME-9.10.0-native.pyconf +++ b/applications/SALOME-9.10.0-native.pyconf @@ -159,7 +159,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_10_0', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_10_0', base: 'no', section: 'version_V9_10_0_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' diff --git a/applications/SALOME-9.10.0.pyconf b/applications/SALOME-9.10.0.pyconf index fe6defc..42f3341 100644 --- a/applications/SALOME-9.10.0.pyconf +++ b/applications/SALOME-9.10.0.pyconf @@ -162,7 +162,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_10_0', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_10_0', base: 'no', section: 'version_V9_10_0_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' diff --git a/applications/SALOME-9.11.0-int32.pyconf b/applications/SALOME-9.11.0-int32.pyconf index 4b2523f..8579320 100644 --- a/applications/SALOME-9.11.0-int32.pyconf +++ b/applications/SALOME-9.11.0-int32.pyconf @@ -161,7 +161,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_11_0', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_11_0', base: 'no', section: 'version_V9_11_0_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' diff --git a/applications/SALOME-9.11.0-native.pyconf b/applications/SALOME-9.11.0-native.pyconf index 0938664..b1e76e7 100644 --- a/applications/SALOME-9.11.0-native.pyconf +++ b/applications/SALOME-9.11.0-native.pyconf @@ -159,7 +159,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS': {tag:'V9_11_0', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS': {tag:'V9_11_0', base: 'no', section: 'version_V9_11_0_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' diff --git a/applications/SALOME-9.11.0.pyconf b/applications/SALOME-9.11.0.pyconf index b8dbd9e..f210eb2 100644 --- a/applications/SALOME-9.11.0.pyconf +++ b/applications/SALOME-9.11.0.pyconf @@ -162,7 +162,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_11_0', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_11_0', base: 'no', section: 'version_V9_11_0_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' diff --git a/products/PARAVIS.pyconf b/products/PARAVIS.pyconf index 0fe6a29..8fd9adb 100644 --- a/products/PARAVIS.pyconf +++ b/products/PARAVIS.pyconf @@ -11,8 +11,9 @@ default : } environ : { - _PV_PLUGIN_PATH : $install_dir + $VARS.sep + "lib" + $VARS.sep + "paraview" + _PV_PLUGIN_PATH : $install_dir + $VARS.sep + "lib" + $VARS.sep + "paraview" SalomeAppConfig_ : $install_dir + $VARS.sep + "share" + $VARS.sep + "salome" + $VARS.sep + "resources" + $VARS.sep + "paravis" + env_script : "PARAVIS.py" } depend : [ "KERNEL", @@ -100,10 +101,31 @@ default_MPI : patches : [] } - -version_V9_7_0_to_V9_8_0 : +version_V9_11_0_MPI : { - cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DBUILD_TESTING=ON" + cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DSALOME_USE_MPI=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER} " + depend : [ + "KERNEL", + "GUI", + "MEDCOUPLING", + "FIELDS", + "GEOM", + "SMESH", + "Python", + "qt", + "boost", + "hdf5", + "medfile", + "ParaView", + "CAS", + "omniORB", + "docutils", + "libxml2", + "six", + "pytz", + "openmpi" + ] + patches : [] } version_V9_10_0_MPI : @@ -158,6 +180,10 @@ version_V9_9_0_MPI : "openmpi" ] } +version_V9_8_0 : +{ + cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DBUILD_TESTING=ON" +} version_V9_8_0_MPI : { @@ -185,6 +211,11 @@ version_V9_8_0_MPI : ] } +version_V9_7_0 : +{ + cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON -DBUILD_TESTING=ON" +} + version_V9_6_0 : { patches : ['PARAVIS-MEDLoaderForPV-64BITS_IDS.patch'] # port-back post-9.6.0 PARAVIS fix # bos #20444 @@ -219,12 +250,12 @@ version_V9_6_0_MPI : version_V9_4_0 : { - cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON " + cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON " } version_V9_3_0 : { - cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON " + cmake_options : "-DSALOME_PARAVIS_USE_GEOM_SOURCE=ON -DSALOME_PARAVIS_USE_SMESH_SOURCE=ON " } version_7_8_0_to_9_1_0 : diff --git a/products/env_scripts/PARAVIS.py b/products/env_scripts/PARAVIS.py new file mode 100644 index 0000000..368fbc7 --- /dev/null +++ b/products/env_scripts/PARAVIS.py @@ -0,0 +1,14 @@ +#!/usr/bin/env python +import os + +def set_env(env, prereq_dir, version): + fVersions =['V9_11_0', 'V9_10_0', 'V9_9_0', 'V9_8_0'] + fVersions+=['V9_7_0', 'V9_6_0', 'V9_5_0', 'V9_4_0'] + fVersions+=['V9_3_0', 'V9_2_1', 'V9_2_0', 'V9_1_0'] + fVersions+=['V8_5_0', 'V7_8_0', 'V6_6_0'] + if not version in fVersions: + pyver = 'python' + env.get('PYTHON_VERSION') + env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages')) + +def set_nativ_env(env): + pass -- 2.39.2