From 100b1f3bc9cea666765f7983b5f58c13e1fce4bc Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 1 Feb 2022 09:03:18 +0100 Subject: [PATCH] Ubuntu 18, 20 --- applications/SALOME-master.pyconf | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 7abca22..5c103d2 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -192,17 +192,17 @@ APPLICATION : } __overwrite__ : [ + { + __condition__ : "VARS.dist in ['FD30']" + 'APPLICATION.products.gcc' : '9.3.0' + 'APPLICATION.rm_products' : ['openmpi', 'mpi4py'] + } { __condition__ : "VARS.dist in ['FD32']" # https://github.com/scipy/scipy/issues/11611 'APPLICATION.products.scipy' : '1.5.2' 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr', 'openmpi', 'mpi4py'] } - { - __condition__ : "VARS.dist in ['FD30']" - 'APPLICATION.products.gcc' : '9.3.0' - 'APPLICATION.rm_products' : ['openmpi', 'mpi4py'] - } { __condition__ : "VARS.dist in ['DB09']" 'APPLICATION.products.ParaView' : {tag:'5.9.0', base: 'no', section: 'version_5_9_0_MPI', hpc: 'yes'} @@ -219,6 +219,17 @@ __overwrite__ : } { __condition__ : "VARS.dist in ['DB10']" + 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] + 'APPLICATION.products.ParaView' : {tag:'5.9.0', base: 'no', section: 'version_5_9_0_MPI', hpc: 'yes'} + 'APPLICATION.products.PARAVIS' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} + } + { + __condition__ : "VARS.dist in ['UB18.04']" + 'APPLICATION.rm_products' : ['openmpi', 'mpi4py', 'gcc', 'gmp', 'mpc', 'mpfr'] + } + { + __condition__ : "VARS.dist in ['UB20.04']" 'APPLICATION.rm_products' : ['openmpi', 'mpi4py', 'gcc', 'gmp', 'mpc', 'mpfr'] } ] -- 2.39.2