Skip to content

Commit

Permalink
Add pybind11 submodule and cmake build
Browse files Browse the repository at this point in the history
  • Loading branch information
philr-acvt committed Oct 27, 2017
1 parent eb9dd2c commit ebc0e1e
Show file tree
Hide file tree
Showing 4 changed files with 184 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
@@ -0,0 +1,3 @@
[submodule "pybind11"]
path = pybind11
url = https://github.com/pybind/pybind11.git
49 changes: 49 additions & 0 deletions CMakeLists.txt
@@ -0,0 +1,49 @@
project(Matterport_Simulator CXX)
cmake_minimum_required(VERSION 2.8)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release)
endif()

include_directories("${PROJECT_SOURCE_DIR}/include")

find_package(OpenCV REQUIRED)
find_package(PkgConfig REQUIRED)

pkg_check_modules(JSONCPP REQUIRED jsoncpp)
pkg_check_modules(OSMESA REQUIRED osmesa)

add_library(MatterSim SHARED src/lib/MatterSim.cpp)
target_include_directories(MatterSim PRIVATE ${JSONCPP_INCLUDE_DIRS})
target_link_libraries(MatterSim ${JSONCPP_LIBRARIES} ${OpenCV_LIBS} ${OSMESA_LIBRARIES})

add_executable(mattersim_main src/driver/mattersim_main.cpp)
target_link_libraries(mattersim_main MatterSim)

add_executable(random_agent src/driver/random_agent.cpp)
target_link_libraries(random_agent MatterSim)

add_subdirectory(pybind11)

find_package(PythonInterp)
message(${PYTHON_EXECUTABLE})

# Need to search for python executable again to pick up an activated
# virtualenv python, if any.
unset(PYTHON_EXECUTABLE CACHE)
find_program(PYTHON_EXECUTABLE python
PATHS ENV PATH # look in the PATH environment variable
NO_DEFAULT_PATH # do not look anywhere else...
)
# Make FindNumPy available
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
find_package(NumPy REQUIRED)

pybind11_add_module(MatterSimPython src/lib_python/MatterSimPython.cpp)
target_include_directories(MatterSimPython PRIVATE ${NUMPY_INCLUDES})
target_link_libraries(MatterSimPython PRIVATE MatterSim)
set_target_properties(MatterSimPython
PROPERTIES
OUTPUT_NAME MatterSim)
131 changes: 131 additions & 0 deletions cmake/FindNumPy.cmake
@@ -0,0 +1,131 @@
#-------------------------------------------------------------------------------
# Copyright (c) 2013, Lars Baehren <lbaehren@gmail.com>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification,
# are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#-------------------------------------------------------------------------------

# - Check for the presence of NumPy
#
# The following variables are set when NumPy is found:
# NUMPY_FOUND = Set to true, if all components of NUMPY have been found.
# NUMPY_INCLUDES = Include path for the header files of NUMPY
# NUMPY_LIBRARIES = Link these to use NUMPY
# NUMPY_LFLAGS = Linker flags (optional)

if (NOT NUMPY_FOUND)

if (NOT NUMPY_ROOT_DIR)
set (NUMPY_ROOT_DIR ${CMAKE_INSTALL_PREFIX})
endif (NOT NUMPY_ROOT_DIR)

if (NOT PYTHONINTERP_FOUND)
find_package (PythonInterp)
endif (NOT PYTHONINTERP_FOUND)

##__________________________________________________________________________
## Check for the header files

## Use Python to determine the include directory
execute_process (
COMMAND ${PYTHON_EXECUTABLE} -c import\ numpy\;\ print\(numpy.get_include\(\)\)\;
ERROR_VARIABLE NUMPY_FIND_ERROR
RESULT_VARIABLE NUMPY_FIND_RESULT
OUTPUT_VARIABLE NUMPY_FIND_OUTPUT
OUTPUT_STRIP_TRAILING_WHITESPACE
)
## process the output from the execution of the command
if (NOT NUMPY_FIND_RESULT)
set (NUMPY_INCLUDES ${NUMPY_FIND_OUTPUT})
endif (NOT NUMPY_FIND_RESULT)

##__________________________________________________________________________
## Check for the library

unset (NUMPY_LIBRARIES)

if (PYTHON_SITE_PACKAGES)
find_library (NUMPY_NPYMATH_LIBRARY npymath
HINTS ${PYTHON_SITE_PACKAGES}/numpy/core
PATH_SUFFIXES lib
)
if (NUMPY_NPYMATH_LIBRARY)
list (APPEND NUMPY_LIBRARIES ${NUMPY_NPYMATH_LIBRARY})
endif (NUMPY_NPYMATH_LIBRARY)
endif (PYTHON_SITE_PACKAGES)

##__________________________________________________________________________
## Get API version of NumPy from 'numpy/numpyconfig.h'

if (PYTHON_EXECUTABLE)
execute_process (
COMMAND ${PYTHON_EXECUTABLE} -c import\ numpy\;\ print\(numpy.__version__\)\;
ERROR_VARIABLE NUMPY_API_VERSION_ERROR
RESULT_VARIABLE NUMPY_API_VERSION_RESULT
OUTPUT_VARIABLE NUMPY_API_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
else ()
## Backup procedure: extract version number directly from the header file
if (NUMPY_INCLUDES)
find_file (HAVE_NUMPYCONFIG_H numpy/numpyconfig.h
HINTS ${NUMPY_INCLUDES}
)
endif (NUMPY_INCLUDES)
endif ()

## Dissect full version number into major, minor and patch version
if (NUMPY_API_VERSION)
string (REGEX REPLACE "\\." ";" _tmp ${NUMPY_API_VERSION})
list (GET _tmp 0 NUMPY_API_VERSION_MAJOR)
list (GET _tmp 1 NUMPY_API_VERSION_MINOR)
list (GET _tmp 2 NUMPY_API_VERSION_PATCH)
endif (NUMPY_API_VERSION)

##__________________________________________________________________________
## Actions taken when all components have been found

find_package_handle_standard_args (NUMPY DEFAULT_MSG NUMPY_INCLUDES)

if (NUMPY_FOUND)
if (NOT NUMPY_FIND_QUIETLY)
message (STATUS "Found components for NumPy")
message (STATUS "NUMPY_ROOT_DIR = ${NUMPY_ROOT_DIR}")
message (STATUS "NUMPY_INCLUDES = ${NUMPY_INCLUDES}")
message (STATUS "NUMPY_LIBRARIES = ${NUMPY_LIBRARIES}")
message (STATUS "NUMPY_API_VERSION = ${NUMPY_API_VERSION}")
endif (NOT NUMPY_FIND_QUIETLY)
else (NUMPY_FOUND)
if (NUMPY_FIND_REQUIRED)
message (FATAL_ERROR "Could not find NUMPY!")
endif (NUMPY_FIND_REQUIRED)
endif (NUMPY_FOUND)

##__________________________________________________________________________
## Mark advanced variables

mark_as_advanced (
NUMPY_ROOT_DIR
NUMPY_INCLUDES
NUMPY_LIBRARIES
)

endif (NOT NUMPY_FOUND)
1 change: 1 addition & 0 deletions pybind11
Submodule pybind11 added at 86e2ad

0 comments on commit ebc0e1e

Please sign in to comment.