Skip to content

Commit 9f4588e

Browse files
MatthijsBurghMatthijsBurgh
committed
(cmake) cleanup
1 parent adb68d1 commit 9f4588e

File tree

7 files changed

+26
-38
lines changed

7 files changed

+26
-38
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ caffe_option(USE_CUDNN "Build Caffe with cuDNN library support" ON IF NOT CPU_ON
3232
caffe_option(USE_NCCL "Build Caffe with NCCL library support" OFF)
3333
caffe_option(BUILD_SHARED_LIBS "Build shared libraries" ON)
3434
caffe_option(BUILD_python "Build Python wrapper" ON)
35-
set(python_version "2" CACHE STRING "Specify which Python version to use")
3635
caffe_option(BUILD_matlab "Build Matlab wrapper" OFF IF UNIX OR APPLE)
3736
caffe_option(BUILD_docs "Build documentation" ON IF UNIX OR APPLE)
3837
caffe_option(BUILD_python_layer "Build the Caffe Python layer" ON)
@@ -105,7 +104,7 @@ add_custom_target(lint COMMAND ${CMAKE_COMMAND} -P ${PROJECT_SOURCE_DIR}/cmake/l
105104

106105
# ---[ pytest target
107106
if(BUILD_python)
108-
add_custom_target(pytest COMMAND python${python_version} -m unittest discover -s caffe/test WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python )
107+
add_custom_target(pytest COMMAND python3 -m unittest discover -s caffe/test WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python )
109108
add_dependencies(pytest pycaffe)
110109
endif()
111110

‎cmake/Dependencies.cmake

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -141,41 +141,32 @@ endif()
141141

142142
# ---[ Python
143143
if(BUILD_python)
144-
if(NOT "${python_version}" VERSION_LESS "3.0.0")
145-
# use python3
146-
find_package(PythonInterp 3.0)
147-
find_package(PythonLibs 3.0)
148-
find_package(NumPy 1.7.1)
149-
# Find the matching boost python implementation
150-
set(version ${PYTHONLIBS_VERSION_STRING})
144+
# use python3
145+
find_package(Python 3 COMPONENTS Interpreter Development NumPy)
146+
# Find the matching boost python implementation
147+
set(version ${Python_VERSION})
148+
149+
STRING( REGEX REPLACE "[^0-9]" "" boost_py_version ${version} )
150+
find_package(Boost 1.46 COMPONENTS "python-py${boost_py_version}")
151+
set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND})
152+
153+
while(NOT "${version}" STREQUAL "" AND NOT Boost_PYTHON_FOUND)
154+
STRING( REGEX REPLACE "([0-9.]+).[0-9]+" "\\1" version ${version} )
151155

152156
STRING( REGEX REPLACE "[^0-9]" "" boost_py_version ${version} )
153157
find_package(Boost 1.46 COMPONENTS "python-py${boost_py_version}")
154158
set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND})
155159

156-
while(NOT "${version}" STREQUAL "" AND NOT Boost_PYTHON_FOUND)
157-
STRING( REGEX REPLACE "([0-9.]+).[0-9]+" "\\1" version ${version} )
158-
159-
STRING( REGEX REPLACE "[^0-9]" "" boost_py_version ${version} )
160-
find_package(Boost 1.46 COMPONENTS "python-py${boost_py_version}")
161-
set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY${boost_py_version}_FOUND})
162-
163-
STRING( REGEX MATCHALL "([0-9.]+).[0-9]+" has_more_version ${version} )
164-
if("${has_more_version}" STREQUAL "")
165-
break()
166-
endif()
167-
endwhile()
168-
if(NOT Boost_PYTHON_FOUND)
169-
find_package(Boost 1.46 COMPONENTS python)
160+
STRING( REGEX MATCHALL "([0-9.]+).[0-9]+" has_more_version ${version} )
161+
if("${has_more_version}" STREQUAL "")
162+
break()
170163
endif()
171-
else()
172-
# disable Python 3 search
173-
find_package(PythonInterp 2.7)
174-
find_package(PythonLibs 2.7)
175-
find_package(NumPy 1.7.1)
164+
endwhile()
165+
if(NOT Boost_PYTHON_FOUND)
176166
find_package(Boost 1.46 COMPONENTS python)
177167
endif()
178-
if(PYTHONLIBS_FOUND AND NUMPY_FOUND AND Boost_PYTHON_FOUND)
168+
169+
if(Python_Interpreter_FOUND AND Python_NumPy_FOUND AND Boost_PYTHON_FOUND)
179170
set(HAVE_PYTHON TRUE)
180171
if(BUILD_python_layer)
181172
list(APPEND Caffe_DEFINITIONS PRIVATE -DWITH_PYTHON_LAYER)

‎cmake/Misc.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
2929
endif()
3030

3131
# ---[ RPATH settings
32-
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOLEAN "Use link paths for shared library rpath")
32+
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "Use link paths for shared library rpath")
3333
set(CMAKE_MACOSX_RPATH TRUE)
3434

3535
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES

‎cmake/ProtoBuf.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ endif()
1616
if(PROTOBUF_FOUND)
1717
# fetches protobuf version
1818
caffe_parse_header(${PROTOBUF_INCLUDE_DIR}/google/protobuf/stubs/common.h VERION_LINE GOOGLE_PROTOBUF_VERSION)
19-
string(REGEX MATCH "([0-9])00([0-9])00([0-9])" PROTOBUF_VERSION ${GOOGLE_PROTOBUF_VERSION})
19+
string(REGEX MATCH "([0-9])0([0-9]*)00([0-9])" PROTOBUF_VERSION ${GOOGLE_PROTOBUF_VERSION})
2020
set(PROTOBUF_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
2121
unset(GOOGLE_PROTOBUF_VERSION)
2222
endif()

‎cmake/Summary.cmake

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ function(caffe_print_configuration_summary)
125125
caffe_status("Dependencies:")
126126
caffe_status(" BLAS : " APPLE THEN "Yes (vecLib)" ELSE "Yes (${BLAS})")
127127
caffe_status(" Boost : Yes (ver. ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION})")
128-
caffe_status(" glog : Yes")
129-
caffe_status(" gflags : Yes")
128+
caffe_status(" glog : " GLOG_FOUND THEN "Yes" ELSE "No" )
129+
caffe_status(" gflags : " GFLAGS_FOUND THEN "Yes" ELSE "No" )
130130
caffe_status(" protobuf : " PROTOBUF_FOUND THEN "Yes (ver. ${PROTOBUF_VERSION})" ELSE "No" )
131131
if(USE_LMDB)
132132
caffe_status(" lmdb : " LMDB_FOUND THEN "Yes (ver. ${LMDB_VERSION})" ELSE "No")
@@ -153,9 +153,8 @@ function(caffe_print_configuration_summary)
153153
endif()
154154
if(HAVE_PYTHON)
155155
caffe_status("Python:")
156-
caffe_status(" Interpreter :" PYTHON_EXECUTABLE THEN "${PYTHON_EXECUTABLE} (ver. ${PYTHON_VERSION_STRING})" ELSE "No")
157-
caffe_status(" Libraries :" PYTHONLIBS_FOUND THEN "${PYTHON_LIBRARIES} (ver ${PYTHONLIBS_VERSION_STRING})" ELSE "No")
158-
caffe_status(" NumPy :" NUMPY_FOUND THEN "${NUMPY_INCLUDE_DIR} (ver ${NUMPY_VERSION})" ELSE "No")
156+
caffe_status(" Interpreter :" Python_EXECUTABLE THEN "${Python_EXECUTABLE} (ver. ${Python_VERSION})" ELSE "No")
157+
caffe_status(" NumPy :" Python_NumPy_FOUND THEN "${Python_NumPy_INCLUDE_DIRS} (ver ${Python_NumPy_VERSION})" ELSE "No")
159158
caffe_status("")
160159
endif()
161160
if(BUILD_matlab)

‎docker/gpu/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ WORKDIR $CAFFE_ROOT
2828
RUN cd /opt && \
2929
git clone https://github.com/CMU-Perceptual-Computing-Lab/caffe.git && \
3030
cd $CAFFE_ROOT && \
31-
sed -i 's/set(python_version "2"/set(python_version "3"/g' CMakeLists.txt && \
3231
# sed -i 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall")/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -std=c++11")/g' CMakeLists.txt && \
3332
# sed -i 's/cudnn.h CUDNN_VERSION_FILE_CONTENTS/cudnn_version.h CUDNN_VERSION_FILE_CONTENTS/g' cmake/Cuda.cmake && \
3433
mkdir build && cd build && \

‎scripts/travis/configure-cmake.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
mkdir -p build
44
cd build
55

6-
ARGS="-DCMAKE_BUILD_TYPE=Release -DBLAS=Open -Dpython_version=3"
6+
ARGS="-DCMAKE_BUILD_TYPE=Release -DBLAS=Open"
77

88
if $WITH_IO ; then
99
ARGS="$ARGS -DUSE_OPENCV=On -DUSE_LMDB=On -DUSE_LEVELDB=On"

0 commit comments

Comments
 (0)