merge to new bvlc base c0597b1

*   3f48aeb merge to new bvlc base c0597b1
|\
| *   fc0a02e Merge pull request BVLC#6 from yahoo/jun_cos_layer
| |\
| | * 807ee66 enhance cos layer
| |/
| *   ce1db4b Merge pull request BVLC#5 from yahoo/new_data_layer
| |\
| | * d4b2bf1 new datalayer changes
| |/
| *   5498759 Merge pull request BVLC#4 from yahoo/clean_permission
| |\
| | * 9b7fff8 Permission change for travis
| | * 8377456 Added dynamic linker resolution
| | * 840d6b5 Synchedmem
| | * 5fc8416 Need set_gpu_data
| | * ea0a8cb Merge branch 'bvlc_master' into clean_permission
| | * fb7e2a9 fix file permissions
| |/
| *   611197a Merge pull request BVLC#3 from yahoo/python_path_patch
| |\
| | * e107fb7 Python path patch
| |/
| *   486f979 Merge pull request BVLC#2 from anfeng/master
| |\
| | * 9cdfeb2 fix field Id for dataframe_format
| |/
| * f4e26f1 move dataframe format setting into prototxt
| *   23b0191 Merge pull request BVLC#1 from yahoo/afeng_df
| |\
| | * 177e0d9 MemoryDataLayer optional fields for DataFrames
| |/
| * 4b677c6 initial commit
*   eb8dfc8 Merge pull request BVLC#6
|\
| * 864aa65 implement CPU-GPU parameter update for data parallelism
* 411aafd Merge pull request BVLC#5
* 0cb7d18 Avoid sending the prefetched batch back to host

CMakeLists.txt

@@ -46,7 +46,7 @@ include(cmake/Dependencies.cmake)
 
 # ---[ Flags
 if(UNIX OR APPLE)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -fopenmp")
 endif()
 
 caffe_set_caffe_link()

Makefile

@@ -1,6 +1,6 @@
 PROJECT := caffe
 
-CONFIG_FILE := Makefile.config
+CONFIG_FILE ?= Makefile.config
 # Explicitly check for the config file, otherwise make -k will proceed anyway.
 ifeq ($(wildcard $(CONFIG_FILE)),)
 $(error $(CONFIG_FILE) not found. See $(CONFIG_FILE).example.)
@@ -271,6 +271,7 @@ endif
 # libstdc++ for NVCC compatibility on OS X >= 10.9 with CUDA < 7.0
 ifeq ($(OSX), 1)
 	CXX := /usr/bin/clang++
+	LINKFLAGS +=   -undefined dynamic_lookup
 	ifneq ($(CPU_ONLY), 1)
 		CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release [0-9.]*' | tr -d '[a-z ]')
 		ifeq ($(shell echo | awk '{exit $(CUDA_VERSION) < 7.0;}'), 1)
@@ -364,6 +365,11 @@ ifeq ($(WITH_PYTHON_LAYER), 1)
 	LIBRARIES += $(PYTHON_LIBRARIES)
 endif
 
+ifeq ($(INFINIBAND), 1)
+	COMMON_FLAGS += -DINFINIBAND
+	LIBRARIES += ibverbs ibumad
+endif
+
 # BLAS configuration (default = ATLAS)
 BLAS ?= atlas
 ifeq ($(BLAS), mkl)

Makefile.config.example

@@ -7,6 +7,9 @@
 # CPU-only switch (uncomment to build without GPU support).
 # CPU_ONLY := 1
 
+# Parallelization over InfiniBand or RoCE
+# INFINIBAND := 1
+
 # uncomment to disable IO dependencies and corresponding data layers
 # USE_OPENCV := 0
 # USE_LEVELDB := 0
@@ -106,6 +109,7 @@ LIBRARY_DIRS := $(PYTHON_LIB) /usr/local/lib /usr/lib
 # (Usually not necessary -- OpenCV libraries are normally installed in one of the above $LIBRARY_DIRS.)
 # USE_PKG_CONFIG := 1
 
+
 # N.B. both build and distribute dirs are cleared on `make clean`
 BUILD_DIR := build
 DISTRIBUTE_DIR := distribute