Skip to content

Commit db66a0c

Browse files
jeffdonahuejeffdonahue
committed
Merge pull request #623 from BVLC/cmake
CMake build system (feature development tracking PR)
2 parents 2882cda + 246f510 commit db66a0c

31 files changed

+1131
-18
lines changed

‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,8 @@ _site
6262
*.sublime-workspace
6363
*.sublime-project
6464

65+
# Eclipse Project settings
66+
*.*project
67+
68+
# CMake generated files
69+
*.gen.cmake

‎.travis.yml

+31-11
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ compiler:
1313
before_install:
1414
- echo $LANG
1515
- echo $LC_ALL
16+
- export NUM_THREADS=4
17+
- alias make="make --jobs=$NUM_THREADS"
18+
- sudo add-apt-repository ppa:ubuntu-sdk-team/ppa -y
1619
- sudo apt-get -y update
17-
- sudo apt-get -y install wget git curl python-dev python-numpy libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev protobuf-compiler libatlas-dev libatlas-base-dev bc
20+
- sudo apt-get -y install wget git curl python-dev python-numpy libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-dev libboost-system-dev libboost-python-dev libhdf5-serial-dev protobuf-compiler libatlas-dev libatlas-base-dev bc cmake
1821

1922
install:
2023
- wget https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz -O /tmp/glog-0.3.3.tar.gz && tar -C /tmp -xzvf /tmp/glog-0.3.3.tar.gz && rm /tmp/glog-0.3.3.tar.gz
@@ -35,22 +38,39 @@ install:
3538
before_script:
3639
- mv Makefile.config.example Makefile.config
3740
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
38-
- export NUM_THREADS=4
3941

4042
script:
41-
# CPU-GPU: build only.
43+
# CMake build
44+
- mkdir build
45+
- cd build
46+
## CPU-GPU: build only
47+
- cmake -DBUILD_PYTHON=ON -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release ..
48+
- make --keep-going
49+
- make clean && rm -rf *
50+
## CPU-only: comprehensive
51+
- cmake -DBUILD_PYTHON=ON -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release -DCPU_ONLY=ON ..
52+
- make --keep-going
53+
- make runtest
54+
- make lint
55+
- make clean
56+
## Cleanup CMake build
57+
- cd ..
58+
- rm -rf build
59+
60+
# Make build
61+
## CPU-GPU: build only
4262
- export CPU_ONLY=0
43-
- make --keep-going --jobs=$NUM_THREADS all
63+
- make --keep-going all
4464
- make clean
45-
# CPU-only: comprehensive.
65+
## CPU-only: comprehensive
4666
- export CPU_ONLY=1
47-
- make --keep-going --jobs=$NUM_THREADS all test warn lint
67+
- make --keep-going all test warn lint
4868
- make runtest
49-
- make --jobs=$NUM_THREADS all
50-
- make --jobs=$NUM_THREADS test
51-
- make --jobs=$NUM_THREADS warn
52-
- make --jobs=$NUM_THREADS lint
53-
- make --jobs=$NUM_THREADS pycaffe
69+
- make all
70+
- make test
71+
- make warn
72+
- make lint
73+
- make pycaffe
5474

5575
notifications:
5676
# Emails are sent to the committer's git-configured email address by default,

‎CMakeLists.txt

+90
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
cmake_minimum_required(VERSION 2.8.8)
2+
project( Caffe )
3+
4+
### Build Options ##########################################################################
5+
6+
option(CPU_ONLY "Build Caffe without GPU support" OFF)
7+
option(BUILD_PYTHON "Build Python wrapper" OFF)
8+
option(BUILD_MATLAB "Build Matlab wrapper" OFF)
9+
option(BUILD_EXAMPLES "Build examples" ON)
10+
option(BUILD_SHARED_LIBS "Build SHARED libs if ON and STATIC otherwise" OFF)
11+
12+
if(NOT BLAS)
13+
set(BLAS atlas)
14+
endif()
15+
16+
if(NOT CUDA_TEST_DEVICE)
17+
set(CUDA_TEST_DEVICE -1)
18+
endif()
19+
20+
# Install Prefix
21+
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
22+
set (CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Default install path" FORCE )
23+
endif()
24+
25+
### Configuration ###########################################################################
26+
# Compiler Flags
27+
set(CMAKE_CXX_COMPILER_FLAGS ${CMAKE_CXX_COMPILER_FLAGS} -Wall)
28+
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} )#set global flags here)
29+
set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG} )#set debug flags here)
30+
set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} )#set release flags here)
31+
32+
# Global Definitions
33+
if(CPU_ONLY)
34+
add_definitions(-DCPU_ONLY)
35+
endif()
36+
37+
# Include Directories
38+
set(${PROJECT_NAME}_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/include)
39+
include_directories(${${PROJECT_NAME}_INCLUDE_DIRS})
40+
include_directories(${CMAKE_SOURCE_DIR}/src)
41+
42+
# CMake Scripts dir
43+
set(CMAKE_SCRIPT_DIR ${CMAKE_SOURCE_DIR}/CMakeScripts)
44+
45+
# CMake module path for custom module finding
46+
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SCRIPT_DIR})
47+
48+
# CUDA is required globally
49+
if(NOT CPU_ONLY)
50+
find_package(CUDA 5.5 REQUIRED)
51+
include_directories(${CUDA_INCLUDE_DIRS})
52+
endif()
53+
54+
### Subdirectories ##########################################################################
55+
56+
add_subdirectory(src/gtest)
57+
add_subdirectory(src/caffe)
58+
add_subdirectory(tools)
59+
60+
if(BUILD_EXAMPLES)
61+
message(STATUS "Examples enabled")
62+
add_subdirectory(examples)
63+
endif()
64+
65+
if(BUILD_PYTHON)
66+
message(STATUS "Python enabled")
67+
add_subdirectory(python)
68+
endif()
69+
70+
if(BUILD_MATLAB)
71+
message(STATUS "Matlab enabled")
72+
add_subdirectory(matlab)
73+
endif()
74+
75+
### Lint Target Setup ##########################################################################
76+
77+
set(LINT_TARGET lint)
78+
set(LINT_SCRIPT ${CMAKE_SCRIPT_DIR}/lint.cmake)
79+
add_custom_target(
80+
${LINT_TARGET}
81+
COMMAND ${CMAKE_COMMAND} -P ${LINT_SCRIPT}
82+
)
83+
84+
### Install #################################################################################
85+
86+
# Install Includes
87+
file(GLOB folders ${${PROJECT_NAME}_INCLUDE_DIRS}/*)
88+
install(DIRECTORY ${folders} DESTINATION include)
89+
90+

‎CMakeScripts/FindAtlas.cmake

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# Find the Atlas (and Lapack) libraries
2+
#
3+
# The following variables are optionally searched for defaults
4+
# Atlas_ROOT_DIR: Base directory where all Atlas components are found
5+
#
6+
# The following are set after configuration is done:
7+
# Atlas_FOUND
8+
# Atlas_INCLUDE_DIRS
9+
# Atlas_LIBRARIES
10+
# Atlas_LIBRARYRARY_DIRS
11+
12+
set(Atlas_INCLUDE_SEARCH_PATHS
13+
/usr/include/atlas
14+
/usr/include/atlas-base
15+
$ENV{Atlas_ROOT_DIR}
16+
$ENV{Atlas_ROOT_DIR}/include
17+
)
18+
19+
set(Atlas_LIB_SEARCH_PATHS
20+
/usr/lib/atlas
21+
/usr/lib/atlas-base
22+
$ENV{Atlas_ROOT_DIR}
23+
$ENV{Atlas_ROOT_DIR}/lib
24+
)
25+
26+
find_path(Atlas_CBLAS_INCLUDE_DIR NAMES cblas.h PATHS ${Atlas_INCLUDE_SEARCH_PATHS})
27+
find_path(Atlas_CLAPACK_INCLUDE_DIR NAMES clapack.h PATHS ${Atlas_INCLUDE_SEARCH_PATHS})
28+
find_library(Atlas_CBLAS_LIBRARY NAMES ptcblas_r ptcblas cblas_r cblas PATHS ${Atlas_LIB_SEARCH_PATHS})
29+
find_library(Atlas_BLAS_LIBRARY NAMES atlas_r atlas PATHS ${Atlas_LIB_SEARCH_PATHS})
30+
find_library(Atlas_LAPACK_LIBRARY NAMES alapack_r alapack lapack_atlas PATHS ${Atlas_LIB_SEARCH_PATHS})
31+
32+
set(LOOKED_FOR
33+
34+
Atlas_CBLAS_INCLUDE_DIR
35+
Atlas_CLAPACK_INCLUDE_DIR
36+
37+
Atlas_CBLAS_LIBRARY
38+
Atlas_BLAS_LIBRARY
39+
Atlas_LAPACK_LIBRARY
40+
)
41+
42+
include(FindPackageHandleStandardArgs)
43+
find_package_handle_standard_args(Atlas DEFAULT_MSG ${LOOKED_FOR})
44+
45+
if(ATLAS_FOUND)
46+
47+
mark_as_advanced(${LOOKED_FOR})
48+
49+
set(Atlas_INCLUDE_DIR
50+
${Atlas_CBLAS_INCLUDE_DIR}
51+
${Atlas_CLAPACK_INCLUDE_DIR}
52+
)
53+
54+
set(Atlas_LIBRARIES
55+
${Atlas_LAPACK_LIBRARY}
56+
${Atlas_CBLAS_LIBRARY}
57+
${Atlas_BLAS_LIBRARY}
58+
)
59+
60+
endif(ATLAS_FOUND)
61+

‎CMakeScripts/FindGFlags.cmake

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# - Try to find GFLAGS
2+
#
3+
# The following variables are optionally searched for defaults
4+
# GFLAGS_ROOT_DIR: Base directory where all GFLAGS components are found
5+
#
6+
# The following are set after configuration is done:
7+
# GFLAGS_FOUND
8+
# GFLAGS_INCLUDE_DIRS
9+
# GFLAGS_LIBRARIES
10+
# GFLAGS_LIBRARYRARY_DIRS
11+
12+
include(FindPackageHandleStandardArgs)
13+
14+
set(GFLAGS_ROOT_DIR "" CACHE PATH "Folder contains Gflags")
15+
16+
# We are testing only a couple of files in the include directories
17+
if(WIN32)
18+
find_path(GFLAGS_INCLUDE_DIR gflags/gflags.h
19+
PATHS ${GFLAGS_ROOT_DIR}/src/windows)
20+
else()
21+
find_path(GFLAGS_INCLUDE_DIR gflags/gflags.h
22+
PATHS ${GFLAGS_ROOT_DIR})
23+
endif()
24+
25+
if(MSVC)
26+
find_library(GFLAGS_LIBRARY_RELEASE
27+
NAMES libgflags
28+
PATHS ${GFLAGS_ROOT_DIR}
29+
PATH_SUFFIXES Release)
30+
31+
find_library(GFLAGS_LIBRARY_DEBUG
32+
NAMES libgflags-debug
33+
PATHS ${GFLAGS_ROOT_DIR}
34+
PATH_SUFFIXES Debug)
35+
36+
set(GFLAGS_LIBRARY optimized ${GFLAGS_LIBRARY_RELEASE} debug ${GFLAGS_LIBRARY_DEBUG})
37+
else()
38+
find_library(GFLAGS_LIBRARY gflags)
39+
endif()
40+
41+
find_package_handle_standard_args(GFLAGS DEFAULT_MSG
42+
GFLAGS_INCLUDE_DIR GFLAGS_LIBRARY)
43+
44+
45+
if(GFLAGS_FOUND)
46+
set(GFLAGS_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIR})
47+
set(GFLAGS_LIBRARIES ${GFLAGS_LIBRARY})
48+
endif()

‎CMakeScripts/FindGlog.cmake

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# - Try to find Glog
2+
#
3+
# The following variables are optionally searched for defaults
4+
# GLOG_ROOT_DIR: Base directory where all GLOG components are found
5+
#
6+
# The following are set after configuration is done:
7+
# GLOG_FOUND
8+
# GLOG_INCLUDE_DIRS
9+
# GLOG_LIBRARIES
10+
# GLOG_LIBRARYRARY_DIRS
11+
12+
include(FindPackageHandleStandardArgs)
13+
14+
set(GLOG_ROOT_DIR "" CACHE PATH "Folder contains Google glog")
15+
16+
if(WIN32)
17+
find_path(GLOG_INCLUDE_DIR glog/logging.h
18+
PATHS ${GLOG_ROOT_DIR}/src/windows)
19+
else()
20+
find_path(GLOG_INCLUDE_DIR glog/logging.h
21+
PATHS ${GLOG_ROOT_DIR})
22+
endif()
23+
24+
if(MSVC)
25+
find_library(GLOG_LIBRARY_RELEASE libglog_static
26+
PATHS ${GLOG_ROOT_DIR}
27+
PATH_SUFFIXES Release)
28+
29+
find_library(GLOG_LIBRARY_DEBUG libglog_static
30+
PATHS ${GLOG_ROOT_DIR}
31+
PATH_SUFFIXES Debug)
32+
33+
set(GLOG_LIBRARY optimized ${GLOG_LIBRARY_RELEASE} debug ${GLOG_LIBRARY_DEBUG})
34+
else()
35+
find_library(GLOG_LIBRARY glog
36+
PATHS ${GLOG_ROOT_DIR}
37+
PATH_SUFFIXES
38+
lib
39+
lib64)
40+
endif()
41+
42+
find_package_handle_standard_args(GLOG DEFAULT_MSG
43+
GLOG_INCLUDE_DIR GLOG_LIBRARY)
44+
45+
if(GLOG_FOUND)
46+
set(GLOG_INCLUDE_DIRS ${GLOG_INCLUDE_DIR})
47+
set(GLOG_LIBRARIES ${GLOG_LIBRARY})
48+
endif()

0 commit comments

Comments
 (0)