From 0b68f476cc0df18fb4047c94f6387a1de8180a73 Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Tue, 19 Sep 2017 07:36:00 +0200
Subject: [PATCH] Passing variables to python build
Variables are passed as environment variables from Makefile,
where they can be constructed using Makefile variables.
This solves some problems I had with python2.7 not able to parse
correctly the Makefile.conf file. In addition, it looks like correct
directories are used also when plumed is already installed.
Also notice that the plumed executable is now only invoked
to retrieve the version number and that it is invoked with the
correct path, so that a previously installed plumed will
not be in the way.
---
python/Makefile | 9 ++++++++-
python/buildPythonInterface.py | 30 +++++-------------------------
src/lib/Makefile | 10 +++++++++-
3 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/python/Makefile b/python/Makefile
index 2700cab0b..207ce744e 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -18,7 +18,14 @@ ifdef python_bin
all:
@echo Building python interface for PLUMED
- $(python_bin) buildPythonInterface.py build_ext -i
+ CC="$(CC)" \
+ LDSHARED="$(LDSHARED)" \
+ CXX="$(CXX)" \
+ program_name=plumed \
+ plumedexe=../src/lib/plumed \
+ include_dir=../src/wrapper \
+ lib_dir=../src/lib \
+ $(python_bin) buildPythonInterface.py build_ext -i
else
diff --git a/python/buildPythonInterface.py b/python/buildPythonInterface.py
index 3dbfd79cb..191644038 100644
--- a/python/buildPythonInterface.py
+++ b/python/buildPythonInterface.py
@@ -33,30 +33,10 @@ import os
def is_exe(fpath):
return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
-# Check if PLUMED is in PATH
-plumedexe = '../src/lib/plumed'
-for path in os.environ["PATH"].split(os.pathsep):
- path = path.strip('"')
- exe_file = os.path.join(path, 'plumed')
- if is_exe(exe_file) :
- plumedexe=exe_file
- break
+plumedexe=os.environ["plumedexe"]
-# Get information on where plumed headers and libraries are installed and the version number
-print( "Plumedexe is " + plumedexe )
-plumedroot = subprocess.check_output([plumedexe, 'info', '--root']).decode("utf-8").strip("\n")
-print( "Creating interface for plumed version in " + plumedroot )
-plumedhead = subprocess.check_output([plumedexe, 'info', '--include-dir']).decode("utf-8").strip("\n") + "/plumed/wrapper/"
-print( "Using headers in " + plumedhead )
plumedversion = subprocess.check_output([plumedexe, 'info', '--version']).decode("utf-8")
print( "Version number for this plumed is " + plumedversion )
-# Get list containing all config variables so we can extract information on compilers to use during cython build
-plumedconfig = subprocess.check_output([plumedexe, 'info', '--configuration']).decode("utf-8").split("\n")
-
-for line in plumedconfig :
- if "CC=" in line : os.environ["CC"] = line.replace("CC=","").replace("\n","")
- if "CXX=" in line : os.environ["CXX"] = line.replace("CXX=","").replace("\n","")
- if "LDSHARED=" in line : os.environ["LDSHARED"] = line.replace("LDSHARED=","").replace("\n","")
print( "Building interface using CC=" + os.environ["CC"] + " , CXX=" + os.environ["CXX"] + " and LDSHARED=" + os.environ["LDSHARED"] )
@@ -68,12 +48,12 @@ setup(
author_email='plumed-users@googlegroups.com',
url='http://www.plumed.org',
ext_modules = cythonize([
- Extension( name="plumed",
+ Extension( name="plumed",
sources=["plumed.pyx"],
- library_dirs=[plumedroot, plumedroot + "/src/lib/"],
- libraries=["plumed"],
+ library_dirs=[os.environ["lib_dir"]],
+ libraries=[os.environ["program_name"]],
language="c++",
- include_dirs=[plumedhead, numpy.get_include()]
+ include_dirs=[os.environ["include_dir"], numpy.get_include()]
)
])
)
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 1da60d7f9..92fd1a615 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -203,7 +203,15 @@ endif
# python installation (rebuild prior to installation so as to discover plumed in path)
ifdef python_bin
cp -pr ../../python install
- cd install/python && rm -fr *.so plumed.cpp build && $(python_bin) buildPythonInterface.py build_ext -i
+ cd install/python && rm -fr *.so plumed.cpp build && \
+ CC="$(CC)" \
+ LDSHARED="$(LDSHARED)" \
+ CXX="$(CXX)" \
+ plumedexe="../../plumed" \
+ program_name="$(program_name)" \
+ include_dir=../../../wrapper \
+ lib_dir="$(DESTDIR)$(libdir)" \
+ $(python_bin) buildPythonInterface.py build_ext -i
cp -pr install/python "$(DESTDIR)$(libdir)/$(program_name)/"
endif
# making everything visible:
--
GitLab