From 2c79d192fbf05cad2871fe5b6ac19e556e794976 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 4 Oct 2024 14:45:32 +0200 Subject: [PATCH] bos #42837: handle Fedora 32 and 34, embed lapack for these two platforms --- applications/SALOME-master-native.pyconf | 2 ++ products/env_scripts/lapack.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index f4ecd86..7e782f6 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -403,6 +403,7 @@ __overwrite__ : 'APPLICATION.products.qwt' : '6.1.6' 'APPLICATION.products.PyQt' : '5.15.3' 'APPLICATION.products.sip' : '5.5.0' + 'APPLICATION.products.lapack' : '3.8.0' 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } 'APPLICATION.products.Sphinx' : {tag: '1.7.6', base: 'no', section: 'version_1_7_6_no_pip' } 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_FD32' } # spns #29324 @@ -419,6 +420,7 @@ __overwrite__ : { __condition__ : "VARS.dist in ['FD34']" 'APPLICATION.rm_products' : ['nose_py3','assimulo'] # + 'APPLICATION.products.lapack' : '3.8.0' 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.qwt' : '6.1.6' 'APPLICATION.products.omniORB' : '4.2.5' diff --git a/products/env_scripts/lapack.py b/products/env_scripts/lapack.py index c15608e..e8b1187 100644 --- a/products/env_scripts/lapack.py +++ b/products/env_scripts/lapack.py @@ -17,19 +17,23 @@ def set_env(env, prereq_dir, version): env.set('BLAS', os.path.join(prereq_dir, 'lib')) env.set('LAPACK', os.path.join(prereq_dir, 'lib')) env.set('ATLAS', os.path.join(prereq_dir, 'lib')) + env.set('LAPACK_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'lapack-3.8.0')) env.set('LAPACKE_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'lapacke-3.8.0')) env.set('LAPACKE_INCDIR', os.path.join(prereq_dir,'include')) env.set('LAPACKE_LIBDIR', os.path.join(prereq_dir,'lib')) + env.set('CBLAS_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'cblas-3.8.0')) env.set('CBLAS_ROOT_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'cblas-3.8.0')) else: env.prepend('PATH', os.path.join(prereq_dir, 'bin')) env.set('BLAS', os.path.join(prereq_dir, 'lib')) env.set('LAPACK', os.path.join(prereq_dir, 'lib')) env.set('ATLAS', os.path.join(prereq_dir, 'lib')) + env.set('LAPACK_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'lapack-3.8.0')) env.set('LAPACKE_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'lapacke-3.8.0')) env.set('LAPACKE_INCDIR', os.path.join(prereq_dir,'include')) env.set('LAPACKE_LIBDIR', os.path.join(prereq_dir,'lib')) env.set('CBLAS_ROOT_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'cblas-3.8.0')) + def set_nativ_env(env): env.set('LAPACKHOME', '/usr') env.set('LAPACK_ROOT_DIR', '/') -- 2.39.2