Skip to content

Commit

Permalink
reduced NumPy requirement from 1.7.1 to 1.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Anatoly Baksheev committed Jan 2, 2015
1 parent e3e2786 commit 60e8f7a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion cmake/Dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ if(BUILD_python)
# disable Python 3 search
find_package(PythonInterp 2.7)
find_package(PythonLibs 2.7)
find_package(NumPy 1.7.1)

This comment has been minimized.

Copy link
@longjon

longjon Jan 3, 2015

Why? This might build, and some features might work, but we don't support it, and some existing code definitely won't work.

This comment has been minimized.

Copy link
@Nerei

Nerei Jan 3, 2015

Owner

This is because Travis CI has 1.6.1 installed. Just to enable python interface testing. Should I revert?

find_package(NumPy 1.6.1)
find_package(Boost 1.46 COMPONENTS python)

if(PYTHONLIBS_FOUND AND NUMPY_FOUND AND Boost_PYTHON_FOUND)
Expand Down
1 change: 1 addition & 0 deletions cmake/Summary.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ function(caffe_print_configuration_summary)
caffe_status(" Build type : ${CMAKE_BUILD_TYPE}")
caffe_status(" BUILD_python : ${BUILD_python}")
caffe_status(" BUILD_matlab : ${BUILD_matlab}")
caffe_status(" BUILD_docs : ${BUILD_docs}")
caffe_status(" CPU_ONLY : ${CPU_ONLY}")
caffe_status("")
caffe_status("Dependencies:")
Expand Down

0 comments on commit 60e8f7a

Please sign in to comment.