From a45382d490d085607d22863c51e28bb82bae9d1b Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 11 Mar 2022 17:16:17 +0100 Subject: [PATCH] medfile: support python API --- applications/SALOME-master-MPI.pyconf | 2 +- applications/SALOME-master-native.pyconf | 2 +- applications/SALOME-master.pyconf | 2 +- products/env_scripts/med.py | 2 ++ products/medfile.pyconf | 4 +++- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index b068b5d..d4e4a74 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -68,7 +68,7 @@ APPLICATION : llvm : '8.0.1-clang' markupsafe : '0.23' matplotlib : '3.0.3' - medfile : {tag : '4.1.1', hpc : 'yes', section : 'default_Autotools' } + medfile : {tag : '4.1.1', hpc : 'yes'} mesa : '19.0.8' MeshGems : {tag : '2.14-1', hpc : 'yes'} mpi4py: '3.0.3' diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 082c3f8..b056cf5 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -70,7 +70,7 @@ APPLICATION : llvm : 'native' markupsafe : 'native' matplotlib : 'native' - medfile : {section: 'default_Autotools', tag: '4.1.1'} + medfile : '4.1.1' mesa : 'native' MeshGems : '2.14-1' metis : 'native' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index e717621..3aef13c 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -69,7 +69,7 @@ APPLICATION : llvm : '8.0.1-clang' markupsafe : '0.23' matplotlib : '3.0.3' - medfile : {section: 'default_Autotools', tag: '4.1.1'} + medfile : '4.1.1' mesa : '19.0.8' MeshGems : '2.14-1' metis : '5.1.0' diff --git a/products/env_scripts/med.py b/products/env_scripts/med.py index 7a2da79..bea7dbf 100644 --- a/products/env_scripts/med.py +++ b/products/env_scripts/med.py @@ -14,6 +14,8 @@ def set_env(env, prereq_dir, version): env.prepend('PATH', os.path.join(prereq_dir, 'lib')) else : env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib')) + pyver = 'python' + env.get('PYTHON_VERSION') + env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages')) def set_nativ_env(env): env.set('MEDFILE_ROOT_DIR', '/usr') # update for cmake diff --git a/products/medfile.pyconf b/products/medfile.pyconf index 72671d0..5735c81 100644 --- a/products/medfile.pyconf +++ b/products/medfile.pyconf @@ -34,7 +34,9 @@ default_Autotools : # needed in order to screen with windows version - see below version_4_1_1 : { - patches : [] + compil_script : 'med-4.1.1.sh' + test_build : "make check" + build_depend : [] } version_4_1_1_win : -- 2.39.2