Reorganization of codes.

chuckcho · Oct 15, 2013 · 7a06598 · 7a06598
1 parent b21ca11
commit 7a06598
Show file tree

Hide file tree

Showing 23 changed files with 38 additions and 150 deletions.
diff --git a/src/Makefile → Makefile b/src/Makefile → Makefile
@@ -6,12 +6,12 @@ TEST_GPUID := 1
 NAME := lib$(PROJECT).so
 STATIC_NAME := lib$(PROJECT).a
 # All source files
-CXX_SRCS := $(shell find caffe ! -name "test_*.cpp" -name "*.cpp")
-CU_SRCS := $(shell find caffe -name "*.cu")
-TEST_SRCS := $(shell find caffe -name "test_*.cpp")
-GTEST_SRC := gtest/gtest-all.cpp
-PROGRAM_SRCS := $(shell find programs -name "*.cpp")
-PROTO_SRCS := $(wildcard caffe/proto/*.proto)
+CXX_SRCS := $(shell find src/caffe ! -name "test_*.cpp" -name "*.cpp")
+CU_SRCS := $(shell find src/caffe -name "*.cu")
+TEST_SRCS := $(shell find src/caffe -name "test_*.cpp")
+GTEST_SRC := src/gtest/gtest-all.cpp
+EXAMPLE_SRCS := $(shell find examples -name "*.cpp")
+PROTO_SRCS := $(wildcard src/caffe/proto/*.proto)
 # The generated files for protocol buffers
 PROTO_GEN_HEADER := ${PROTO_SRCS:.proto=.pb.h}
 PROTO_GEN_CC := ${PROTO_SRCS:.proto=.pb.cc}
@@ -22,11 +22,11 @@ CU_OBJS := ${CU_SRCS:.cu=.cuo}
 PROTO_OBJS := ${PROTO_GEN_CC:.cc=.o}
 OBJS := $(PROTO_OBJS) $(CXX_OBJS) $(CU_OBJS)
 # program and test objects
-PROGRAM_OBJS := ${PROGRAM_SRCS:.cpp=.o}
+EXAMPLE_OBJS := ${EXAMPLE_SRCS:.cpp=.o}
 TEST_OBJS := ${TEST_SRCS:.cpp=.o}
 GTEST_OBJ := ${GTEST_SRC:.cpp=.o}
 # program and test bins
-PROGRAM_BINS :=${PROGRAM_OBJS:.o=.bin}
+EXAMPLE_BINS :=${EXAMPLE_OBJS:.o=.bin}
 TEST_BINS := ${TEST_OBJS:.o=.testbin}
 
 # define third-party library paths
@@ -40,10 +40,11 @@ MKL_INCLUDE_DIR := $(MKL_DIR)/include
 MKL_LIB_DIR := $(MKL_DIR)/lib $(MKL_DIR)/lib/intel64
 
 # define inclue and libaries
-INCLUDE_DIRS := . /usr/local/include $(CUDA_INCLUDE_DIR) $(MKL_INCLUDE_DIR)
-LIBRARY_DIRS := . /usr/lib /usr/local/lib $(CUDA_LIB_DIR) $(MKL_LIB_DIR)
+# We put src here just for gtest
+INCLUDE_DIRS := ./src ./include /usr/local/include $(CUDA_INCLUDE_DIR) $(MKL_INCLUDE_DIR)
+LIBRARY_DIRS := /usr/lib /usr/local/lib $(CUDA_LIB_DIR) $(MKL_LIB_DIR)
 LIBRARIES := cuda cudart cublas protobuf glog mkl_rt mkl_intel_thread curand \
- leveldb snappy pthread tcmalloc
+ leveldb snappy pthread
 WARNINGS := -Wall
 
 COMMON_FLAGS := $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))
@@ -54,16 +55,16 @@ LDFLAGS += $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) \
 
 NVCC = nvcc $(NVCCFLAGS) $(CPPFLAGS) $(CUDA_ARCH)
 
-.PHONY: all test clean distclean linecount program
+.PHONY: all test clean distclean linecount examples distribute
 
-all: $(NAME) $(STATIC_NAME) test program
+all: $(NAME) $(STATIC_NAME) test examples
 
 linecount: clean
- cloc --read-lang-def=caffe.cloc caffe/
+ cloc --read-lang-def=caffe.cloc src/caffe/
 
 test: $(TEST_BINS)
 
-program: $(PROGRAM_BINS)
+examples: $(EXAMPLE_BINS)
 
 $(NAME): $(PROTO_OBJS) $(OBJS)
  $(CXX) -shared $(OBJS) -o $(NAME) $(LDFLAGS) $(WARNINGS)
@@ -77,22 +78,34 @@ runtest: test
 $(TEST_BINS): %.testbin : %.o $(GTEST_OBJ) $(STATIC_NAME)
  $(CXX) $< $(GTEST_OBJ) $(STATIC_NAME) -o $@ $(LDFLAGS) $(WARNINGS)
 
-$(PROGRAM_BINS): %.bin : %.o $(STATIC_NAME)
+$(EXAMPLE_BINS): %.bin : %.o $(STATIC_NAME)
  $(CXX) $< $(STATIC_NAME) -o $@ $(LDFLAGS) $(WARNINGS)
 
 $(OBJS): $(PROTO_GEN_CC)
 
-$(PROGRAM_OBJS): $(PROTO_GEN_CC)
+$(EXAMPLE_OBJS): $(PROTO_GEN_CC)
 
 $(CU_OBJS): %.cuo: %.cu
  $(NVCC) -c $< -o $@
 
 $(PROTO_GEN_CC): $(PROTO_SRCS)
- protoc $(PROTO_SRCS) --cpp_out=. --python_out=.
+ protoc --proto_path=src --cpp_out=src --python_out=src $(PROTO_SRCS)
+ mkdir -p include/caffe/proto
+ cp $(PROTO_GEN_HEADER) include/caffe/proto/
 
 clean:
- @- $(RM) $(NAME) $(STATIC_NAME) $(TEST_BINS) $(PROGRAM_BINS)
- @- $(RM) $(OBJS) $(TEST_OBJS) $(PROGRAM_OBJS)
+ @- $(RM) $(NAME) $(STATIC_NAME) $(TEST_BINS) $(EXAMPLE_BINS)
+ @- $(RM) $(OBJS) $(TEST_OBJS) $(EXAMPLE_OBJS)
  @- $(RM) $(PROTO_GEN_HEADER) $(PROTO_GEN_CC) $(PROTO_GEN_PY)
+ @- $(RM) -rf build
 
 distclean: clean
+
+distribute: all
+ mkdir build
+ cp -r include build/
+ mkdir build/bin
+ cp $(EXAMPLE_BINS) build/bin
+ mkdir build/lib
+ cp $(NAME) build/lib
+ cp $(STATIC_NAME) build/lib
diff --git a/src/caffe.cloc → caffe.cloc b/src/caffe.cloc → caffe.cloc
diff --git a/src/programs/demo_mnist.cpp → examples/demo_mnist.cpp b/src/programs/demo_mnist.cpp → examples/demo_mnist.cpp
@@ -12,7 +12,7 @@
 #include "caffe/filler.hpp"
 #include "caffe/proto/caffe.pb.h"
 #include "caffe/util/io.hpp"
-#include "caffe/optimization/solver.hpp"
+#include "caffe/solver.hpp"
 
 using namespace caffe;
 

diff --git a/src/programs/dump_network.cpp → examples/dump_network.cpp b/src/programs/dump_network.cpp → examples/dump_network.cpp
@@ -21,7 +21,7 @@
 #include "caffe/filler.hpp"
 #include "caffe/proto/caffe.pb.h"
 #include "caffe/util/io.hpp"
-#include "caffe/optimization/solver.hpp"
+#include "caffe/solver.hpp"
 
 using namespace caffe;
 

diff --git a/src/programs/imagenet.prototxt → examples/imagenet.prototxt b/src/programs/imagenet.prototxt → examples/imagenet.prototxt
diff --git a/src/programs/imagenet_solver.prototxt → examples/imagenet_solver.prototxt b/src/programs/imagenet_solver.prototxt → examples/imagenet_solver.prototxt
diff --git a/src/programs/net_speed_benchmark.cpp → examples/net_speed_benchmark.cpp b/src/programs/net_speed_benchmark.cpp → examples/net_speed_benchmark.cpp
@@ -13,7 +13,7 @@
 #include "caffe/filler.hpp"
 #include "caffe/proto/caffe.pb.h"
 #include "caffe/util/io.hpp"
-#include "caffe/optimization/solver.hpp"
+#include "caffe/solver.hpp"
 
 using namespace caffe;
 

diff --git a/src/programs/test_read_imagenet.cpp → examples/test_read_imagenet.cpp b/src/programs/test_read_imagenet.cpp → examples/test_read_imagenet.cpp
diff --git a/src/programs/train_net.cpp → examples/train_net.cpp b/src/programs/train_net.cpp → examples/train_net.cpp
@@ -15,7 +15,7 @@
 #include "caffe/filler.hpp"
 #include "caffe/proto/caffe.pb.h"
 #include "caffe/util/io.hpp"
-#include "caffe/optimization/solver.hpp"
+#include "caffe/solver.hpp"
 
 using namespace caffe;
 

diff --git a/src/caffe/blob.hpp → include/caffe/blob.hpp b/src/caffe/blob.hpp → include/caffe/blob.hpp
diff --git a/src/caffe/caffe.hpp → include/caffe/caffe.hpp b/src/caffe/caffe.hpp → include/caffe/caffe.hpp
diff --git a/src/caffe/common.hpp → include/caffe/common.hpp b/src/caffe/common.hpp → include/caffe/common.hpp
diff --git a/src/caffe/filler.hpp → include/caffe/filler.hpp b/src/caffe/filler.hpp → include/caffe/filler.hpp
diff --git a/src/caffe/layer.hpp → include/caffe/layer.hpp b/src/caffe/layer.hpp → include/caffe/layer.hpp
diff --git a/src/caffe/net.hpp → include/caffe/net.hpp b/src/caffe/net.hpp → include/caffe/net.hpp
diff --git a/src/caffe/optimization/solver.hpp → include/caffe/solver.hpp b/src/caffe/optimization/solver.hpp → include/caffe/solver.hpp
diff --git a/src/caffe/syncedmem.hpp → include/caffe/syncedmem.hpp b/src/caffe/syncedmem.hpp → include/caffe/syncedmem.hpp
diff --git a/src/caffe/util/im2col.hpp → include/caffe/util/im2col.hpp b/src/caffe/util/im2col.hpp → include/caffe/util/im2col.hpp
diff --git a/src/caffe/util/io.hpp → include/caffe/util/io.hpp b/src/caffe/util/io.hpp → include/caffe/util/io.hpp
diff --git a/src/caffe/util/math_functions.hpp → include/caffe/util/math_functions.hpp b/src/caffe/util/math_functions.hpp → include/caffe/util/math_functions.hpp
diff --git a/src/caffe/vision_layers.hpp → include/caffe/vision_layers.hpp b/src/caffe/vision_layers.hpp → include/caffe/vision_layers.hpp
diff --git a/src/caffe/optimization/solver.cpp → src/caffe/solver.cpp b/src/caffe/optimization/solver.cpp → src/caffe/solver.cpp
@@ -8,7 +8,7 @@
 
 #include "caffe/net.hpp"
 #include "caffe/proto/caffe.pb.h"
-#include "caffe/optimization/solver.hpp"
+#include "caffe/solver.hpp"
 #include "caffe/util/io.hpp"
 #include "caffe/util/math_functions.hpp"
 

diff --git a/src/caffe/test/test_solver_linear_regression.cpp b/src/caffe/test/test_solver_linear_regression.cpp