From c24828f10fb4e9414941d353b41b489039f5135d Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 26 Sep 2024 21:40:55 +0200 Subject: [PATCH] spns #43062: new key break V9_11_0, V9_12_0 and V9_13_0 PARAVIS tags --- applications/SALOME-9.12.0-MPI.pyconf | 2 +- applications/SALOME-9.12.0-int32.pyconf | 2 +- applications/SALOME-9.12.0.pyconf | 2 +- applications/SALOME-9.13.0-MPI.pyconf | 2 +- applications/SALOME-9.13.0-int32.pyconf | 2 +- applications/SALOME-9.13.0.pyconf | 4 +- products/PARAVIS.pyconf | 71 +++++++++++++++++++++++++ 7 files changed, 78 insertions(+), 7 deletions(-) diff --git a/applications/SALOME-9.12.0-MPI.pyconf b/applications/SALOME-9.12.0-MPI.pyconf index 42315bc..edbcde1 100644 --- a/applications/SALOME-9.12.0-MPI.pyconf +++ b/applications/SALOME-9.12.0-MPI.pyconf @@ -162,7 +162,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' : {tag:'V9_12_0', base: 'no', section: 'default_MPI', hpc: 'yes'} 'FIELDS' : {tag:'V9_12_0', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'PARAVIS' : {tag:'V9_12_0', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_12_0', base: 'no', section: 'version_V9_12_0_MPI', hpc: 'yes'} 'JOBMANAGER': {tag:'V9_12_0', base: 'no', section: 'default_MPI', hpc: 'yes'} 'YACS' 'YACSGEN' diff --git a/applications/SALOME-9.12.0-int32.pyconf b/applications/SALOME-9.12.0-int32.pyconf index e245204..f05dbf6 100644 --- a/applications/SALOME-9.12.0-int32.pyconf +++ b/applications/SALOME-9.12.0-int32.pyconf @@ -161,7 +161,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_12_0', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_12_0', base: 'no', section: 'version_V9_12_0_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' diff --git a/applications/SALOME-9.12.0.pyconf b/applications/SALOME-9.12.0.pyconf index 07d32aa..3b120d4 100644 --- a/applications/SALOME-9.12.0.pyconf +++ b/applications/SALOME-9.12.0.pyconf @@ -162,7 +162,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_12_0', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_12_0', base: 'no', section: 'version_V9_12_0_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' diff --git a/applications/SALOME-9.13.0-MPI.pyconf b/applications/SALOME-9.13.0-MPI.pyconf index de393d4..2568d92 100644 --- a/applications/SALOME-9.13.0-MPI.pyconf +++ b/applications/SALOME-9.13.0-MPI.pyconf @@ -184,7 +184,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' : {tag:'V9_13_0', base: 'no', section: 'default_MPI', hpc: 'yes'} 'FIELDS' : {tag:'V9_13_0', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'PARAVIS' : {tag:'V9_13_0', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_13_0', base: 'no', section: 'V9_13_0_MPI', hpc: 'yes'} 'JOBMANAGER': {tag:'V9_13_0', base: 'no', section: 'default_MPI', hpc: 'yes'} 'YACS' 'YACSGEN' diff --git a/applications/SALOME-9.13.0-int32.pyconf b/applications/SALOME-9.13.0-int32.pyconf index ba8deaf..bef2109 100644 --- a/applications/SALOME-9.13.0-int32.pyconf +++ b/applications/SALOME-9.13.0-int32.pyconf @@ -183,7 +183,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_13_0', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_13_0', base: 'no', section: 'version_V9_13_0_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' diff --git a/applications/SALOME-9.13.0.pyconf b/applications/SALOME-9.13.0.pyconf index fe02861..d396d19 100644 --- a/applications/SALOME-9.13.0.pyconf +++ b/applications/SALOME-9.13.0.pyconf @@ -170,7 +170,7 @@ APPLICATION : 'RESTRICTED' 'LIBBATCH' : 'V2_5_0' 'KERNEL' - 'MEDCOUPLING' : {tag:'V9_13_0', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'MEDCOUPLING' : {tag:'V9_13_0', base: 'no', section: 'version_V9_13_0_MPI', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -184,7 +184,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_13_0', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_13_0', base: 'no', section: 'version_V9_13_0_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' diff --git a/products/PARAVIS.pyconf b/products/PARAVIS.pyconf index 52d26c2..f17aab7 100644 --- a/products/PARAVIS.pyconf +++ b/products/PARAVIS.pyconf @@ -109,6 +109,39 @@ default_MPI : patches : [] } +version_V9_13_0 : +{ + git_commands: [] +} + +version_V9_13_0_MPI : +{ + 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 : [] + git_commands: [] +} + version_V9_13_0_UB24_04 : { 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} " @@ -136,6 +169,44 @@ version_V9_13_0_UB24_04 : patches: ['PARAVIS-UB24.04-V9_13_0-PyUnicode_AsWideCharString.patch'] } +version_V9_12_0 : +{ + git_commands: [] +} + +version_V9_12_0_MPI : +{ + 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 : [] + git_commands: [] +} + +version_V9_11_0 : +{ + git_commands: [] +} + version_V9_11_0_MPI : { 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} " -- 2.39.2