2019-02-17 09:12:58 +00:00
|
|
|
commit b14ca23651d390fcae4a929dedc7c33a83453a66
|
|
|
|
|
Author: Frederik Rietdijk <fridh@fridh.nl>
|
|
|
|
|
Date: Sun Feb 17 08:41:27 2019 +0100
|
|
|
|
|
|
|
|
|
|
Find boost_pythonXX
|
|
|
|
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
index 08f56a33..0a04592a 100644
|
|
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -99,10 +99,10 @@ add_subdirectory(docs)
|
|
|
|
|
add_custom_target(lint COMMAND ${CMAKE_COMMAND} -P ${PROJECT_SOURCE_DIR}/cmake/lint.cmake)
|
|
|
|
|
|
|
|
|
|
# ---[ pytest target
|
|
|
|
|
-if(BUILD_python)
|
|
|
|
|
- add_custom_target(pytest COMMAND python${python_version} -m unittest discover -s caffe/test WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python )
|
|
|
|
|
- add_dependencies(pytest pycaffe)
|
|
|
|
|
-endif()
|
|
|
|
|
+# if(BUILD_python)
|
|
|
|
|
+# add_custom_target(pytest COMMAND python${python_version} -m unittest discover -s caffe/test WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python )
|
|
|
|
|
+# add_dependencies(pytest pycaffe)
|
|
|
|
|
+# endif()
|
|
|
|
|
|
|
|
|
|
# ---[ uninstall target
|
|
|
|
|
configure_file(
|
|
|
|
|
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
|
|
|
|
|
index 4a5bac47..be026d43 100644
|
|
|
|
|
--- a/cmake/Dependencies.cmake
|
|
|
|
|
+++ b/cmake/Dependencies.cmake
|
|
|
|
|
@@ -141,37 +141,14 @@ if(BUILD_python)
|
|
|
|
|
# use python3
|
|
|
|
|
find_package(PythonInterp 3.0)
|
|
|
|
|
find_package(PythonLibs 3.0)
|
|
|
|
|
- find_package(NumPy 1.7.1)
|
|
|
|
|
- # Find the matching boost python implementation
|
|
|
|
|
- set(version ${PYTHONLIBS_VERSION_STRING})
|
|
|
|
|
-
|
|
|
|
|
- STRING( REGEX REPLACE "[^0-9]" "" boost_py_version ${version} )
|
|
|
|
|
- find_package(Boost 1.46 COMPONENTS "python-py${boost_py_version}")
|
|
|
|
|
- set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND})
|
|
|
|
|
-
|
|
|
|
|
- while(NOT "${version}" STREQUAL "" AND NOT Boost_PYTHON_FOUND)
|
|
|
|
|
- STRING( REGEX REPLACE "([0-9.]+).[0-9]+" "\\1" version ${version} )
|
|
|
|
|
-
|
|
|
|
|
- STRING( REGEX REPLACE "[^0-9]" "" boost_py_version ${version} )
|
|
|
|
|
- find_package(Boost 1.46 COMPONENTS "python-py${boost_py_version}")
|
|
|
|
|
- set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND})
|
|
|
|
|
-
|
|
|
|
|
- STRING( REGEX MATCHALL "([0-9.]+).[0-9]+" has_more_version ${version} )
|
|
|
|
|
- if("${has_more_version}" STREQUAL "")
|
|
|
|
|
- break()
|
|
|
|
|
- endif()
|
|
|
|
|
- endwhile()
|
|
|
|
|
- if(NOT Boost_PYTHON_FOUND)
|
|
|
|
|
- find_package(Boost 1.46 COMPONENTS python)
|
|
|
|
|
- endif()
|
|
|
|
|
else()
|
|
|
|
|
# disable Python 3 search
|
|
|
|
|
find_package(PythonInterp 2.7)
|
|
|
|
|
find_package(PythonLibs 2.7)
|
|
|
|
|
- find_package(NumPy 1.7.1)
|
|
|
|
|
- find_package(Boost 1.46 COMPONENTS python)
|
|
|
|
|
endif()
|
|
|
|
|
- if(PYTHONLIBS_FOUND AND NUMPY_FOUND AND Boost_PYTHON_FOUND)
|
|
|
|
|
+ find_package(NumPy 1.7.1)
|
|
|
|
|
+ find_package(Boost 1.46 REQUIRED COMPONENTS python@major@@minor@)
|
2019-06-17 10:42:04 +01:00
|
|
|
+ if(PYTHONLIBS_FOUND AND NUMPY_FOUND AND Boost_PYTHON@major@@minor@_FOUND)
|
2019-02-17 09:12:58 +00:00
|
|
|
set(HAVE_PYTHON TRUE)
|
|
|
|
|
if(BUILD_python_layer)
|
|
|
|
|
list(APPEND Caffe_DEFINITIONS PRIVATE -DWITH_PYTHON_LAYER)
|
