[caffe] 01/05: New upstream version 1.0.0~rc5
Zhou Mo
cdluminate-guest at moszumanska.debian.org
Wed Mar 15 08:58:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
cdluminate-guest pushed a commit to branch master
in repository caffe.
commit 49b591aa7b453c7e770ae0b65633c7ad9f21e343
Author: Zhou Mo <cdluminate at gmail.com>
Date: Wed Mar 15 07:33:06 2017 +0000
New upstream version 1.0.0~rc5
---
CMakeLists.txt | 29 ++++++--
Makefile | 2 +-
Makefile.config.example | 8 ++-
cmake/ConfigGen.cmake | 65 +----------------
cmake/Cuda.cmake | 12 ++--
cmake/Dependencies.cmake | 92 +++++++++++++++----------
cmake/Modules/FindvecLib.cmake | 2 +-
cmake/ProtoBuf.cmake | 4 +-
cmake/Templates/CaffeConfig.cmake.in | 15 ++--
cmake/Templates/caffe_config.h.in | 19 -----
docker/Makefile | 50 --------------
docker/README.md | 69 +++++++++----------
docker/{standalone => }/cpu/Dockerfile | 12 ++--
docker/{standalone => }/gpu/Dockerfile | 15 ++--
docker/templates/Dockerfile.template | 42 -----------
docs/install_apt_debian.md | 76 ++++++++++----------
docs/installation.md | 2 +-
docs/tutorial/layers/accuracy.md | 3 +-
docs/tutorial/layers/argmax.md | 3 +-
docs/tutorial/layers/infogainloss.md | 5 +-
docs/tutorial/layers/lrn.md | 4 +-
docs/tutorial/layers/memorydata.md | 2 +-
docs/tutorial/layers/multinomiallogisticloss.md | 2 +-
docs/tutorial/layers/silence.md | 8 +--
matlab/+caffe/Net.m | 3 +
matlab/+caffe/Solver.m | 3 +
matlab/+caffe/private/caffe_.cpp | 24 +++++++
matlab/demo/classification_demo.m | 7 +-
python/CMakeLists.txt | 6 +-
python/caffe/draw.py | 6 +-
python/caffe/pycaffe.py | 11 +++
python/caffe/test/test_net.py | 7 ++
src/caffe/CMakeLists.txt | 16 ++++-
src/caffe/net.cpp | 2 -
src/caffe/proto/caffe.proto | 3 +-
src/caffe/solver.cpp | 1 -
src/gtest/CMakeLists.txt | 3 +
tools/extra/parse_log.py | 2 +-
tools/extra/plot_training_log.py.example | 17 ++---
39 files changed, 280 insertions(+), 372 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3af394f..3056d75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,8 +10,8 @@ endif()
project(Caffe C CXX)
# ---[ Caffe version
-set(CAFFE_TARGET_VERSION "1.0.0-rc3" CACHE STRING "Caffe logical version")
-set(CAFFE_TARGET_SOVERSION "1.0.0-rc3" CACHE STRING "Caffe soname version")
+set(CAFFE_TARGET_VERSION "1.0.0-rc5" CACHE STRING "Caffe logical version")
+set(CAFFE_TARGET_SOVERSION "1.0.0-rc5" CACHE STRING "Caffe soname version")
add_definitions(-DCAFFE_VERSION=${CAFFE_TARGET_VERSION})
# ---[ Using cmake scripts and modules
@@ -39,6 +39,7 @@ caffe_option(USE_OPENCV "Build with OpenCV support" ON)
caffe_option(USE_LEVELDB "Build with levelDB" ON)
caffe_option(USE_LMDB "Build with lmdb" ON)
caffe_option(ALLOW_LMDB_NOLOCK "Allow MDB_NOLOCK when reading LMDB files (only if necessary)" OFF)
+caffe_option(USE_OPENMP "Link with OpenMP (when your BLAS wants OpenMP and you get linker errors)" OFF)
# ---[ Dependencies
include(cmake/Dependencies.cmake)
@@ -55,8 +56,6 @@ if(USE_libstdcpp)
message("-- Warning: forcing libstdc++ (controlled by USE_libstdcpp option in cmake)")
endif()
-add_definitions(-DGTEST_USE_OWN_TR1_TUPLE)
-
# ---[ Warnings
caffe_warnings_disable(CMAKE_CXX_FLAGS -Wno-sign-compare -Wno-uninitialized)
@@ -65,8 +64,26 @@ configure_file(cmake/Templates/caffe_config.h.in "${PROJECT_BINARY_DIR}/caffe_co
# ---[ Includes
set(Caffe_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
-include_directories(${Caffe_INCLUDE_DIR} ${PROJECT_BINARY_DIR})
-include_directories(BEFORE src) # This is needed for gtest.
+set(Caffe_SRC_DIR ${PROJECT_SOURCE_DIR}/src)
+include_directories(${PROJECT_BINARY_DIR})
+
+# ---[ Includes & defines for CUDA
+
+# cuda_compile() does not have per-call dependencies or include pathes
+# (cuda_compile() has per-call flags, but we set them here too for clarity)
+#
+# list(REMOVE_ITEM ...) invocations remove PRIVATE and PUBLIC keywords from collected definitions and include pathes
+if(HAVE_CUDA)
+ # pass include pathes to cuda_include_directories()
+ set(Caffe_ALL_INCLUDE_DIRS ${Caffe_INCLUDE_DIRS})
+ list(REMOVE_ITEM Caffe_ALL_INCLUDE_DIRS PRIVATE PUBLIC)
+ cuda_include_directories(${Caffe_INCLUDE_DIR} ${Caffe_SRC_DIR} ${Caffe_ALL_INCLUDE_DIRS})
+
+ # add definitions to nvcc flags directly
+ set(Caffe_ALL_DEFINITIONS ${Caffe_DEFINITIONS})
+ list(REMOVE_ITEM Caffe_ALL_DEFINITIONS PRIVATE PUBLIC)
+ list(APPEND CUDA_NVCC_FLAGS ${Caffe_ALL_DEFINITIONS})
+endif()
# ---[ Subdirectories
add_subdirectory(src/gtest)
diff --git a/Makefile b/Makefile
index 65d08f7..77900b6 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ LIB_BUILD_DIR := $(BUILD_DIR)/lib
STATIC_NAME := $(LIB_BUILD_DIR)/lib$(LIBRARY_NAME).a
DYNAMIC_VERSION_MAJOR := 1
DYNAMIC_VERSION_MINOR := 0
-DYNAMIC_VERSION_REVISION := 0-rc3
+DYNAMIC_VERSION_REVISION := 0-rc5
DYNAMIC_NAME_SHORT := lib$(LIBRARY_NAME).so
#DYNAMIC_SONAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR)
DYNAMIC_VERSIONED_NAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR).$(DYNAMIC_VERSION_MINOR).$(DYNAMIC_VERSION_REVISION)
diff --git a/Makefile.config.example b/Makefile.config.example
index b590bd1..d552b38 100644
--- a/Makefile.config.example
+++ b/Makefile.config.example
@@ -31,13 +31,17 @@ CUDA_DIR := /usr/local/cuda
# CUDA_DIR := /usr
# CUDA architecture setting: going with all of them.
-# For CUDA < 6.0, comment the *_50 lines for compatibility.
+# For CUDA < 6.0, comment the *_50 through *_61 lines for compatibility.
+# For CUDA < 8.0, comment the *_60 and *_61 lines for compatibility.
CUDA_ARCH := -gencode arch=compute_20,code=sm_20 \
-gencode arch=compute_20,code=sm_21 \
-gencode arch=compute_30,code=sm_30 \
-gencode arch=compute_35,code=sm_35 \
-gencode arch=compute_50,code=sm_50 \
- -gencode arch=compute_50,code=compute_50
+ -gencode arch=compute_52,code=sm_52 \
+ -gencode arch=compute_60,code=sm_60 \
+ -gencode arch=compute_61,code=sm_61 \
+ -gencode arch=compute_61,code=compute_61
# BLAS choice:
# atlas for ATLAS (default)
diff --git a/cmake/ConfigGen.cmake b/cmake/ConfigGen.cmake
index fd9dd2d..ad91f54 100644
--- a/cmake/ConfigGen.cmake
+++ b/cmake/ConfigGen.cmake
@@ -1,32 +1,5 @@
################################################################################################
-# Helper function to fetch caffe includes which will be passed to dependent projects
-# Usage:
-# caffe_get_current_includes(<includes_list_variable>)
-function(caffe_get_current_includes includes_variable)
- get_property(current_includes DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
- caffe_convert_absolute_paths(current_includes)
-
- # remove at most one ${PROJECT_BINARY_DIR} include added for caffe_config.h
- list(FIND current_includes ${PROJECT_BINARY_DIR} __index)
- list(REMOVE_AT current_includes ${__index})
-
- # removing numpy includes (since not required for client libs)
- set(__toremove "")
- foreach(__i ${current_includes})
- if(${__i} MATCHES "python")
- list(APPEND __toremove ${__i})
- endif()
- endforeach()
- if(__toremove)
- list(REMOVE_ITEM current_includes ${__toremove})
- endif()
-
- caffe_list_unique(current_includes)
- set(${includes_variable} ${current_includes} PARENT_SCOPE)
-endfunction()
-
-################################################################################################
# Helper function to get all list items that begin with given prefix
# Usage:
# caffe_get_items_with_prefix(<prefix> <list_variable> <output_variable>)
@@ -47,39 +20,15 @@ endfunction()
function(caffe_generate_export_configs)
set(install_cmake_suffix "share/Caffe")
- # ---[ Configure build-tree CaffeConfig.cmake file ]---
- caffe_get_current_includes(Caffe_INCLUDE_DIRS)
-
- set(Caffe_DEFINITIONS "")
if(NOT HAVE_CUDA)
set(HAVE_CUDA FALSE)
- list(APPEND Caffe_DEFINITIONS -DCPU_ONLY)
- endif()
-
- if(USE_OPENCV)
- list(APPEND Caffe_DEFINITIONS -DUSE_OPENCV)
- endif()
-
- if(USE_LMDB)
- list(APPEND Caffe_DEFINITIONS -DUSE_LMDB)
- if (ALLOW_LMDB_NOLOCK)
- list(APPEND Caffe_DEFINITIONS -DALLOW_LMDB_NOLOCK)
- endif()
- endif()
-
- if(USE_LEVELDB)
- list(APPEND Caffe_DEFINITIONS -DUSE_LEVELDB)
endif()
if(NOT HAVE_CUDNN)
set(HAVE_CUDNN FALSE)
- else()
- list(APPEND DEFINITIONS -DUSE_CUDNN)
endif()
- if(BLAS STREQUAL "MKL" OR BLAS STREQUAL "mkl")
- list(APPEND Caffe_DEFINITIONS -DUSE_MKL)
- endif()
+ # ---[ Configure build-tree CaffeConfig.cmake file ]---
configure_file("cmake/Templates/CaffeConfig.cmake.in" "${PROJECT_BINARY_DIR}/CaffeConfig.cmake" @ONLY)
@@ -89,18 +38,6 @@ function(caffe_generate_export_configs)
# ---[ Configure install-tree CaffeConfig.cmake file ]---
- # remove source and build dir includes
- caffe_get_items_with_prefix(${PROJECT_SOURCE_DIR} Caffe_INCLUDE_DIRS __insource)
- caffe_get_items_with_prefix(${PROJECT_BINARY_DIR} Caffe_INCLUDE_DIRS __inbinary)
- list(REMOVE_ITEM Caffe_INCLUDE_DIRS ${__insource} ${__inbinary})
-
- # add `install` include folder
- set(lines
- "get_filename_component(__caffe_include \"\${Caffe_CMAKE_DIR}/../../include\" ABSOLUTE)\n"
- "list(APPEND Caffe_INCLUDE_DIRS \${__caffe_include})\n"
- "unset(__caffe_include)\n")
- string(REPLACE ";" "" Caffe_INSTALL_INCLUDE_DIR_APPEND_COMMAND ${lines})
-
configure_file("cmake/Templates/CaffeConfig.cmake.in" "${PROJECT_BINARY_DIR}/cmake/CaffeConfig.cmake" @ONLY)
# Install the CaffeConfig.cmake and export set to use with install-tree
diff --git a/cmake/Cuda.cmake b/cmake/Cuda.cmake
index 0fbf301..b2b19e8 100644
--- a/cmake/Cuda.cmake
+++ b/cmake/Cuda.cmake
@@ -240,17 +240,17 @@ endif()
set(HAVE_CUDA TRUE)
message(STATUS "CUDA detected: " ${CUDA_VERSION})
-include_directories(SYSTEM ${CUDA_INCLUDE_DIRS})
-list(APPEND Caffe_LINKER_LIBS ${CUDA_CUDART_LIBRARY}
- ${CUDA_curand_LIBRARY} ${CUDA_CUBLAS_LIBRARIES})
+list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${CUDA_INCLUDE_DIRS})
+list(APPEND Caffe_LINKER_LIBS PUBLIC ${CUDA_CUDART_LIBRARY}
+ ${CUDA_curand_LIBRARY} ${CUDA_CUBLAS_LIBRARIES})
# cudnn detection
if(USE_CUDNN)
detect_cuDNN()
if(HAVE_CUDNN)
- add_definitions(-DUSE_CUDNN)
- include_directories(SYSTEM ${CUDNN_INCLUDE})
- list(APPEND Caffe_LINKER_LIBS ${CUDNN_LIBRARY})
+ list(APPEND Caffe_DEFINITIONS PUBLIC -DUSE_CUDNN)
+ list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${CUDNN_INCLUDE})
+ list(APPEND Caffe_LINKER_LIBS PUBLIC ${CUDNN_LIBRARY})
endif()
endif()
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index ba28a12..02c8152 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -1,57 +1,76 @@
-# This list is required for static linking and exported to CaffeConfig.cmake
+# These lists are later turned into target properties on main caffe library target
set(Caffe_LINKER_LIBS "")
+set(Caffe_INCLUDE_DIRS "")
+set(Caffe_DEFINITIONS "")
+set(Caffe_COMPILE_OPTIONS "")
# ---[ Boost
find_package(Boost 1.46 REQUIRED COMPONENTS system thread filesystem)
-include_directories(SYSTEM ${Boost_INCLUDE_DIR})
-list(APPEND Caffe_LINKER_LIBS ${Boost_LIBRARIES})
+list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${Boost_INCLUDE_DIRS})
+list(APPEND Caffe_LINKER_LIBS PUBLIC ${Boost_LIBRARIES})
# ---[ Threads
find_package(Threads REQUIRED)
-list(APPEND Caffe_LINKER_LIBS ${CMAKE_THREAD_LIBS_INIT})
+list(APPEND Caffe_LINKER_LIBS PRIVATE ${CMAKE_THREAD_LIBS_INIT})
+
+# ---[ OpenMP
+if(USE_OPENMP)
+ # Ideally, this should be provided by the BLAS library IMPORTED target. However,
+ # nobody does this, so we need to link to OpenMP explicitly and have the maintainer
+ # to flick the switch manually as needed.
+ #
+ # Moreover, OpenMP package does not provide an IMPORTED target as well, and the
+ # suggested way of linking to OpenMP is to append to CMAKE_{C,CXX}_FLAGS.
+ # However, this naïve method will force any user of Caffe to add the same kludge
+ # into their buildsystem again, so we put these options into per-target PUBLIC
+ # compile options and link flags, so that they will be exported properly.
+ find_package(OpenMP REQUIRED)
+ list(APPEND Caffe_LINKER_LIBS PRIVATE ${OpenMP_CXX_FLAGS})
+ list(APPEND Caffe_COMPILE_OPTIONS PRIVATE ${OpenMP_CXX_FLAGS})
+endif()
# ---[ Google-glog
include("cmake/External/glog.cmake")
-include_directories(SYSTEM ${GLOG_INCLUDE_DIRS})
-list(APPEND Caffe_LINKER_LIBS ${GLOG_LIBRARIES})
+list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${GLOG_INCLUDE_DIRS})
+list(APPEND Caffe_LINKER_LIBS PUBLIC ${GLOG_LIBRARIES})
# ---[ Google-gflags
include("cmake/External/gflags.cmake")
-include_directories(SYSTEM ${GFLAGS_INCLUDE_DIRS})
-list(APPEND Caffe_LINKER_LIBS ${GFLAGS_LIBRARIES})
+list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${GFLAGS_INCLUDE_DIRS})
+list(APPEND Caffe_LINKER_LIBS PUBLIC ${GFLAGS_LIBRARIES})
# ---[ Google-protobuf
include(cmake/ProtoBuf.cmake)
# ---[ HDF5
find_package(HDF5 COMPONENTS HL REQUIRED)
-include_directories(SYSTEM ${HDF5_INCLUDE_DIRS} ${HDF5_HL_INCLUDE_DIR})
-list(APPEND Caffe_LINKER_LIBS ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES})
+list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${HDF5_INCLUDE_DIRS})
+list(APPEND Caffe_LINKER_LIBS PUBLIC ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES})
# ---[ LMDB
if(USE_LMDB)
find_package(LMDB REQUIRED)
- include_directories(SYSTEM ${LMDB_INCLUDE_DIR})
- list(APPEND Caffe_LINKER_LIBS ${LMDB_LIBRARIES})
- add_definitions(-DUSE_LMDB)
+ list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${LMDB_INCLUDE_DIR})
+ list(APPEND Caffe_LINKER_LIBS PUBLIC ${LMDB_LIBRARIES})
+ list(APPEND Caffe_DEFINITIONS PUBLIC -DUSE_LMDB)
if(ALLOW_LMDB_NOLOCK)
- add_definitions(-DALLOW_LMDB_NOLOCK)
+ list(APPEND Caffe_DEFINITIONS PRIVATE -DALLOW_LMDB_NOLOCK)
endif()
endif()
# ---[ LevelDB
if(USE_LEVELDB)
find_package(LevelDB REQUIRED)
- include_directories(SYSTEM ${LevelDB_INCLUDE})
- list(APPEND Caffe_LINKER_LIBS ${LevelDB_LIBRARIES})
- add_definitions(-DUSE_LEVELDB)
+ list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${LevelDB_INCLUDES})
+ list(APPEND Caffe_LINKER_LIBS PUBLIC ${LevelDB_LIBRARIES})
+ list(APPEND Caffe_DEFINITIONS PUBLIC -DUSE_LEVELDB)
endif()
# ---[ Snappy
if(USE_LEVELDB)
find_package(Snappy REQUIRED)
- include_directories(SYSTEM ${Snappy_INCLUDE_DIR})
- list(APPEND Caffe_LINKER_LIBS ${Snappy_LIBRARIES})
+ list(APPEND Caffe_INCLUDE_DIRS PRIVATE ${Snappy_INCLUDE_DIR})
+ list(APPEND Caffe_LINKER_LIBS PRIVATE ${Snappy_LIBRARIES})
endif()
# ---[ CUDA
@@ -63,8 +82,7 @@ if(NOT HAVE_CUDA)
message(WARNING "-- CUDA is not detected by cmake. Building without it...")
endif()
- # TODO: remove this not cross platform define in future. Use caffe_config.h instead.
- add_definitions(-DCPU_ONLY)
+ list(APPEND Caffe_DEFINITIONS PUBLIC -DCPU_ONLY)
endif()
if(USE_NCCL)
@@ -80,10 +98,10 @@ if(USE_OPENCV)
if(NOT OpenCV_FOUND) # if not OpenCV 3.x, then imgcodecs are not found
find_package(OpenCV REQUIRED COMPONENTS core highgui imgproc)
endif()
- include_directories(SYSTEM ${OpenCV_INCLUDE_DIRS})
- list(APPEND Caffe_LINKER_LIBS ${OpenCV_LIBS})
+ list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${OpenCV_INCLUDE_DIRS})
+ list(APPEND Caffe_LINKER_LIBS PUBLIC ${OpenCV_LIBS})
message(STATUS "OpenCV found (${OpenCV_CONFIG_PATH})")
- add_definitions(-DUSE_OPENCV)
+ list(APPEND Caffe_DEFINITIONS PUBLIC -DUSE_OPENCV)
endif()
# ---[ BLAS
@@ -93,26 +111,26 @@ if(NOT APPLE)
if(BLAS STREQUAL "Atlas" OR BLAS STREQUAL "atlas")
find_package(Atlas REQUIRED)
- include_directories(SYSTEM ${Atlas_INCLUDE_DIR})
- list(APPEND Caffe_LINKER_LIBS ${Atlas_LIBRARIES})
+ list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${Atlas_INCLUDE_DIR})
+ list(APPEND Caffe_LINKER_LIBS PUBLIC ${Atlas_LIBRARIES})
elseif(BLAS STREQUAL "Open" OR BLAS STREQUAL "open")
find_package(OpenBLAS REQUIRED)
- include_directories(SYSTEM ${OpenBLAS_INCLUDE_DIR})
- list(APPEND Caffe_LINKER_LIBS ${OpenBLAS_LIB})
+ list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${OpenBLAS_INCLUDE_DIR})
+ list(APPEND Caffe_LINKER_LIBS PUBLIC ${OpenBLAS_LIB})
elseif(BLAS STREQUAL "MKL" OR BLAS STREQUAL "mkl")
find_package(MKL REQUIRED)
- include_directories(SYSTEM ${MKL_INCLUDE_DIR})
- list(APPEND Caffe_LINKER_LIBS ${MKL_LIBRARIES})
- add_definitions(-DUSE_MKL)
+ list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${MKL_INCLUDE_DIR})
+ list(APPEND Caffe_LINKER_LIBS PUBLIC ${MKL_LIBRARIES})
+ list(APPEND Caffe_DEFINITIONS PUBLIC -DUSE_MKL)
endif()
elseif(APPLE)
find_package(vecLib REQUIRED)
- include_directories(SYSTEM ${vecLib_INCLUDE_DIR})
- list(APPEND Caffe_LINKER_LIBS ${vecLib_LINKER_LIBS})
+ list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${vecLib_INCLUDE_DIR})
+ list(APPEND Caffe_LINKER_LIBS PUBLIC ${vecLib_LINKER_LIBS})
if(VECLIB_FOUND)
if(NOT vecLib_INCLUDE_DIR MATCHES "^/System/Library/Frameworks/vecLib.framework.*")
- add_definitions(-DUSE_ACCELERATE)
+ list(APPEND Caffe_DEFINITIONS PUBLIC -DUSE_ACCELERATE)
endif()
endif()
endif()
@@ -156,9 +174,9 @@ if(BUILD_python)
if(PYTHONLIBS_FOUND AND NUMPY_FOUND AND Boost_PYTHON_FOUND)
set(HAVE_PYTHON TRUE)
if(BUILD_python_layer)
- add_definitions(-DWITH_PYTHON_LAYER)
- include_directories(SYSTEM ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
- list(APPEND Caffe_LINKER_LIBS ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
+ list(APPEND Caffe_DEFINITIONS PRIVATE -DWITH_PYTHON_LAYER)
+ list(APPEND Caffe_INCLUDE_DIRS PRIVATE ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIR} PUBLIC ${Boost_INCLUDE_DIRS})
+ list(APPEND Caffe_LINKER_LIBS PRIVATE ${PYTHON_LIBRARIES} PUBLIC ${Boost_LIBRARIES})
endif()
endif()
endif()
diff --git a/cmake/Modules/FindvecLib.cmake b/cmake/Modules/FindvecLib.cmake
index 4604336..8eaab59 100644
--- a/cmake/Modules/FindvecLib.cmake
+++ b/cmake/Modules/FindvecLib.cmake
@@ -16,7 +16,7 @@ find_path(vecLib_INCLUDE_DIR vecLib.h
DOC "vecLib include directory"
PATHS /System/Library/Frameworks/Accelerate.framework/Versions/Current/${__veclib_include_suffix}
/System/Library/${__veclib_include_suffix}
- /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/Accelerate.framework/Versions/Current/Frameworks/vecLib.framework/Headers/
+ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Accelerate.framework/Versions/Current/Frameworks/vecLib.framework/Headers/
NO_DEFAULT_PATH)
include(FindPackageHandleStandardArgs)
diff --git a/cmake/ProtoBuf.cmake b/cmake/ProtoBuf.cmake
index 73f647f..8005b44 100644
--- a/cmake/ProtoBuf.cmake
+++ b/cmake/ProtoBuf.cmake
@@ -2,8 +2,8 @@
# the standard cmake script with version and python generation support
find_package( Protobuf REQUIRED )
-include_directories(SYSTEM ${PROTOBUF_INCLUDE_DIR})
-list(APPEND Caffe_LINKER_LIBS ${PROTOBUF_LIBRARIES})
+list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${PROTOBUF_INCLUDE_DIR})
+list(APPEND Caffe_LINKER_LIBS PUBLIC ${PROTOBUF_LIBRARIES})
# As of Ubuntu 14.04 protoc is no longer a part of libprotobuf-dev package
# and should be installed separately as in: sudo apt-get install protobuf-compiler
diff --git a/cmake/Templates/CaffeConfig.cmake.in b/cmake/Templates/CaffeConfig.cmake.in
index 73f57ac..77c4059 100644
--- a/cmake/Templates/CaffeConfig.cmake.in
+++ b/cmake/Templates/CaffeConfig.cmake.in
@@ -9,9 +9,9 @@
# After successful configuration the following variables
# will be defined:
#
-# Caffe_INCLUDE_DIRS - Caffe include directories
-# Caffe_LIBRARIES - libraries to link against
-# Caffe_DEFINITIONS - a list of definitions to pass to compiler
+# Caffe_LIBRARIES - IMPORTED targets to link against
+# (There is no Caffe_INCLUDE_DIRS and Caffe_DEFINITIONS
+# because they are specified in the IMPORTED target interface.)
#
# Caffe_HAVE_CUDA - signals about CUDA support
# Caffe_HAVE_CUDNN - signals about cuDNN support
@@ -27,7 +27,7 @@ if(@USE_OPENCV@)
if(EXISTS ${Caffe_OpenCV_CONFIG_PATH} AND NOT TARGET opencv_core)
message(STATUS "Caffe: using OpenCV config from ${Caffe_OpenCV_CONFIG_PATH}")
- include(${Caffe_OpenCV_CONFIG_PATH}/OpenCVModules.cmake)
+ include(${Caffe_OpenCV_CONFIG_PATH}/OpenCVConfig.cmake)
endif()
else()
@@ -39,9 +39,6 @@ endif()
# Compute paths
get_filename_component(Caffe_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-set(Caffe_INCLUDE_DIRS "@Caffe_INCLUDE_DIRS@")
-
- at Caffe_INSTALL_INCLUDE_DIR_APPEND_COMMAND@
# Our library dependencies
if(NOT TARGET caffe AND NOT caffe_BINARY_DIR)
@@ -49,11 +46,9 @@ if(NOT TARGET caffe AND NOT caffe_BINARY_DIR)
endif()
# List of IMPORTED libs created by CaffeTargets.cmake
+# These targets already specify all needed definitions and include pathes
set(Caffe_LIBRARIES caffe)
-# Definitions
-set(Caffe_DEFINITIONS "@Caffe_DEFINITIONS@")
-
# Cuda support variables
set(Caffe_CPU_ONLY @CPU_ONLY@)
set(Caffe_HAVE_CUDA @HAVE_CUDA@)
diff --git a/cmake/Templates/caffe_config.h.in b/cmake/Templates/caffe_config.h.in
index 8a31b43..45465b9 100644
--- a/cmake/Templates/caffe_config.h.in
+++ b/cmake/Templates/caffe_config.h.in
@@ -4,16 +4,6 @@
/* Binaries directory */
#define BINARY_FOLDER "${PROJECT_BINARY_DIR}"
-/* NVIDA Cuda */
-#cmakedefine HAVE_CUDA
-
-/* NVIDA cuDNN */
-#cmakedefine HAVE_CUDNN
-#cmakedefine USE_CUDNN
-
-/* NVIDA cuDNN */
-#cmakedefine CPU_ONLY
-
/* Test device */
#define CUDA_TEST_DEVICE ${CUDA_TEST_DEVICE}
@@ -27,12 +17,3 @@
#define EXAMPLES_SOURCE_DIR "examples/"
#define CMAKE_EXT ""
#endif
-
-/* Matlab */
-#cmakedefine HAVE_MATLAB
-
-/* IO libraries */
-#cmakedefine USE_OPENCV
-#cmakedefine USE_LEVELDB
-#cmakedefine USE_LMDB
-#cmakedefine ALLOW_LMDB_NOLOCK
diff --git a/docker/Makefile b/docker/Makefile
deleted file mode 100644
index 3a6575b..0000000
--- a/docker/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# A makefile to build the docker images for caffe.
-# Two caffe images will be built:
-# caffe:cpu --> A CPU-only build of caffe.
-# caffe:gpu --> A GPU-enabled build using the latest CUDA and CUDNN versions.
-
-DOCKER ?= docker
-
-all: docker_files standalone
-
-.PHONY: standalone devel
-
-standalone: cpu_standalone gpu_standalone
-
-
-cpu_standalone: standalone/cpu/Dockerfile
- $(DOCKER) build -t caffe:cpu standalone/cpu
-
-gpu_standalone: standalone/gpu/Dockerfile
- $(DOCKER) build -t caffe:gpu standalone/gpu
-
-docker_files: standalone_files
-
-standalone_files: standalone/cpu/Dockerfile standalone/gpu/Dockerfile
-
-FROM_GPU = "nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04"
-FROM_CPU = "ubuntu:14.04"
-GPU_CMAKE_ARGS = -DUSE_CUDNN=1
-CPU_CMAKE_ARGS = -DCPU_ONLY=1
-
-# A make macro to select the CPU or GPU base image.
-define from_image
-$(if $(strip $(findstring gpu,$@)),$(FROM_GPU),$(FROM_CPU))
-endef
-
-# A make macro to select the CPU or GPU build args.
-define build_args
-$(if $(strip $(findstring gpu,$@)),$(GPU_CMAKE_ARGS),$(CPU_CMAKE_ARGS))
-endef
-
-# A make macro to construct the CPU or GPU Dockerfile from the template
-define create_docker_file
- @echo creating $@
- @echo "FROM "$(from_image) > $@
- @cat $^ | sed 's/$${CMAKE_ARGS}/$(build_args)/' >> $@
-endef
-
-
-standalone/%/Dockerfile: templates/Dockerfile.template
- $(create_docker_file)
-
diff --git a/docker/README.md b/docker/README.md
index fdab641..f9c7c75 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,52 +1,47 @@
-# Caffe standalone Dockerfiles.
+### Running an official image
-The `standalone` subfolder contains docker files for generating both CPU and GPU executable images for Caffe. The images can be built using make, or by running:
+You can run one of the automatic [builds](https://hub.docker.com/r/bvlc/caffe). E.g. for the CPU version:
-```
-docker build -t caffe:cpu standalone/cpu
-```
-for example. (Here `gpu` can be substituted for `cpu`, but to keep the readme simple, only the `cpu` case will be discussed in detail).
+`docker run -ti bvlc/caffe:cpu caffe --version`
-Note that the GPU standalone requires a CUDA 7.5 capable driver to be installed on the system and [nvidia-docker] for running the Docker containers. Here it is generally sufficient to use `nvidia-docker` instead of `docker` in any of the commands mentioned.
+or for GPU support (You need a CUDA 8.0 capable driver and
+[nvidia-docker](https://github.com/NVIDIA/nvidia-docker)):
-# Running Caffe using the docker image
+`nvidia-docker run -ti bvlc/caffe:gpu caffe --version`
-In order to test the Caffe image, run:
-```
-docker run -ti caffe:cpu caffe --version
-```
-which should show a message like:
-```
-libdc1394 error: Failed to initialize libdc1394
-caffe version 1.0.0-rc3
-```
+You might see an error about libdc1394, ignore it.
-One can also build and run the Caffe tests in the image using:
-```
-docker run -ti caffe:cpu bash -c "cd /opt/caffe/build; make runtest"
-```
+### Docker run options
-In order to get the most out of the caffe image, some more advanced `docker run` options could be used. For example, running:
-```
-docker run -ti --volume=$(pwd):/workspace caffe:cpu caffe train --solver=example_solver.prototxt
-```
-will train a network defined in the `example_solver.prototxt` file in the current directory (`$(pwd)` is maped to the container volume `/workspace` using the `--volume=` Docker flag).
+By default caffe runs as root, thus any output files, e.g. snapshots, will be owned
+by root. It also runs by default in a container-private folder.
-Note that docker runs all commands as root by default, and thus any output files (e.g. snapshots) generated will be owned by the root user. In order to ensure that the current user is used instead, the following command can be used:
-```
-docker run -ti --volume=$(pwd):/workspace -u $(id -u):$(id -g) caffe:cpu caffe train --solver=example_solver.prototxt
-```
-where the `-u` Docker command line option runs the commands in the container as the specified user, and the shell command `id` is used to determine the user and group ID of the current user. Note that the Caffe docker images have `/workspace` defined as the default working directory. This can be overridden using the `--workdir=` Docker command line option.
+You can change this using flags, like user (-u), current directory, and volumes (-w and -v).
+E.g. this behaves like the usual caffe executable:
-# Other use-cases
+`docker run --rm -u $(id -u):$(id -g) -v $(pwd):$(pwd) -w $(pwd) bvlc/caffe:cpu caffe train --solver=example_solver.prototxt`
-Although running the `caffe` command in the docker containers as described above serves many purposes, the container can also be used for more interactive use cases. For example, specifying `bash` as the command instead of `caffe` yields a shell that can be used for interactive tasks. (Since the caffe build requirements are included in the container, this can also be used to build and run local versions of caffe).
+Containers can also be used interactively, specifying e.g. `bash` or `ipython`
+instead of `caffe`.
-Another use case is to run python scripts that depend on `caffe`'s Python modules. Using the `python` command instead of `bash` or `caffe` will allow this, and an interactive interpreter can be started by running:
```
-docker run -ti caffe:cpu python
+docker run -ti bvlc/caffe:cpu ipython
+import caffe
+...
```
-(`ipython` is also available in the container).
-Since the `caffe/python` folder is also added to the path, the utility executable scripts defined there can also be used as executables. This includes `draw_net.py`, `classify.py`, and `detect.py`
+The caffe build requirements are included in the container, so this can be used to
+build and run custom versions of caffe. Also, `caffe/python` is in PATH, so python
+utilities can be used directly, e.g. `draw_net.py`, `classify.py`, or `detect.py`.
+
+### Building images yourself
+
+Examples:
+
+`docker build -t caffe:cpu cpu`
+
+`docker build -t caffe:gpu gpu`
+
+You can also build Caffe and run the tests in the image:
+`docker run -ti caffe:cpu bash -c "cd /opt/caffe/build; make runtest"`
diff --git a/docker/standalone/cpu/Dockerfile b/docker/cpu/Dockerfile
similarity index 76%
rename from docker/standalone/cpu/Dockerfile
rename to docker/cpu/Dockerfile
index 4fef25a..af6c03c 100644
--- a/docker/standalone/cpu/Dockerfile
+++ b/docker/cpu/Dockerfile
@@ -1,5 +1,5 @@
-FROM ubuntu:14.04
-MAINTAINER caffe-maint at googlegroups.com
+FROM ubuntu:16.04
+LABEL maintainer caffe-maint at googlegroups.com
RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \
@@ -20,17 +20,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
python-dev \
python-numpy \
python-pip \
+ python-setuptools \
python-scipy && \
rm -rf /var/lib/apt/lists/*
ENV CAFFE_ROOT=/opt/caffe
WORKDIR $CAFFE_ROOT
-# FIXME: clone a specific git tag and use ARG instead of ENV once DockerHub supports this.
-ENV CLONE_TAG=master
+# FIXME: use ARG instead of ENV once DockerHub supports this
+ENV CLONE_TAG=rc4
RUN git clone -b ${CLONE_TAG} --depth 1 https://github.com/BVLC/caffe.git . && \
- for req in $(cat python/requirements.txt) pydot; do pip install $req; done && \
+ pip install --upgrade pip && \
+ cd python && for req in $(cat requirements.txt) pydot; do pip install $req; done && cd .. && \
mkdir build && cd build && \
cmake -DCPU_ONLY=1 .. && \
make -j"$(nproc)"
diff --git a/docker/standalone/gpu/Dockerfile b/docker/gpu/Dockerfile
similarity index 66%
rename from docker/standalone/gpu/Dockerfile
rename to docker/gpu/Dockerfile
index daf6a72..0785b10 100644
--- a/docker/standalone/gpu/Dockerfile
+++ b/docker/gpu/Dockerfile
@@ -1,5 +1,5 @@
-FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
-MAINTAINER caffe-maint at googlegroups.com
+FROM nvidia/cuda:8.0-cudnn5-devel-ubuntu16.04
+LABEL maintainer caffe-maint at googlegroups.com
RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \
@@ -20,19 +20,22 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
python-dev \
python-numpy \
python-pip \
+ python-setuptools \
python-scipy && \
rm -rf /var/lib/apt/lists/*
ENV CAFFE_ROOT=/opt/caffe
WORKDIR $CAFFE_ROOT
-# FIXME: clone a specific git tag and use ARG instead of ENV once DockerHub supports this.
-ENV CLONE_TAG=master
+# FIXME: use ARG instead of ENV once DockerHub supports this
+ENV CLONE_TAG=rc4
RUN git clone -b ${CLONE_TAG} --depth 1 https://github.com/BVLC/caffe.git . && \
- for req in $(cat python/requirements.txt) pydot; do pip install $req; done && \
+ pip install --upgrade pip && \
+ cd python && for req in $(cat requirements.txt) pydot; do pip install $req; done && cd .. && \
+ git clone https://github.com/NVIDIA/nccl.git && cd nccl && make -j install && cd .. && rm -rf nccl && \
mkdir build && cd build && \
- cmake -DUSE_CUDNN=1 .. && \
+ cmake -DUSE_CUDNN=1 -DUSE_NCCL=1 .. && \
make -j"$(nproc)"
ENV PYCAFFE_ROOT $CAFFE_ROOT/python
diff --git a/docker/templates/Dockerfile.template b/docker/templates/Dockerfile.template
deleted file mode 100644
index 8834f05..0000000
--- a/docker/templates/Dockerfile.template
+++ /dev/null
@@ -1,42 +0,0 @@
-MAINTAINER caffe-maint at googlegroups.com
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
- build-essential \
- cmake \
- git \
- wget \
- libatlas-base-dev \
- libboost-all-dev \
- libgflags-dev \
- libgoogle-glog-dev \
- libhdf5-serial-dev \
- libleveldb-dev \
- liblmdb-dev \
- libopencv-dev \
- libprotobuf-dev \
- libsnappy-dev \
- protobuf-compiler \
- python-dev \
- python-numpy \
- python-pip \
- python-scipy && \
- rm -rf /var/lib/apt/lists/*
-
-ENV CAFFE_ROOT=/opt/caffe
-WORKDIR $CAFFE_ROOT
-
-# FIXME: clone a specific git tag and use ARG instead of ENV once DockerHub supports this.
-ENV CLONE_TAG=master
-
-RUN git clone -b ${CLONE_TAG} --depth 1 https://github.com/BVLC/caffe.git . && \
- for req in $(cat python/requirements.txt) pydot; do pip install $req; done && \
- mkdir build && cd build && \
- cmake ${CMAKE_ARGS} .. && \
- make -j"$(nproc)"
-
-ENV PYCAFFE_ROOT $CAFFE_ROOT/python
-ENV PYTHONPATH $PYCAFFE_ROOT:$PYTHONPATH
-ENV PATH $CAFFE_ROOT/build/tools:$PYCAFFE_ROOT:$PATH
-RUN echo "$CAFFE_ROOT/build/lib" >> /etc/ld.so.conf.d/caffe.conf && ldconfig
-
-WORKDIR /workspace
diff --git a/docs/install_apt_debian.md b/docs/install_apt_debian.md
index 0d39e3a..65fe709 100644
--- a/docs/install_apt_debian.md
+++ b/docs/install_apt_debian.md
@@ -5,13 +5,13 @@ title: "Installation: Debian"
# Debian Installation
Caffe packages are available for several Debian versions, as shown in the
-following chart
+following chart:
```
Your Distro | CPU_ONLY | CUDA | Alias
----------------+------------+--------+-------------------
Debian/stable | ✘ | ✘ | Debian Jessie
-Debian/testing | ✔ | ☐ | Debian Stretch/Sid
+Debian/testing | ✔ | ✔ | Debian Stretch/Sid
Debian/unstable | ✔ | ✔ | Debian Sid
```
@@ -19,30 +19,32 @@ Debian/unstable | ✔ | ✔ | Debian Sid
* `✔ ` You can install caffe with a single command line following this guide.
-* `☐ ` The same with `✔ `. However it will not work any more when Debian/Stretch becomes the stable branch.
-
-Last update: 2017-01-05
+Last update: 2017-02-01
## Binary installation with APT
Apart from the installation methods based on source, Debian/unstable
-and Debian/testing users can install pre-compiled Caffe packages via the official archive.
+and Debian/testing users can install pre-compiled Caffe packages from
+the official archive.
+
+Make sure that your `/etc/apt/sources.list` contains `contrib` and `non-free`
+sections if you want to install the CUDA version, for instance:
-Make sure that there is something like the follows in your `/etc/apt/sources.list`:
```
-deb http://MIRROR/debian CODENAME main contrib non-free
+deb http://ftp2.cn.debian.org/debian sid main contrib non-free
```
-where `MIRROR` is your favorate Debian mirror, and `CODENAME ∈ {testing,stretch,sid}`.
Then we update APT cache and directly install Caffe. Note, the cpu version and
-the cuda version cannot be installed at the same time.
+the cuda version cannot coexist.
+
```
-# apt update
-# apt install [ caffe-cpu | caffe-cuda ]
-# caffe # command line interface working
-# python3 -c 'import caffe; print(caffe.__path__)' # python3 interface working
+$ sudo apt update
+$ sudo apt install [ caffe-cpu | caffe-cuda ]
+$ caffe # command line interface working
+$ python3 -c 'import caffe; print(caffe.__path__)' # python3 interface working
```
-It should work out of box.
+
+These Caffe packages should work for you out of box.
#### Customizing caffe packages
@@ -50,46 +52,49 @@ Some users may need to customize the Caffe package. The way to customize
the package is beyond this guide. Here is only a brief guide of producing
the customized `.deb` packages.
-Make sure that there is something like this in your `/etc/apt/sources.list`:
+Make sure that there is a `dec-src` source in your `/etc/apt/sources.list`,
+for instance:
+
```
deb http://ftp2.cn.debian.org/debian sid main contrib non-free
deb-src http://ftp2.cn.debian.org/debian sid main contrib non-free
```
Then we build caffe deb files with the following commands:
+
```
$ sudo apt update
-$ sudo apt install build-essential debhelper devscripts # standard package building tools
-$ sudo apt build-dep [ caffe-cpu | caffe-cuda ] # the most elegant way to pull caffe build dependencies
-$ apt source [ caffe-cpu | caffe-cuda ] # download the source tarball and extract
+$ sudo apt install build-essential debhelper devscripts # standard package building tools
+$ sudo apt build-dep [ caffe-cpu | caffe-cuda ] # the most elegant way to pull caffe build dependencies
+$ apt source [ caffe-cpu | caffe-cuda ] # download the source tarball and extract
$ cd caffe-XXXX
-[ ... optional, customize caffe code/build ... ]
-$ dch -llocal "Modified XXX in order to XXX" # write your one-line changelog
-$ debuild -B -j4 # build caffe with 4 parallel jobs (similar to make -j4)
+[ ... optional, customizing caffe code/build ... ]
+$ dch --local "Modified XXX" # bump package version and write changelog
+$ debuild -B -j4 # build caffe with 4 parallel jobs (similar to make -j4)
[ ... building ...]
-$ debc # optional, if you want to check the package contents
-$ sudo debi # optional, install the generated packages
+$ debc # optional, if you want to check the package contents
+$ sudo debi # optional, install the generated packages
+$ ls ../ # optional, you will see the resulting packages
```
-The resulting deb packages can be found under the parent directory of the source tree.
-Note, the `dch ...` command line above is for bumping the package version number
-and adding an entry to the package changelog. If you would like to write
-more than one changelog entry, use subsequent `dch` command (see `man 1 dch`)
-instead of manually modifing `debian/changelog` unless you know how to keep its format correct.
+It is a BUG if the package failed to build without any change.
The changelog will be installed at e.g. `/usr/share/doc/caffe-cpu/changelog.Debian.gz`.
## Source installation
-Source installation under Debian/unstable is similar to that of Ubuntu, but
+Source installation under Debian/unstable and Debian/testing is similar to that of Ubuntu, but
here is a more elegant way to pull caffe build dependencies:
+
```
$ sudo apt build-dep [ caffe-cpu | caffe-cuda ]
```
+
Note, this requires a `deb-src` entry in your `/etc/apt/sources.list`.
#### Compiler Combinations
-Some users may find their favorate compiler doesn't work well with CUDA.
+Some users may find their favorate compiler doesn't work with CUDA.
+
```
CXX compiler | CUDA 7.5 | CUDA 8.0 |
-------------+------------+------------+-
@@ -144,12 +149,13 @@ and hack the packaging scripts, then build your customized package.
* Where are the examples, the models and other documentation stuff?
```
-sudo apt install caffe-doc
-dpkg -L caffe-doc
+$ sudo apt install caffe-doc
+$ dpkg -L caffe-doc
```
* Where can I find the Debian package status?
-https://tracker.debian.org/pkg/caffe (for the CPU_ONLY version)
-
+```
+https://tracker.debian.org/pkg/caffe (for the CPU_ONLY version)
https://tracker.debian.org/pkg/caffe-contrib (for the CUDA version)
+```
diff --git a/docs/installation.md b/docs/installation.md
index 6b2cd3b..2e55802 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -64,7 +64,7 @@ Caffe requires BLAS as the backend of its matrix and vector computations.
There are several implementations of this library. The choice is yours:
* [ATLAS](http://math-atlas.sourceforge.net/): free, open source, and so the default for Caffe.
-* [Intel MKL](http://software.intel.com/en-us/intel-mkl): commercial and optimized for Intel CPUs, with a free trial and [student](http://software.intel.com/en-us/intel-education-offerings) licenses.
+* [Intel MKL](http://software.intel.com/en-us/intel-mkl): commercial and optimized for Intel CPUs, with [free](https://registrationcenter.intel.com/en/forms/?productid=2558) licenses.
1. Install MKL.
2. Set up MKL environment (Details: [Linux](https://software.intel.com/en-us/node/528499), [OS X](https://software.intel.com/en-us/node/528659)). Example: *source /opt/intel/mkl/bin/mklvars.sh intel64*
3. Set `BLAS := mkl` in `Makefile.config`
diff --git a/docs/tutorial/layers/accuracy.md b/docs/tutorial/layers/accuracy.md
index ecf8409..80293b1 100644
--- a/docs/tutorial/layers/accuracy.md
+++ b/docs/tutorial/layers/accuracy.md
@@ -10,7 +10,6 @@ title: Accuracy and Top-k
* [Doxygen Documentation](http://caffe.berkeleyvision.org/doxygen/classcaffe_1_1AccuracyLayer.html)
* Header: [`./include/caffe/layers/accuracy_layer.hpp`](https://github.com/BVLC/caffe/blob/master/include/caffe/layers/accuracy_layer.hpp)
* CPU implementation: [`./src/caffe/layers/accuracy_layer.cpp`](https://github.com/BVLC/caffe/blob/master/src/caffe/layers/accuracy_layer.cpp)
-* CUDA GPU implementation: [`./src/caffe/layers/accuracy_layer.cu`](https://github.com/BVLC/caffe/blob/master/src/caffe/layers/accuracy_layer.cu)
## Parameters
* Parameters (`AccuracyParameter accuracy_param`)
@@ -18,4 +17,4 @@ title: Accuracy and Top-k
{% highlight Protobuf %}
{% include proto/AccuracyParameter.txt %}
-{% endhighlight %}
\ No newline at end of file
+{% endhighlight %}
diff --git a/docs/tutorial/layers/argmax.md b/docs/tutorial/layers/argmax.md
index f5f173a..9eb8b77 100644
--- a/docs/tutorial/layers/argmax.md
+++ b/docs/tutorial/layers/argmax.md
@@ -8,7 +8,6 @@ title: ArgMax Layer
* [Doxygen Documentation](http://caffe.berkeleyvision.org/doxygen/classcaffe_1_1ArgMaxLayer.html)
* Header: [`./include/caffe/layers/argmax_layer.hpp`](https://github.com/BVLC/caffe/blob/master/include/caffe/layers/argmax_layer.hpp)
* CPU implementation: [`./src/caffe/layers/argmax_layer.cpp`](https://github.com/BVLC/caffe/blob/master/src/caffe/layers/argmax_layer.cpp)
-* CUDA GPU implementation: [`./src/caffe/layers/argmax_layer.cu`](https://github.com/BVLC/caffe/blob/master/src/caffe/layers/argmax_layer.cu)
## Parameters
* Parameters (`ArgMaxParameter argmax_param`)
@@ -16,4 +15,4 @@ title: ArgMax Layer
{% highlight Protobuf %}
{% include proto/ArgMaxParameter.txt %}
-{% endhighlight %}
\ No newline at end of file
+{% endhighlight %}
diff --git a/docs/tutorial/layers/infogainloss.md b/docs/tutorial/layers/infogainloss.md
index 86140b6..b3b690d 100644
--- a/docs/tutorial/layers/infogainloss.md
+++ b/docs/tutorial/layers/infogainloss.md
@@ -8,11 +8,10 @@ title: Infogain Loss Layer
* [Doxygen Documentation](http://caffe.berkeleyvision.org/doxygen/classcaffe_1_1InfogainLossLayer.html)
* Header: [`./include/caffe/layers/infogain_loss_layer.hpp`](https://github.com/BVLC/caffe/blob/master/include/caffe/layers/infogain_loss_layer.hpp)
* CPU implementation: [`./src/caffe/layers/infogain_loss_layer.cpp`](https://github.com/BVLC/caffe/blob/master/src/caffe/layers/infogain_loss_layer.cpp)
-* CUDA GPU implementation: [`./src/caffe/layers/infogain_loss_layer.cu`](https://github.com/BVLC/caffe/blob/master/src/caffe/layers/infogain_loss_layer.cu)
-A generalization of [MultinomialLogisticLossLayer](layers/multinomiallogisticloss.md) that takes an "information gain" (infogain) matrix specifying the "value" of all label pairs.
+A generalization of [MultinomialLogisticLossLayer](multinomiallogisticloss.html) that takes an "information gain" (infogain) matrix specifying the "value" of all label pairs.
-Equivalent to the [MultinomialLogisticLossLayer](layers/multinomiallogisticloss.md) if the infogain matrix is the identity.
+Equivalent to the [MultinomialLogisticLossLayer](multinomiallogisticloss.html) if the infogain matrix is the identity.
## Parameters
diff --git a/docs/tutorial/layers/lrn.md b/docs/tutorial/layers/lrn.md
index 387311c..2fbef73 100644
--- a/docs/tutorial/layers/lrn.md
+++ b/docs/tutorial/layers/lrn.md
@@ -20,9 +20,9 @@ The local response normalization layer performs a kind of "lateral inhibition" b
## Parameters
-* Parameters (`Parameter lrn_param`)
+* Parameters (`LRNParameter lrn_param`)
* From [`./src/caffe/proto/caffe.proto`](https://github.com/BVLC/caffe/blob/master/src/caffe/proto/caffe.proto):
{% highlight Protobuf %}
-{% include proto/BatchNormParameter.txt %}
+{% include proto/LRNParameter.txt %}
{% endhighlight %}
diff --git a/docs/tutorial/layers/memorydata.md b/docs/tutorial/layers/memorydata.md
index 754e62a..afce4a2 100644
--- a/docs/tutorial/layers/memorydata.md
+++ b/docs/tutorial/layers/memorydata.md
@@ -7,7 +7,7 @@ title: Memory Data Layer
* Layer type: `MemoryData`
* [Doxygen Documentation](http://caffe.berkeleyvision.org/doxygen/classcaffe_1_1MemoryDataLayer.html)
* Header: [`./include/caffe/layers/memory_data_layer.hpp`](https://github.com/BVLC/caffe/blob/master/include/caffe/layers/memory_data_layer.hpp)
-* CPU implementation: [`./src/caffe/layers/memory_data_layer.cpu`](https://github.com/BVLC/caffe/blob/master/src/caffe/layers/memory_data_layer.cpu)
+* CPU implementation: [`./src/caffe/layers/memory_data_layer.cpp`](https://github.com/BVLC/caffe/blob/master/src/caffe/layers/memory_data_layer.cpp)
The memory data layer reads data directly from memory, without copying it. In order to use it, one must call `MemoryDataLayer::Reset` (from C++) or `Net.set_input_arrays` (from Python) in order to specify a source of contiguous data (as 4D row major array), which is read one batch-sized chunk at a time.
diff --git a/docs/tutorial/layers/multinomiallogisticloss.md b/docs/tutorial/layers/multinomiallogisticloss.md
index a28ab91..5eab74a 100644
--- a/docs/tutorial/layers/multinomiallogisticloss.md
+++ b/docs/tutorial/layers/multinomiallogisticloss.md
@@ -7,7 +7,7 @@ title: Multinomial Logistic Loss Layer
* Layer type: `MultinomialLogisticLoss`
* [Doxygen Documentation](http://caffe.berkeleyvision.org/doxygen/classcaffe_1_1MultinomialLogisticLossLayer.html)
* Header: [`./include/caffe/layers/multinomial_logistic_loss_layer.hpp`](https://github.com/BVLC/caffe/blob/master/include/caffe/layers/multinomial_logistic_loss_layer.hpp)
-* CPU implementation: [`./src/caffe/layers/multinomial_logistic_loss_layer.cpu`](https://github.com/BVLC/caffe/blob/master/src/caffe/layers/multinomial_logistic_loss_layer.cpu)
+* CPU implementation: [`./src/caffe/layers/multinomial_logistic_loss_layer.cpp`](https://github.com/BVLC/caffe/blob/master/src/caffe/layers/multinomial_logistic_loss_layer.cpp)
## Parameters
diff --git a/docs/tutorial/layers/silence.md b/docs/tutorial/layers/silence.md
index 2c37a9c..8b4579a 100644
--- a/docs/tutorial/layers/silence.md
+++ b/docs/tutorial/layers/silence.md
@@ -14,10 +14,4 @@ Silences a blob, so that it is not printed.
## Parameters
-* Parameters (`SilenceParameter silence_param`)
-* From [`./src/caffe/proto/caffe.proto`](https://github.com/BVLC/caffe/blob/master/src/caffe/proto/caffe.proto):
-
-{% highlight Protobuf %}
-{% include proto/BatchNormParameter.txt %}
-{% endhighlight %}
-
+No parameters.
diff --git a/matlab/+caffe/Net.m b/matlab/+caffe/Net.m
index e6295bb..349e060 100644
--- a/matlab/+caffe/Net.m
+++ b/matlab/+caffe/Net.m
@@ -68,6 +68,9 @@ classdef Net < handle
self.layer_names = self.attributes.layer_names;
self.blob_names = self.attributes.blob_names;
end
+ function delete (self)
+ caffe_('delete_net', self.hNet_self);
+ end
function layer = layers(self, layer_name)
CHECK(ischar(layer_name), 'layer_name must be a string');
layer = self.layer_vec(self.name2layer_index(layer_name));
diff --git a/matlab/+caffe/Solver.m b/matlab/+caffe/Solver.m
index f8bdc4e..2d3c98b 100644
--- a/matlab/+caffe/Solver.m
+++ b/matlab/+caffe/Solver.m
@@ -36,6 +36,9 @@ classdef Solver < handle
self.test_nets(n) = caffe.Net(self.attributes.hNet_test_nets(n));
end
end
+ function delete (self)
+ caffe_('delete_solver', self.hSolver_self);
+ end
function iter = iter(self)
iter = caffe_('solver_get_iter', self.hSolver_self);
end
diff --git a/matlab/+caffe/private/caffe_.cpp b/matlab/+caffe/private/caffe_.cpp
index 4e466e6..a32bd5e 100644
--- a/matlab/+caffe/private/caffe_.cpp
+++ b/matlab/+caffe/private/caffe_.cpp
@@ -197,6 +197,17 @@ static void get_solver(MEX_ARGS) {
mxFree(solver_file);
}
+// Usage: caffe_('delete_solver', hSolver)
+static void delete_solver(MEX_ARGS) {
+ mxCHECK(nrhs == 1 && mxIsStruct(prhs[0]),
+ "Usage: caffe_('delete_solver', hSolver)");
+ Solver<float>* solver = handle_to_ptr<Solver<float> >(prhs[0]);
+ solvers_.erase(std::remove_if(solvers_.begin(), solvers_.end(),
+ [solver] (const shared_ptr< Solver<float> > &solverPtr) {
+ return solverPtr.get() == solver;
+ }), solvers_.end());
+}
+
// Usage: caffe_('solver_get_attr', hSolver)
static void solver_get_attr(MEX_ARGS) {
mxCHECK(nrhs == 1 && mxIsStruct(prhs[0]),
@@ -271,6 +282,17 @@ static void get_net(MEX_ARGS) {
mxFree(phase_name);
}
+// Usage: caffe_('delete_solver', hSolver)
+static void delete_net(MEX_ARGS) {
+ mxCHECK(nrhs == 1 && mxIsStruct(prhs[0]),
+ "Usage: caffe_('delete_solver', hNet)");
+ Net<float>* net = handle_to_ptr<Net<float> >(prhs[0]);
+ nets_.erase(std::remove_if(nets_.begin(), nets_.end(),
+ [net] (const shared_ptr< Net<float> > &netPtr) {
+ return netPtr.get() == net;
+ }), nets_.end());
+}
+
// Usage: caffe_('net_get_attr', hNet)
static void net_get_attr(MEX_ARGS) {
mxCHECK(nrhs == 1 && mxIsStruct(prhs[0]),
@@ -522,12 +544,14 @@ struct handler_registry {
static handler_registry handlers[] = {
// Public API functions
{ "get_solver", get_solver },
+ { "delete_solver", delete_solver },
{ "solver_get_attr", solver_get_attr },
{ "solver_get_iter", solver_get_iter },
{ "solver_restore", solver_restore },
{ "solver_solve", solver_solve },
{ "solver_step", solver_step },
{ "get_net", get_net },
+ { "delete_net", delete_net },
{ "net_get_attr", net_get_attr },
{ "net_forward", net_forward },
{ "net_backward", net_backward },
diff --git a/matlab/demo/classification_demo.m b/matlab/demo/classification_demo.m
index 2b60332..435c077 100644
--- a/matlab/demo/classification_demo.m
+++ b/matlab/demo/classification_demo.m
@@ -8,7 +8,7 @@ function [scores, maxlabel] = classification_demo(im, use_gpu)
%
% ****************************************************************************
% For detailed documentation and usage on Caffe's Matlab interface, please
-% refer to Caffe Interface Tutorial at
+% refer to the Caffe Interface Tutorial at
% http://caffe.berkeleyvision.org/tutorial/interfaces.html#matlab
% ****************************************************************************
%
@@ -24,6 +24,7 @@ function [scores, maxlabel] = classification_demo(im, use_gpu)
% $ export LD_LIBRARY_PATH=/opt/intel/mkl/lib/intel64:/usr/local/cuda-5.5/lib64
% $ export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libstdc++.so.6
% Or the equivalent based on where things are installed on your system
+% and what versions are installed.
%
% Usage:
% im = imread('../../examples/images/cat.jpg');
@@ -39,7 +40,7 @@ function [scores, maxlabel] = classification_demo(im, use_gpu)
% Data coming in from matlab needs to be in the order
% [width, height, channels, images]
% where width is the fastest dimension.
-% Here is the rough matlab for putting image data into the correct
+% Here is the rough matlab code for putting image data into the correct
% format in W x H x C with BGR channels:
% % permute channels from RGB to BGR
% im_data = im(:, :, [3, 2, 1]);
@@ -54,7 +55,7 @@ function [scores, maxlabel] = classification_demo(im, use_gpu)
% If you have multiple images, cat them with cat(4, ...)
-% Add caffe/matlab to you Matlab search PATH to use matcaffe
+% Add caffe/matlab to your Matlab search PATH in order to use matcaffe
if exist('../+caffe', 'dir')
addpath('..');
else
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index bf492a2..c53299d 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -3,13 +3,13 @@ if(NOT HAVE_PYTHON)
return()
endif()
-include_directories(${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
file(GLOB_RECURSE python_srcs ${PROJECT_SOURCE_DIR}/python/*.cpp)
add_library(pycaffe SHARED ${python_srcs})
-target_link_libraries(pycaffe ${Caffe_LINK} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
-set_target_properties(pycaffe PROPERTIES PREFIX "" OUTPUT_NAME "_caffe")
caffe_default_properties(pycaffe)
+set_target_properties(pycaffe PROPERTIES PREFIX "" OUTPUT_NAME "_caffe")
+target_include_directories(pycaffe PUBLIC ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIR})
+target_link_libraries(pycaffe PUBLIC ${Caffe_LINK} ${PYTHON_LIBRARIES})
if(UNIX OR APPLE)
set(__linkname "${PROJECT_SOURCE_DIR}/python/caffe/_caffe.so")
diff --git a/python/caffe/draw.py b/python/caffe/draw.py
index 9eecf6d..e4fd7aa 100644
--- a/python/caffe/draw.py
+++ b/python/caffe/draw.py
@@ -104,11 +104,11 @@ def get_layer_label(layer, rankdir):
pooling_types_dict[layer.pooling_param.pool],
layer.type,
separator,
- layer.pooling_param.kernel_size,
+ layer.pooling_param.kernel_size[0] if len(layer.pooling_param.kernel_size._values) else 1,
separator,
- layer.pooling_param.stride,
+ layer.pooling_param.stride[0] if len(layer.pooling_param.stride._values) else 1,
separator,
- layer.pooling_param.pad)
+ layer.pooling_param.pad[0] if len(layer.pooling_param.pad._values) else 0)
else:
node_label = '"%s%s(%s)"' % (layer.name, separator, layer.type)
return node_label
diff --git a/python/caffe/pycaffe.py b/python/caffe/pycaffe.py
index 1880381..6360659 100644
--- a/python/caffe/pycaffe.py
+++ b/python/caffe/pycaffe.py
@@ -43,6 +43,16 @@ def _Net_blob_loss_weights(self):
self._blob_loss_weights))
return self._blob_loss_weights_dict
+ at property
+def _Net_layer_dict(self):
+ """
+ An OrderedDict (bottom to top, i.e., input to output) of network
+ layers indexed by name
+ """
+ if not hasattr(self, '_layer_dict'):
+ self._layer_dict = OrderedDict(zip(self._layer_names, self.layers))
+ return self._layer_dict
+
@property
def _Net_params(self):
@@ -321,6 +331,7 @@ def _Net_get_id_name(func, field):
# Attach methods to Net.
Net.blobs = _Net_blobs
Net.blob_loss_weights = _Net_blob_loss_weights
+Net.layer_dict = _Net_layer_dict
Net.params = _Net_params
Net.forward = _Net_forward
Net.backward = _Net_backward
diff --git a/python/caffe/test/test_net.py b/python/caffe/test/test_net.py
index a0739fb..24391cc 100644
--- a/python/caffe/test/test_net.py
+++ b/python/caffe/test/test_net.py
@@ -60,6 +60,13 @@ class TestNet(unittest.TestCase):
for bl in blobs:
total += bl.data.sum() + bl.diff.sum()
+ def test_layer_dict(self):
+ layer_dict = self.net.layer_dict
+ self.assertEqual(list(layer_dict.keys()), list(self.net._layer_names))
+ for i, name in enumerate(self.net._layer_names):
+ self.assertEqual(layer_dict[name].type,
+ self.net.layers[i].type)
+
def test_forward_backward(self):
self.net.forward()
self.net.backward()
diff --git a/src/caffe/CMakeLists.txt b/src/caffe/CMakeLists.txt
index 8a80c94..7b25a98 100644
--- a/src/caffe/CMakeLists.txt
+++ b/src/caffe/CMakeLists.txt
@@ -4,8 +4,11 @@ caffe_protobuf_generate_cpp_py(${proto_gen_folder} proto_srcs proto_hdrs proto_p
# include python files either to force generation
add_library(proto STATIC ${proto_hdrs} ${proto_srcs} ${proto_python})
-set(Caffe_LINKER_LIBS proto ${Caffe_LINKER_LIBS}) # note, crucial to prepend!
caffe_default_properties(proto)
+target_link_libraries(proto PUBLIC ${PROTOBUF_LIBRARIES})
+target_include_directories(proto PUBLIC ${PROTOBUF_INCLUDE_DIR})
+
+list(INSERT Caffe_LINKER_LIBS 0 PUBLIC proto) # note, crucial to prepend!
# --[ Caffe library
@@ -18,8 +21,16 @@ if(HAVE_CUDA)
endif()
add_library(caffe ${srcs})
-target_link_libraries(caffe proto ${Caffe_LINKER_LIBS})
caffe_default_properties(caffe)
+target_link_libraries(caffe ${Caffe_LINKER_LIBS})
+target_include_directories(caffe ${Caffe_INCLUDE_DIRS}
+ PUBLIC
+ $<BUILD_INTERFACE:${Caffe_INCLUDE_DIR}>
+ $<INSTALL_INTERFACE:include>)
+target_compile_definitions(caffe ${Caffe_DEFINITIONS})
+if(Caffe_COMPILE_OPTIONS)
+ target_compile_options(caffe ${Caffe_COMPILE_OPTIONS})
+endif()
set_target_properties(caffe PROPERTIES
VERSION ${CAFFE_TARGET_VERSION}
SOVERSION ${CAFFE_TARGET_SOVERSION}
@@ -37,4 +48,3 @@ file(WRITE ${PROJECT_BINARY_DIR}/__init__.py)
list(APPEND proto_python ${PROJECT_BINARY_DIR}/__init__.py)
install(PROGRAMS ${proto_python} DESTINATION python/caffe/proto)
-
diff --git a/src/caffe/net.cpp b/src/caffe/net.cpp
index aa9e8f2..70d5180 100644
--- a/src/caffe/net.cpp
+++ b/src/caffe/net.cpp
@@ -17,8 +17,6 @@
#include "caffe/util/math_functions.hpp"
#include "caffe/util/upgrade_proto.hpp"
-#include "caffe/test/test_caffe_main.hpp"
-
namespace caffe {
template <typename Dtype>
diff --git a/src/caffe/proto/caffe.proto b/src/caffe/proto/caffe.proto
index 1c85f69..a145c54 100644
--- a/src/caffe/proto/caffe.proto
+++ b/src/caffe/proto/caffe.proto
@@ -128,8 +128,7 @@ message SolverParameter {
// The states for the train/test nets. Must be unspecified or
// specified once per net.
//
- // By default, all states will have solver = true;
- // train_state will have phase = TRAIN,
+ // By default, train_state will have phase = TRAIN,
// and all test_state's will have phase = TEST.
// Other defaults are set according to the NetState defaults.
optional NetState train_state = 26;
diff --git a/src/caffe/solver.cpp b/src/caffe/solver.cpp
index 1c1a9e5..fd4c037 100644
--- a/src/caffe/solver.cpp
+++ b/src/caffe/solver.cpp
@@ -462,7 +462,6 @@ string Solver<Dtype>::SnapshotToHDF5() {
template <typename Dtype>
void Solver<Dtype>::Restore(const char* state_file) {
- CHECK(Caffe::root_solver());
string state_filename(state_file);
if (state_filename.size() >= 3 &&
state_filename.compare(state_filename.size() - 3, 3, ".h5") == 0) {
diff --git a/src/gtest/CMakeLists.txt b/src/gtest/CMakeLists.txt
index ef7ff7e..e98254a 100644
--- a/src/gtest/CMakeLists.txt
+++ b/src/gtest/CMakeLists.txt
@@ -1,5 +1,8 @@
add_library(gtest STATIC EXCLUDE_FROM_ALL gtest.h gtest-all.cpp)
caffe_default_properties(gtest)
+target_include_directories(gtest PUBLIC ${Caffe_SRC_DIR})
+target_compile_definitions(gtest PUBLIC -DGTEST_USE_OWN_TR1_TUPLE)
+
#add_library(gtest_main gtest_main.cc)
#target_link_libraries(gtest_main gtest)
diff --git a/tools/extra/parse_log.py b/tools/extra/parse_log.py
index b47ffd0..4248e2b 100755
--- a/tools/extra/parse_log.py
+++ b/tools/extra/parse_log.py
@@ -203,7 +203,7 @@ def main():
args = parse_args()
train_dict_list, test_dict_list = parse_log(args.logfile_path)
save_csv_files(args.logfile_path, args.output_dir, train_dict_list,
- test_dict_list, delimiter=args.delimiter)
+ test_dict_list, delimiter=args.delimiter, verbose=args.verbose)
if __name__ == '__main__':
diff --git a/tools/extra/plot_training_log.py.example b/tools/extra/plot_training_log.py.example
index 79924ae..8caca6b 100755
--- a/tools/extra/plot_training_log.py.example
+++ b/tools/extra/plot_training_log.py.example
@@ -90,9 +90,9 @@ def load_data(data_file, field_idx0, field_idx1):
def random_marker():
markers = mks.MarkerStyle.markers
- num = len(markers.values())
+ num = len(markers.keys())
idx = random.randint(0, num - 1)
- return markers.values()[idx]
+ return markers.keys()[idx]
def get_data_label(path_to_log):
label = path_to_log[path_to_log.rfind('/')+1 : path_to_log.rfind(
@@ -126,16 +126,9 @@ def plot_chart(chart_type, path_to_png, path_to_log_list):
plt.plot(data[0], data[1], label = label, color = color,
linewidth = linewidth)
else:
- ok = False
- ## Some markers throw ValueError: Unrecognized marker style
- while not ok:
- try:
- marker = random_marker()
- plt.plot(data[0], data[1], label = label, color = color,
- marker = marker, linewidth = linewidth)
- ok = True
- except:
- pass
+ marker = random_marker()
+ plt.plot(data[0], data[1], label = label, color = color,
+ marker = marker, linewidth = linewidth)
legend_loc = get_legend_loc(chart_type)
plt.legend(loc = legend_loc, ncol = 1) # ajust ncol to fit the space
plt.title(get_chart_type_description(chart_type))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe.git
More information about the debian-science-commits
mailing list