浏览代码

python: Fix setup.py when numpy is not available

Samuel Thibault 4 年之前
父节点
当前提交
d5bd5ce31c
共有 2 个文件被更改,包括 9 次插入4 次删除
  1. 3 3
      configure.ac
  2. 6 1
      starpupy/src/setup.py.in

+ 3 - 3
configure.ac

@@ -3391,12 +3391,12 @@ then
 	AC_MSG_CHECKING(for python3 module numpy)
 	AC_PYTHON_MODULE(numpy,[numpy_avail=yes],[numpy_avail=no])
 	AC_MSG_RESULT($numpy_avail)
-	PYTHON_NUMPY_CFLAGS=""
+	PYTHON_NUMPY_DIR=""
 	if test "$numpy_avail" = "yes" ; then
 	   	AC_DEFINE(STARPU_PYTHON_HAVE_NUMPY, [1], [Python3 numpy package available])
-		PYTHON_NUMPY_CFLAGS="`$PYTHON -c "import numpy ; print(numpy.get_include())"`"
+		PYTHON_NUMPY_DIR="`$PYTHON -c "import numpy ; print(numpy.get_include())"`"
 	fi
-	AC_SUBST(PYTHON_NUMPY_CFLAGS)
+	AC_SUBST(PYTHON_NUMPY_DIR)
 fi
 AM_CONDITIONAL(STARPU_BUILD_STARPUPY, [test x$starpupy_support = xyes])
 

+ 6 - 1
starpupy/src/setup.py.in

@@ -15,8 +15,13 @@
 #
 from distutils.core import setup, Extension
 
+numpy_dir = '@PYTHON_NUMPY_DIR@'
+if numpy_dir != '':
+    numpy_include_dir = [numpy_dir]
+else:
+    numpy_include_dir = []
 starpupy = Extension('starpu.starpupy',
-                     include_dirs = ['@STARPU_SRC_DIR@/include', '@STARPU_BUILD_DIR@/include', '@PYTHON_NUMPY_CFLAGS@'],
+                     include_dirs = ['@STARPU_SRC_DIR@/include', '@STARPU_BUILD_DIR@/include'] + numpy_include_dir,
                      libraries = ['starpu-@STARPU_EFFECTIVE_VERSION@'],
                      library_dirs = ['@STARPU_BUILD_DIR@/src/.libs'],
 	             sources = ['starpu/starpu_task_wrapper.c'])