From 17c924f4d7b87688a404a36ea77284a8147feab6 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 16 Feb 2021 17:44:24 +0100 Subject: [PATCH] try OpenTurns on all nodes --- applications/SALOME-master.pyconf | 7 +++++++ products/openturns.pyconf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index a9120ce..6e45efb 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -71,6 +71,7 @@ APPLICATION : opencv : '3.2.0' openssl : "native" ospray : '1.8.4' + openturns: '1.16' packaging : '17.1' ParaView : '5.8.0' petsc : '3.14.0' @@ -231,6 +232,12 @@ __overwrite__ : ] } + { + # + __condition__ : "VARS.dist in ['CO7']" + 'PRODUCTS.openturns.default.cmake_options' : " -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python -DUSE_TBB=OFF" # essayer avec un nouveau gcc + } + { __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'TBB'" 'APPLICATION.products.tbb' : '4.4' diff --git a/products/openturns.pyconf b/products/openturns.pyconf index 66746d8..f9b2230 100644 --- a/products/openturns.pyconf +++ b/products/openturns.pyconf @@ -2,7 +2,7 @@ default : { name : "openturns" build_source : "cmake" - cmake_options : " -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python -DUSE_TBB=OFF" + cmake_options : " -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python" get_source : "archive" environ : { -- 2.39.2