Handle compilation with/without numpy

Author: bjodah

CMakeLists.txt

@@ -13,7 +13,6 @@ include_directories(${SYMENGINE_INCLUDE_DIRS})
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 find_package(Python REQUIRED)
 find_package(Cython REQUIRED)
-
 include_directories(${PYTHON_INCLUDE_PATH})
 
 if (MINGW AND ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8"))
@@ -59,6 +58,14 @@ else()
     set(HAVE_SYMENGINE_LLVM False)
 endif()
 
+if(WITH_NUMPY)
+    find_package(NumPy REQUIRED)
+    include_directories(${NUMPY_INCLUDE_PATH})
+    set(HAVE_NUMPY True)
+else()
+    set(HAVE_NUMPY False)
+endif()
+
 
 message("CMAKE_BUILD_TYPE        : ${CMAKE_BUILD_TYPE}")
 message("CMAKE_CXX_FLAGS_RELEASE : ${CMAKE_CXX_FLAGS_RELEASE}")
@@ -68,6 +75,7 @@ message("HAVE_SYMENGINE_MPC      : ${HAVE_SYMENGINE_MPC}")
 message("HAVE_SYMENGINE_PIRANHA  : ${HAVE_SYMENGINE_PIRANHA}")
 message("HAVE_SYMENGINE_FLINT    : ${HAVE_SYMENGINE_FLINT}")
 message("HAVE_SYMENGINE_LLVM     : ${HAVE_SYMENGINE_LLVM}")
+message("HAVE_NUMPY              : ${HAVE_NUMPY}")
 
 message("Copying source of python wrappers into: ${CMAKE_CURRENT_BINARY_DIR}")
 file(COPY symengine/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/symengine)

README.md

@@ -43,7 +43,10 @@ Additional options to setup.py are
         --define="var1=value1;var2=value2"                      # Give options to CMake
         --inplace                                               # Build the extension in source tree
 
-Standard options to setup.py like `--user`, `--prefix` can be used to configure install location
+Standard options to setup.py like `--user`, `--prefix` can be used to
+configure install location. NumPy is used if found by default, if you wish
+to make your choice of NumPy use explicit: then add
+e.g. ``WITH_NUMPY=False`` to ``--define``.
 
 Use SymEngine from Python as follows:
 

cmake/FindNumPy.cmake

@@ -0,0 +1,19 @@
+execute_process(
+	COMMAND ${PYTHON_BIN} -c "import numpy; print(numpy.get_include())"
+        RESULT_VARIABLE NUMPY_FIND_RESULT
+	OUTPUT_VARIABLE NUMPY_FIND_OUTPUT
+        ERROR_VARIABLE NUMPY_FIND_ERROR
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+if(NOT NUMPY_FIND_RESULT MATCHES 0)
+  set(NUMPY_FOUND FALSE)
+  message(STATUS "NumPy import failure:\n${NUMPY_FIND_ERROR}")  
+else()
+  find_path(NUMPY_INCLUDE_DIR numpy/arrayobject.h
+    HINTS "${__numpy_path}" "${NUMPY_FIND_OUTPUT}" NO_DEFAULT_PATH)
+  if(NUMPY_INCLUDE_DIR)
+    set(NUMPY_FOUND TRUE CACHE BOOL INTERNAL "NumPy found")
+    INCLUDE(FindPackageHandleStandardArgs)
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(NUMPY DEFAULT_MSG NUMPY_INCLUDE_PATH)
+  endif()
+endif()

setup.py

@@ -162,6 +162,14 @@ def finalize_options(self):
         # Multiple symbols can be separated with semi-colons.
         if self.define:
             defines = self.define.split(';')
+            if not any(define.startswith('WITH_NUMPY') for define in defines):
+                try:
+                    import numpy as np
+                except ImportError:
+                    defines.append('WITH_NUMPY=False')
+                else:
+                    defines.append('WITH_NUMPY=True')
+                defines.append()
             self.define = [(s.strip(), None) if '=' not in s else
                            tuple(ss.strip() for ss in s.split('='))
                            for s in defines]

symengine/lib/config.pxi.in

@@ -3,3 +3,4 @@ DEF HAVE_SYMENGINE_MPC = ${HAVE_SYMENGINE_MPC}
 DEF HAVE_SYMENGINE_PIRANHA = ${HAVE_SYMENGINE_PIRANHA}
 DEF HAVE_SYMENGINE_FLINT = ${HAVE_SYMENGINE_FLINT}
 DEF HAVE_SYMENGINE_LLVM = ${HAVE_SYMENGINE_LLVM}
+DEF HAVE_NUMPY = ${HAVE_NUMPY}