From a54996890726671356c086329300905599d1e699 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 22 Dec 2022 15:41:05 +0100 Subject: [PATCH] MEDCOUPLING-9.10.0-MPI special treatment for scipy on more recent platforms --- applications/MEDCOUPLING-9.10.0-MPI.pyconf | 20 ++++++++++++++++++++ applications/MEDCOUPLING-master-MPI.pyconf | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/applications/MEDCOUPLING-9.10.0-MPI.pyconf b/applications/MEDCOUPLING-9.10.0-MPI.pyconf index 1ae0c9d..d33943e 100644 --- a/applications/MEDCOUPLING-9.10.0-MPI.pyconf +++ b/applications/MEDCOUPLING-9.10.0-MPI.pyconf @@ -88,4 +88,24 @@ APPLICATION : } __overwrite__ : [ + { + __condition__ : "VARS.dist in ['FD32']" + # gcc https://github.com/scipy/scipy/issues/11611 + # either patch numpy to include -fallow-argument-mismatch or move to that version + 'APPLICATION.products.scipy' : '1.5.2' + } + { + __condition__: "VARS.dist in ['FD34', 'FD36', 'FD37']" + # gcc https://github.com/scipy/scipy/issues/11611 + # either patch numpy to include -fallow-argument-mismatch or move to that version + 'APPLICATION.products.scipy' : '1.5.2' + # https://github.com/pyenv/pyenv/issues/1889 + 'APPLICATION.products.Python' : {tag: '3.6.5', base: 'no', section: 'version_3_6_5_FD34'} + } + { + __condition__ : "VARS.dist in ['DB11']" + # gcc https://github.com/scipy/scipy/issues/11611 + # either patch numpy to include -fallow-argument-mismatch or move to that version + 'APPLICATION.products.scipy' : '1.5.2' + } ] diff --git a/applications/MEDCOUPLING-master-MPI.pyconf b/applications/MEDCOUPLING-master-MPI.pyconf index ff52e2a..7aae387 100644 --- a/applications/MEDCOUPLING-master-MPI.pyconf +++ b/applications/MEDCOUPLING-master-MPI.pyconf @@ -88,4 +88,24 @@ APPLICATION : } __overwrite__ : [ + { + __condition__ : "VARS.dist in ['FD32']" + # gcc https://github.com/scipy/scipy/issues/11611 + # either patch numpy to include -fallow-argument-mismatch or move to that version + 'APPLICATION.products.scipy' : '1.5.2' + } + { + __condition__: "VARS.dist in ['FD34', 'FD36', 'FD37']" + # gcc https://github.com/scipy/scipy/issues/11611 + # either patch numpy to include -fallow-argument-mismatch or move to that version + 'APPLICATION.products.scipy' : '1.5.2' + # https://github.com/pyenv/pyenv/issues/1889 + 'APPLICATION.products.Python' : {tag: '3.6.5', base: 'no', section: 'version_3_6_5_FD34'} + } + { + __condition__ : "VARS.dist in ['DB11']" + # gcc https://github.com/scipy/scipy/issues/11611 + # either patch numpy to include -fallow-argument-mismatch or move to that version + 'APPLICATION.products.scipy' : '1.5.2' + } ] -- 2.39.2