Skip to content

Singa 255 Compile mandatory depedent libaries together with SINGA code#272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 5 commits into from
Oct 25, 2016
Merged

Singa 255 Compile mandatory depedent libaries together with SINGA code #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
932a0cd
SINGA-255 Compile mandatory depedent libaries together with SINGA code
xiezl Oct 20, 2016
a98446f
SINGA-255 Compile mandatory depedent libaries together with SINGA code
xiezl Oct 22, 2016
47e38c8
SINGA-255 Compile mandatory depedent libaries together with SINGA code
xiezl Oct 24, 2016
f2c0b84
SINGA-267 Add spatial mode in batch normalization layer
ijingo Oct 23, 2016
4826d40
SINGA-255 Compile mandatory depedent libaries together with SINGA code
xiezl Oct 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
[submodule "lib/cnmem"]
path = lib/cnmem
url = https://github.com/NVIDIA/cnmem.git
98 changes: 76 additions & 22 deletions CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,44 +16,49 @@
# limitations under the License.
#

CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)

PROJECT(singa)
SET(PACKAGE_VERSION "1.0.0")
MESSAGE(STATUS "CMAKE paths: ${CMAKE_PREFIX_PATH} test ${CMAKE_SYSTEM_PREFIX_PATH}")

LIST(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Thirdparty)
#message(STATUS "module path: ${CMAKE_MODULE_PATH}")

# Flags
IF(UNIX OR APPLE)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -g -O2 -fPIC -Wall")
SET(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -std=c++11 -g -O2 -fPIC -Wall -pthread")
ENDIF()
IF(WIN32)
IF (MSVC)
MESSAGE(STATUS "Using msvc compiler")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_SCL_SECURE_NO_WARNINGS")
MESSAGE(STATUS "Using msvc compiler ${CMAKE_CXX_FLAGS}")
ENDIF()
IF (MSVC)
MESSAGE(STATUS "Using msvc compiler")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_SCL_SECURE_NO_WARNINGS")
#MESSAGE(STATUS "Using msvc compiler ${CMAKE_CXX_FLAGS}")
ENDIF()
ENDIF()
IF(CMAKE_BUILD_TYPE=Debug)
SET(NVCC_FLAG "${NVCC_FLAG} -g -G ")
SET(NVCC_FLAG "${NVCC_FLAG} -g -G ")
ENDIF()
#message(STATUS "${CMAKE_CXX_FLAGS}")
SET(SINGA_INCLUDE_DIR
"${CMAKE_SOURCE_DIR}/include;${CMAKE_SOURCE_DIR}/lib/cnmem/include;${PROJECT_BINARY_DIR}")
"${CMAKE_SOURCE_DIR}/include;${PROJECT_BINARY_DIR}")
INCLUDE_DIRECTORIES(${SINGA_INCLUDE_DIR})

OPTION(USE_CBLAS "Use CBlas libs" ON)
#OPTION(USE_CBLAS "Use CBlas libs" ON)
OPTION(USE_CUDA "Use Cuda libs" OFF)
OPTION(USE_CUDNN "Use Cudnn libs" ON)
OPTION(USE_OPENCV "Use opencv" OFF)
OPTION(USE_LMDB "Use LMDB libs" OFF)
OPTION(USE_PYTHON "Generate py wrappers" ON)
OPTION(USE_JAVA "Generate java wrappers" OFF)
OPTION(USE_OPENCL "Use OpenCL" OFF)
OPTION(ENABLE_DIST "enable distributed training" OFF)
OPTION(DISABLE_WARNINGS "disable warnings under windows" ON)
OPTION(ENABLE_DIST "Enable distributed training" OFF)
OPTION(DISABLE_WARNINGS "Disable warnings under windows" ON)
OPTION(USE_MODULES "Compile dependent libs as submodules together with singa" OFF)
#OPTION(USE_SHARED_LIBS "Use shared library" OFF)

# TODO: remove all USE_CBLAS in codes
SET(USE_CBLAS ON)

INCLUDE("cmake/Dependencies.cmake")
#INCLUDE("cmake/Utils.cmake")
Expand All@@ -71,14 +76,63 @@ SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

IF (USE_CUDA)
ADD_SUBDIRECTORY(lib/cnmem)
LIST(APPEND SINGA_LINKER_LIBS cnmem)
include(ExternalProject)
ExternalProject_Add(cnmem
GIT_REPOSITORY "https://github.com/nusdbsystem/cnmem.git"
GIT_TAG "master"
SOURCE_DIR "cnmem/"
CONFIGURE_COMMAND "${CMAKE_COMMAND}"
"-H${CMAKE_BINARY_DIR}/cnmem" "-B."
"-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}"
)
#ADD_SUBDIRECTORY(lib/cnmem)
#LIST(APPEND SINGA_LINKER_LIBS cnmem)
SET(global_cuda_objs "")
ENDIF()

# TODO(wangwei) detect the ev lib
IF (ENABLE_DIST)
LIST(APPEND SINGA_LINKER_LIBS ev)
LIST(APPEND SINGA_LINKER_LIBS ev)
ENDIF()

IF (USE_MODULES)
include(ExternalProject)
#IF(USE_SHARED_LIBS)
# ExternalProject_Add(protobuf
# GIT_REPOSITORY "https://github.com/google/protobuf.git"
# GIT_TAG "2.7.0"
# SOURCE_DIR "protobuf/"
# CONFIGURE_COMMAND "${CMAKE_COMMAND}"
# "-H${CMAKE_BINARY_DIR}/protobuf/cmake" "-B."
# "-Dprotobuf_BUILD_TESTS=OFF" "-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}"
# "-Dprotobuf_BUILD_SHARED_LIBS=ON" "-DCMAKE_C_FLAGS=-fPIC"
# "-DCMAKE_CXX_FLAGS=-fPIC"
# BUILD_COMMAND "${CMAKE_COMMAND}" --build "."
# )
#ELSE()
#ENDIF()
ExternalProject_Add(protobuf
DOWNLOAD_COMMAND "wget"
"http://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz"
"-O" "protobuf-2.6.1.tar.gz"
UPDATE_COMMAND "tar" "zxvf"
"${CMAKE_BINARY_DIR}/protobuf-prefix/src/protobuf-2.6.1.tar.gz" "-C" ".."
SOURCE_DIR "protobuf-2.6.1/"
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND "./configure" "--disable-shared"
"--prefix=${CMAKE_BINARY_DIR}/" "CXXFLAGS=-fPIC"
INSTALL_COMMAND "make" "install"
)
ExternalProject_Add(openblas
GIT_REPOSITORY "https://github.com/xianyi/OpenBLAS.git"
#GIT_TAG "develop"
GIT_TAG "f3419e6"
SOURCE_DIR "openblas/"
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ""
BUILD_COMMAND "make" "ONLY_CBLAS=1"
INSTALL_COMMAND "make" "PREFIX=${CMAKE_BINARY_DIR}/" "install"
)
ENDIF()

INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}/include")
Expand All@@ -87,17 +141,17 @@ ADD_SUBDIRECTORY(test)
ADD_SUBDIRECTORY(examples)

IF (USE_PYTHON)
ADD_SUBDIRECTORY(python)
ADD_SUBDIRECTORY(python)
ENDIF()

IF (USE_JAVA)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing ")
ADD_SUBDIRECTORY(java)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing ")
ADD_SUBDIRECTORY(java)
ENDIF()

INSTALL(DIRECTORY include/singa DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
INSTALL(FILES ${CMAKE_BINARY_DIR}/include/singa/singa_config.h DESTINATION
${CMAKE_INSTALL_PREFIX}/include/singa)
${CMAKE_INSTALL_PREFIX}/include/singa)
INSTALL (DIRECTORY ${CMAKE_BINARY_DIR}/lib DESTINATION
${CMAKE_INSTALL_PREFIX}
PATTERN "*libgtest.a" EXCLUDE )
${CMAKE_INSTALL_PREFIX}
PATTERN "*libgtest.a" EXCLUDE )
89 changes: 62 additions & 27 deletions cmake/Dependencies.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,59 +18,94 @@

SET(SINGA_LINKER_LIBS "")

#INCLUDE("cmake/ProtoBuf.cmake")
IF(USE_MODULES)
#IF(USE_SHARED_LIBS)
# include(FindProtobuf)
# SET(CMAKE_INSTALL_RPATH "${CMAKE_BINARY_DIR}/lib")
# link_directories(${CMAKE_BINARY_DIR}/lib)
# SET(PROTOBUF_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include")
# SET(PROTOBUF_LIBRARY "${CMAKE_BINARY_DIR}/lib/libprotobuf.so")
# SET(PROTOBUF_PROTOC_LIBRARY "${CMAKE_BINARY_DIR}/lib/libprotoc.so")
# SET(PROTOBUF_PROTOC_EXECUTABLE "${CMAKE_BINARY_DIR}/bin/protoc")
# INCLUDE_DIRECTORIES(SYSTEM ${PROTOBUF_INCLUDE_DIR})
# LIST(APPEND SINGA_LINKER_LIBS ${PROTOBUF_LIBRARY})
# #IF(USE_CBLAS)
# SET(CBLAS_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include")
# SET(CBLAS_LIBRARIES "${CMAKE_BINARY_DIR}/lib/libopenblas.so")
# INCLUDE_DIRECTORIES(SYSTEM ${CBLAS_INCLUDE_DIR})
# LIST(APPEND SINGA_LINKER_LIBS ${CBLAS_LIBRARIES})
#ENDIF()
#ELSE()
include(FindProtobuf)
SET(PROTOBUF_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include")
SET(PROTOBUF_LIBRARY "${CMAKE_BINARY_DIR}/lib/libprotobuf.a")
SET(PROTOBUF_PROTOC_LIBRARY "${CMAKE_BINARY_DIR}/lib/libprotobuf.a")
SET(PROTOBUF_PROTOC_EXECUTABLE "${CMAKE_BINARY_DIR}/bin/protoc")
INCLUDE_DIRECTORIES(SYSTEM ${PROTOBUF_INCLUDE_DIR})
LIST(APPEND SINGA_LINKER_LIBS ${PROTOBUF_LIBRARY})
#IF(USE_CBLAS)
SET(CBLAS_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include")
SET(CBLAS_LIBRARIES "${CMAKE_BINARY_DIR}/lib/libopenblas.a")
INCLUDE_DIRECTORIES(SYSTEM ${CBLAS_INCLUDE_DIR})
LIST(APPEND SINGA_LINKER_LIBS ${CBLAS_LIBRARIES})

@xiezlxiezlOct 23, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. USE_CBLAS would always be ON. If we remove it, then we need to remove other places using USE_CBLAS

#ENDIF()
#ENDIF()
ELSE()
FIND_PACKAGE( Protobuf REQUIRED )
#MESSAGE(STATUS "proto libs " ${PROTOBUF_LIBRARY})
LIST(APPEND SINGA_LINKER_LIBS ${PROTOBUF_LIBRARY})
#IF(USE_CBLAS)
FIND_PACKAGE(CBLAS REQUIRED)
INCLUDE_DIRECTORIES(SYSTEM ${CBLAS_INCLUDE_DIR})
LIST(APPEND SINGA_LINKER_LIBS ${CBLAS_LIBRARIES})
#MESSAGE(STATUS "Found cblas at ${CBLAS_LIBRARIES}")
#ENDIF()
ENDIF()

FIND_PACKAGE( Protobuf REQUIRED )
INCLUDE_DIRECTORIES(SYSTEM ${PROTOBUF_INCLUDE_DIR})
MESSAGE(STATUS "proto libs " ${PROTOBUF_LIBRARIES})
LIST(APPEND SINGA_LINKER_LIBS ${PROTOBUF_LIBRARIES})
#INCLUDE("cmake/ProtoBuf.cmake")
#INCLUDE("cmake/Protobuf.cmake")

FIND_PACKAGE(Glog)
IF(GLOG_FOUND)
MESSAGE(STATUS "GLOG FOUND at ${GLOG_INCLUDE_DIR}")
#MESSAGE(STATUS "GLOG FOUND at ${GLOG_INCLUDE_DIR}")
ADD_DEFINITIONS("-DUSE_GLOG")
LIST(APPEND SINGA_LINKER_LIBS ${GLOG_LIBRARIES})
INCLUDE_DIRECTORIES(${GLOG_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${GLOG_INCLUDE_DIR})
ENDIF()

IF(USE_LMDB)
FIND_PACKAGE(LMDB REQUIRED)
INCLUDE_DIRECTORIES(SYSTEM ${LMDB_INCLUDE_DIR})
LIST(APPEND SINGA_LINKER_LIBS ${LMDB_LIBRARIES})
MESSAGE(STATUS "FOUND lmdb at ${LMDB_INCLUDE_DIR}")
#MESSAGE(STATUS "FOUND lmdb at ${LMDB_INCLUDE_DIR}")
ENDIF()

IF(USE_CUDA)
INCLUDE("cmake/Cuda.cmake")
SET(CNMEM_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include")

@nudlesnudlesOct 24, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you please also compile cnmem into .a?

SET(CNMEM_LIBRARY "${CMAKE_BINARY_DIR}/lib/libcnmem.a")
LIST(APPEND SINGA_LINKER_LIBS ${CNMEM_LIBRARY})
ELSE()
SET(USE_CUDNN FALSE)
ENDIF()

IF(USE_CBLAS)
FIND_PACKAGE(CBLAS REQUIRED)
INCLUDE_DIRECTORIES(SYSTEM ${CBLAS_INCLUDE_DIR})
LIST(APPEND SINGA_LINKER_LIBS ${CBLAS_LIBRARIES})
MESSAGE(STATUS "Found cblas at ${CBLAS_LIBRARIES}")
ENDIF()

IF(USE_OPENCL)
FIND_PACKAGE(OpenCL REQUIRED)
IF(NOT OpenCL_FOUND)
MESSAGE(SEND_ERROR "OpenCL was requested, but not found.")
ELSE()
MESSAGE(STATUS "Found OpenCL headers at ${OpenCL_INCLUDE_DIRS}")
INCLUDE_DIRECTORIES(SYSTEM ${OpenCL_INCLUDE_DIR})
LIST(APPEND SINGA_LINKER_LIBS ${OpenCL_LIBRARIES})
FIND_PACKAGE(ViennaCL REQUIRED)
IF(NOT ViennaCL_FOUND)
MESSAGE(SEND_ERROR "ViennaCL is required if OpenCL is enabled.")
ELSE()
MESSAGE(STATUS "Found ViennaCL headers at ${ViennaCL_INCLUDE_DIR}")
INCLUDE_DIRECTORIES(SYSTEM ${ViennaCL_INCLUDE_DIR})
LIST(APPEND SINGA_LINKER_LIBS ${ViennaCL_LIBRARIES})
ENDIF()
ENDIF()
#MESSAGE(STATUS "Found OpenCL headers at ${OpenCL_INCLUDE_DIRS}")
INCLUDE_DIRECTORIES(SYSTEM ${OpenCL_INCLUDE_DIR})
LIST(APPEND SINGA_LINKER_LIBS ${OpenCL_LIBRARIES})
FIND_PACKAGE(ViennaCL REQUIRED)
IF(NOT ViennaCL_FOUND)
MESSAGE(SEND_ERROR "ViennaCL is required if OpenCL is enabled.")
ELSE()
#MESSAGE(STATUS "Found ViennaCL headers at ${ViennaCL_INCLUDE_DIR}")
INCLUDE_DIRECTORIES(SYSTEM ${ViennaCL_INCLUDE_DIR})
LIST(APPEND SINGA_LINKER_LIBS ${ViennaCL_LIBRARIES})
ENDIF()
ENDIF()
ENDIF()

#FIND_PACKAGE(Glog REQUIRED)
Expand Down
12 changes: 6 additions & 6 deletions examples/cifar10/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,18 +22,18 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)

ADD_EXECUTABLE(alexnet alexnet.cc)
ADD_DEPENDENCIES(alexnet singa)
TARGET_LINK_LIBRARIES(alexnet singa ${SINGA_LIBKER_LIBS})
TARGET_LINK_LIBRARIES(alexnet singa)

IF(USE_CUDNN)

ADD_EXECUTABLE(alexnet-parallel alexnet-parallel.cc)
ADD_DEPENDENCIES(alexnet-parallel singa)
TARGET_LINK_LIBRARIES(alexnet-parallel singa protobuf ${SINGA_LIBKER_LIBS})
SET_TARGET_PROPERTIES(alexnet-parallel PROPERTIES LINK_FLAGS "${LINK_FLAGS} -pthread")
TARGET_LINK_LIBRARIES(alexnet-parallel singa)
#SET_TARGET_PROPERTIES(alexnet-parallel PROPERTIES LINK_FLAGS "${LINK_FLAGS} -pthread")

ADD_EXECUTABLE(vgg-parallel vgg-parallel.cc)
ADD_DEPENDENCIES(vgg-parallel singa)
TARGET_LINK_LIBRARIES(vgg-parallel singa protobuf ${SINGA_LIBKER_LIBS})
SET_TARGET_PROPERTIES(vgg-parallel PROPERTIES LINK_FLAGS "${LINK_FLAGS} -pthread")
TARGET_LINK_LIBRARIES(vgg-parallel singa)
#SET_TARGET_PROPERTIES(vgg-parallel PROPERTIES LINK_FLAGS "${LINK_FLAGS} -pthread")

ENDIF(USE_CUDNN)
ENDIF(USE_CUDNN)
1 change: 0 additions & 1 deletion lib/cnmem
Open in desktop
Submodule cnmem deleted from 28a182
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,6 +95,7 @@ ADD_DEPENDENCIES(singa_objects copy_protobuf)
IF(UNIX OR APPLE)
ADD_LIBRARY(singa SHARED $<TARGET_OBJECTS:singa_objects> ${cuda_objs})
TARGET_LINK_LIBRARIES(singa ${SINGA_LINKER_LIBS})

@xiezlxiezlOct 23, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need to add the dependent libs?

SET_TARGET_PROPERTIES(singa PROPERTIES LINK_FLAGS "")
ENDIF()

#pass configure infor to swig
Expand Down
2 changes: 1 addition & 1 deletion src/model/layer/batchnorm.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ const Tensor BatchNorm::Forward(int flag, const Tensor& input) {
bnBias_.Reshape(Shape{channels_, 1});

std::vector<Tensor> mean_stack, var_stack, scale_stack, bias_stack;
for (int i = 0; i < height_ * width_; ++i) {
for (unsigned i = 0; i < height_ * width_; ++i) {
mean_stack.push_back(runningMean_);
var_stack.push_back(runningVariance_);
scale_stack.push_back(bnScale_);
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ LIST(REMOVE_ITEM singa_test_source "singa/test_ep.cc")
ADD_EXECUTABLE(test_singa "gtest/gtest_main.cc" ${singa_test_source})
ADD_DEPENDENCIES(test_singa singa)
#MESSAGE(STATUS "link libs" ${singa_linker_libs})
TARGET_LINK_LIBRARIES(test_singa gtest singa ${SINGA_LINKER_LIBS})
TARGET_LINK_LIBRARIES(test_singa gtest singa )
IF(UNIX AND (NOT APPLE))
LIST(APPEND LINK_FLAGS "-pthread")
ENDIF()
Expand Down
Loading