Reorganization of codes.

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

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;
 

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;
 

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;
 

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;
 

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"
 

src/caffe/test/test_solver_linear_regression.cpp

@@ -1,125 +0,0 @@
-// Copyright 2013 Yangqing Jia
-
-#include <cuda_runtime.h>
-#include <fcntl.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <gtest/gtest.h>
-
-#include <cstring>
-
-#include "caffe/blob.hpp"
-#include "caffe/common.hpp"
-#include "caffe/net.hpp"
-#include "caffe/filler.hpp"
-#include "caffe/proto/caffe.pb.h"
-#include "caffe/util/io.hpp"
-#include "caffe/optimization/solver.hpp"
-
-#include "caffe/test/test_caffe_main.hpp"
-
-namespace caffe {
-
-template <typename Dtype>
-class SolverTest : public ::testing::Test {};
-
-typedef ::testing::Types<float, double> Dtypes;
-TYPED_TEST_CASE(SolverTest, Dtypes);
-
-TYPED_TEST(SolverTest, TestSolveGPU) {
-  Caffe::set_mode(Caffe::GPU);
-
-  NetParameter net_param;
-  ReadProtoFromTextFile("data/linear_regression.prototxt",
-      &net_param);
-  // check if things are right
-  EXPECT_EQ(net_param.layers_size(), 3);
-  EXPECT_EQ(net_param.input_size(), 0);
-  vector<Blob<TypeParam>*> bottom_vec;
-  Net<TypeParam> caffe_net(net_param, bottom_vec);
-  EXPECT_EQ(caffe_net.layer_names().size(), 3);
-  EXPECT_EQ(caffe_net.blob_names().size(), 3);
-
-  // Run the network without training.
-  LOG(INFO) << "Performing Forward";
-  caffe_net.Forward(bottom_vec);
-  LOG(INFO) << "Performing Backward";
-  LOG(INFO) << "Initial loss: " << caffe_net.Backward();
-
-  SolverParameter solver_param;
-  solver_param.set_base_lr(0.1);
-  solver_param.set_display(0);
-  solver_param.set_max_iter(100);
-  solver_param.set_lr_policy("inv");
-  solver_param.set_gamma(1.);
-  solver_param.set_power(0.75);
-  solver_param.set_momentum(0.9);
-
-  LOG(INFO) << "Starting Optimization";
-  SGDSolver<TypeParam> solver(solver_param);
-  solver.Solve(&caffe_net);
-  LOG(INFO) << "Optimization Done.";
-  LOG(INFO) << "Weight: " << caffe_net.params()[0]->cpu_data()[0] << ", "
-      << caffe_net.params()[0]->cpu_data()[1];
-  LOG(INFO) << "Bias: " << caffe_net.params()[1]->cpu_data()[0];
-
-  EXPECT_GE(caffe_net.params()[0]->cpu_data()[0], 0.3);
-  EXPECT_LE(caffe_net.params()[0]->cpu_data()[0], 0.35);
-
-  EXPECT_GE(caffe_net.params()[0]->cpu_data()[1], 0.3);
-  EXPECT_LE(caffe_net.params()[0]->cpu_data()[1], 0.35);
-
-  EXPECT_GE(caffe_net.params()[1]->cpu_data()[0], -0.01);
-  EXPECT_LE(caffe_net.params()[1]->cpu_data()[0], 0.01);
-}
-
-
-
-TYPED_TEST(SolverTest, TestSolveCPU) {
-  Caffe::set_mode(Caffe::CPU);
-
-  NetParameter net_param;
-  ReadProtoFromTextFile("data/linear_regression.prototxt",
-      &net_param);
-  // check if things are right
-  EXPECT_EQ(net_param.layers_size(), 3);
-  EXPECT_EQ(net_param.input_size(), 0);
-  vector<Blob<TypeParam>*> bottom_vec;
-  Net<TypeParam> caffe_net(net_param, bottom_vec);
-  EXPECT_EQ(caffe_net.layer_names().size(), 3);
-  EXPECT_EQ(caffe_net.blob_names().size(), 3);
-
-  // Run the network without training.
-  LOG(INFO) << "Performing Forward";
-  caffe_net.Forward(bottom_vec);
-  LOG(INFO) << "Performing Backward";
-  LOG(INFO) << "Initial loss: " << caffe_net.Backward();
-
-  SolverParameter solver_param;
-  solver_param.set_base_lr(0.1);
-  solver_param.set_display(0);
-  solver_param.set_max_iter(100);
-  solver_param.set_lr_policy("inv");
-  solver_param.set_gamma(1.);
-  solver_param.set_power(0.75);
-  solver_param.set_momentum(0.9);
-
-  LOG(INFO) << "Starting Optimization";
-  SGDSolver<TypeParam> solver(solver_param);
-  solver.Solve(&caffe_net);
-  LOG(INFO) << "Optimization Done.";
-  LOG(INFO) << "Weight: " << caffe_net.params()[0]->cpu_data()[0] << ", "
-      << caffe_net.params()[0]->cpu_data()[1];
-  LOG(INFO) << "Bias: " << caffe_net.params()[1]->cpu_data()[0];
-
-  EXPECT_GE(caffe_net.params()[0]->cpu_data()[0], 0.3);
-  EXPECT_LE(caffe_net.params()[0]->cpu_data()[0], 0.35);
-
-  EXPECT_GE(caffe_net.params()[0]->cpu_data()[1], 0.3);
-  EXPECT_LE(caffe_net.params()[0]->cpu_data()[1], 0.35);
-
-  EXPECT_GE(caffe_net.params()[1]->cpu_data()[0], -0.01);
-  EXPECT_LE(caffe_net.params()[1]->cpu_data()[0], 0.01);
-}
-
-}  // namespace caffe