New Boost.Python interface

.gitignore

@@ -122,6 +122,7 @@ bin/*
 build-ios/*
 build-osx/*
 cmake_build/*
+*/build/*
 tmp/*
 doc/*
 include/*
@@ -134,6 +135,7 @@ msvc/*/x64/*
 *~
 *.o
 *.a
+*.so
 *.dot
 .DS_Store
 *.log
@@ -161,6 +163,9 @@ src/test_*.s
 .*.swp
 Doxyfile
 
+*.txt.user*
+.idea
+
 # jrk editor settings
 .tm_properties
 *.sublime-project
@@ -212,6 +217,9 @@ apps/HelloAndroidGL/jni/halide_gl_filter.h
 apps/HelloAndroid*/local.properties
 apps/HelloAndroid*/proguard-project.txt
 
+# tutorial intermediates
+tutorial/lesson_10_halide.h
+
 # test intermediates
 log.txt
 err.txt

python_bindings/CMakeLists.txt

@@ -0,0 +1,93 @@
+
+project(PyHalide)
+cmake_minimum_required(VERSION 3.0) # for up-to-date FindPythonLibs.cmake
+set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR} )
+
+# Find Python and boost python
+if(USE_PYTHON EQUAL 2)
+	find_package(PythonInterp 2.7 REQUIRED)
+	find_package(PythonLibs 2.7 REQUIRED)
+	find_package(NumPy REQUIRED)
+	if (NOT USE_EXTERNAL_BOOST)
+		find_package(Boost COMPONENTS python REQUIRED)
+	endif()
+else()
+	find_package(PythonInterp 3.4 REQUIRED)
+	find_package(PythonLibs 3.4 REQUIRED)
+	find_package(NumPy REQUIRED)
+	if (NOT USE_EXTERNAL_BOOST)
+		find_package(Boost COMPONENTS python-py34)
+		if(NOT Boost_FOUND)
+			find_package(Boost COMPONENTS python-py33)
+		endif()
+		if(NOT Boost_FOUND)
+			find_package(Boost COMPONENTS python3 REQUIRED)
+		endif()
+	endif()
+endif()
+
+option(USE_BOOST_NUMPY "Use Boost.Numpy dependency instead of Halide.Numpy" OFF)
+
+
+if(USE_BOOST_NUMPY)
+add_definitions( -DUSE_BOOST_NUMPY )
+set(BoostNumpy_INCLUDE_DIRS "")
+set(BoostNumpy_LIBRARY_DIR "")
+set(BoostNumpy_LIBRARIES boost_numpy)
+else()
+#(NOT USE_BOOST_NUMPY) is true
+
+file(GLOB MicroNumpyCpp
+numpy/*.cpp
+numpy/*.hpp
+)
+
+add_library(halide_numpy STATIC ${MicroNumpyCpp})
+target_link_libraries(halide_numpy ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${NumPy_LIBRARIES})
+set_property(TARGET halide_numpy PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+
+set(BoostNumpy_INCLUDE_DIRS ./numpy)
+set(BoostNumpy_LIBRARY_DIR ./numpy)
+set(BoostNumpy_LIBRARIES halide_numpy)
+endif()
+
+add_definitions("-std=c++11")
+
+include_directories(
+  ../build/include
+  ${Boost_INCLUDE_DIRS}
+  ${BoostNumpy_INCLUDE_DIRS}
+  ${PYTHON_INCLUDE_DIRS}
+  ${NUMPY_INCLUDE_DIRS}
+)
+
+link_directories(
+  ../build/lib
+  ${Boost_LIBRARY_DIR}
+  ${BoostNumpy_LIBRARY_DIR}
+  ${Numpy_LIBRARY_DIR}
+)
+
+
+if(FALSE AND UNIX )
+	# Disable the pointer-to-function and pointer-to-object warnings
+	add_definitions( -Wno-unused-local-typedefs )
+	set_property(SOURCE util.cpp PROPERTY COMPILE_FLAGS -w )
+endif()
+
+file(GLOB SrcCpp
+python/*.cpp
+../src/Param.cpp)
+
+add_library(halide SHARED ${SrcCpp})
+target_link_libraries(halide
+  Halide InitialModules
+  ${Boost_LIBRARIES}
+  ${BoostNumpy_LIBRARIES}
+  ${PYTHON_LIBRARIES}
+)
+
+set_target_properties( halide PROPERTIES PREFIX "")
+if(APPLE)
+set_target_properties( halide PROPERTIES SUFFIX ".so" )
+endif()

python_bindings/FindNumPy.cmake

@@ -0,0 +1,90 @@
+# - Find the NumPy libraries
+# This module finds if NumPy is installed, and sets the following variables
+# indicating where it is.
+#
+# TODO: Update to provide the libraries and paths for linking npymath lib.
+#
+#  NUMPY_FOUND               - was NumPy found
+#  NUMPY_VERSION             - the version of NumPy found as a string
+#  NUMPY_VERSION_MAJOR       - the major version number of NumPy
+#  NUMPY_VERSION_MINOR       - the minor version number of NumPy
+#  NUMPY_VERSION_PATCH       - the patch version number of NumPy
+#  NUMPY_VERSION_DECIMAL     - e.g. version 1.6.1 is 10601
+#  NUMPY_INCLUDE_DIRS        - path to the NumPy include files
+
+#============================================================================
+# Copyright 2012 Continuum Analytics, Inc.
+#
+# MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to permit
+# persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+# 
+#============================================================================
+
+# Finding NumPy involves calling the Python interpreter
+if(NumPy_FIND_REQUIRED)
+    find_package(PythonInterp REQUIRED)
+else()
+    find_package(PythonInterp)
+endif()
+
+if(NOT PYTHONINTERP_FOUND)
+    set(NUMPY_FOUND FALSE)
+endif()
+
+execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c"
+    "import numpy as n; print(n.__version__); print(n.get_include());"
+    RESULT_VARIABLE _NUMPY_SEARCH_SUCCESS
+    OUTPUT_VARIABLE _NUMPY_VALUES
+    ERROR_VARIABLE _NUMPY_ERROR_VALUE
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+if(NOT _NUMPY_SEARCH_SUCCESS MATCHES 0)
+    if(NumPy_FIND_REQUIRED)
+        message(FATAL_ERROR
+            "NumPy import failure:\n${_NUMPY_ERROR_VALUE}")
+    endif()
+    set(NUMPY_FOUND FALSE)
+endif()
+
+# Convert the process output into a list
+string(REGEX REPLACE ";" "\\\\;" _NUMPY_VALUES ${_NUMPY_VALUES})
+string(REGEX REPLACE "\n" ";" _NUMPY_VALUES ${_NUMPY_VALUES})
+list(GET _NUMPY_VALUES 0 NUMPY_VERSION)
+list(GET _NUMPY_VALUES 1 NUMPY_INCLUDE_DIRS)
+
+# Make sure all directory separators are '/'
+string(REGEX REPLACE "\\\\" "/" NUMPY_INCLUDE_DIRS ${NUMPY_INCLUDE_DIRS})
+
+# Get the major and minor version numbers
+string(REGEX REPLACE "\\." ";" _NUMPY_VERSION_LIST ${NUMPY_VERSION})
+list(GET _NUMPY_VERSION_LIST 0 NUMPY_VERSION_MAJOR)
+list(GET _NUMPY_VERSION_LIST 1 NUMPY_VERSION_MINOR)
+list(GET _NUMPY_VERSION_LIST 2 NUMPY_VERSION_PATCH)
+string(REGEX MATCH "[0-9]*" NUMPY_VERSION_PATCH ${NUMPY_VERSION_PATCH})
+math(EXPR NUMPY_VERSION_DECIMAL
+    "(${NUMPY_VERSION_MAJOR} * 10000) + (${NUMPY_VERSION_MINOR} * 100) + ${NUMPY_VERSION_PATCH}")
+
+find_package_message(NUMPY
+    "Found NumPy: version \"${NUMPY_VERSION}\" ${NUMPY_INCLUDE_DIRS}"
+    "${NUMPY_INCLUDE_DIRS}${NUMPY_VERSION}")
+
+set(NUMPY_FOUND TRUE)
+