From 6f9a73f66f87b7eec5f4e4ed1c5bfd15cff96514 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 3 Oct 2022 14:07:37 +0200 Subject: [PATCH] StaticMeshPlugin fails to find MPI --- applications/SALOME-master-native.pyconf | 22 ++++++++++++---------- products/StaticMeshPlugin.pyconf | 12 ++++++++++++ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 7d039bd..f78a53d 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -277,9 +277,10 @@ __overwrite__ : 'APPLICATION.products.qwt' : '6.1.6' 'APPLICATION.products.omniORB' : '4.2.5' 'APPLICATION.products.omniORBpy' : '4.2.5' - 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } - 'APPLICATION.products.root' : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34' } - 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_FD34' } # spns #29324 + 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } + 'APPLICATION.products.root' : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34' } + 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_FD34' } # spns #29324 + 'APPLICATION.products.StaticMeshPlugin' : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_FD34' } } { __condition__ : "VARS.dist in ['FD36']" @@ -289,12 +290,13 @@ __overwrite__ : 'APPLICATION.products.qwt' : '6.1.6' 'APPLICATION.products.nlopt' : '2.6.0' 'APPLICATION.products.netcdf' : '4.6.2' - 'APPLICATION.products.numpy' : {tag: '1.22.2', base: 'no', section: 'version_1_22_2' } - 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } - 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_FD36' } - 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD36' } - 'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no', section: 'version_V9_9_0_MPI_FD36', hpc: 'yes' } - 'APPLICATION.products.HEXABLOCK' : {tag:'master', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no' } - 'APPLICATION.products.SHAPER' : {tag:'master', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no' } + 'APPLICATION.products.numpy' : {tag: '1.22.2', base: 'no', section: 'version_1_22_2' } + 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } + 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_FD36' } + 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD36' } + 'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no', section: 'version_V9_9_0_MPI_FD36', hpc: 'yes' } + 'APPLICATION.products.HEXABLOCK' : {tag:'master', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no' } + 'APPLICATION.products.SHAPER' : {tag:'master', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no' } + 'APPLICATION.products.StaticMeshPlugin' : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_FD36' } } ] diff --git a/products/StaticMeshPlugin.pyconf b/products/StaticMeshPlugin.pyconf index d8d6d27..d0005a4 100644 --- a/products/StaticMeshPlugin.pyconf +++ b/products/StaticMeshPlugin.pyconf @@ -70,6 +70,18 @@ version_5_11_0_DB11: patches: ['StaticMeshPlugin-5.11.0.p001.patch', 'StaticMeshPlugin-5.11.0.p002.patch'] } +version_5_11_0_FD36: +{ + archive_info : {archive_name : "StaticMeshPlugin-5.11.0-8801743.tar.gz"} + patches: ['StaticMeshPlugin-5.11.0.p001.patch', 'StaticMeshPlugin-5.11.0.p002.patch'] +} + +version_5_11_0_FD34: +{ + archive_info : {archive_name : "StaticMeshPlugin-5.11.0-8801743.tar.gz"} + patches: ['StaticMeshPlugin-5.11.0.p001.patch', 'StaticMeshPlugin-5.11.0.p002.patch'] +} + version_5_8_0: { patches: ['StaticMeshPlugin-5.8.0.patch'] -- 2.39.2