From 7a0659875fb9af664da1fb9a828412e709fd74ae Mon Sep 17 00:00:00 2001 From: Yangqing Jia Date: Tue, 15 Oct 2013 14:35:14 -0700 Subject: [PATCH] Reorganization of codes. --- src/Makefile => Makefile | 53 +++++---- src/caffe.cloc => caffe.cloc | 0 {src/programs => examples}/demo_mnist.cpp | 2 +- {src/programs => examples}/dump_network.cpp | 2 +- {src/programs => examples}/imagenet.prototxt | 0 .../programs => examples}/imagenet_solver.prototxt | 0 {src/programs => examples}/net_speed_benchmark.cpp | 2 +- {src/programs => examples}/test_read_imagenet.cpp | 0 {src/programs => examples}/train_net.cpp | 2 +- {src => include}/caffe/blob.hpp | 0 {src => include}/caffe/caffe.hpp | 0 {src => include}/caffe/common.hpp | 0 {src => include}/caffe/filler.hpp | 0 {src => include}/caffe/layer.hpp | 0 {src => include}/caffe/net.hpp | 0 .../optimization => include/caffe}/solver.hpp | 0 {src => include}/caffe/syncedmem.hpp | 0 {src => include}/caffe/util/im2col.hpp | 0 {src => include}/caffe/util/io.hpp | 0 {src => include}/caffe/util/math_functions.hpp | 0 {src => include}/caffe/vision_layers.hpp | 0 src/caffe/{optimization => }/solver.cpp | 2 +- src/caffe/test/test_solver_linear_regression.cpp | 125 --------------------- 23 files changed, 38 insertions(+), 150 deletions(-) rename src/Makefile => Makefile (62%) rename src/caffe.cloc => caffe.cloc (100%) rename {src/programs => examples}/demo_mnist.cpp (98%) rename {src/programs => examples}/dump_network.cpp (98%) rename {src/programs => examples}/imagenet.prototxt (100%) rename {src/programs => examples}/imagenet_solver.prototxt (100%) rename {src/programs => examples}/net_speed_benchmark.cpp (97%) rename {src/programs => examples}/test_read_imagenet.cpp (100%) rename {src/programs => examples}/train_net.cpp (96%) rename {src => include}/caffe/blob.hpp (100%) rename {src => include}/caffe/caffe.hpp (100%) rename {src => include}/caffe/common.hpp (100%) rename {src => include}/caffe/filler.hpp (100%) rename {src => include}/caffe/layer.hpp (100%) rename {src => include}/caffe/net.hpp (100%) rename {src/caffe/optimization => include/caffe}/solver.hpp (100%) rename {src => include}/caffe/syncedmem.hpp (100%) rename {src => include}/caffe/util/im2col.hpp (100%) rename {src => include}/caffe/util/io.hpp (100%) rename {src => include}/caffe/util/math_functions.hpp (100%) rename {src => include}/caffe/vision_layers.hpp (100%) rename src/caffe/{optimization => }/solver.cpp (99%) delete mode 100644 src/caffe/test/test_solver_linear_regression.cpp diff --git a/src/Makefile b/Makefile similarity index 62% rename from src/Makefile rename to Makefile index 60aa139..7b28bfb 100644 --- a/src/Makefile +++ b/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 b/caffe.cloc similarity index 100% rename from src/caffe.cloc rename to caffe.cloc diff --git a/src/programs/demo_mnist.cpp b/examples/demo_mnist.cpp similarity index 98% rename from src/programs/demo_mnist.cpp rename to examples/demo_mnist.cpp index 284b671..c513a6a 100644 --- a/src/programs/demo_mnist.cpp +++ b/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 b/examples/dump_network.cpp similarity index 98% rename from src/programs/dump_network.cpp rename to examples/dump_network.cpp index 8dd8b0d..1fb8115 100644 --- a/src/programs/dump_network.cpp +++ b/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 b/examples/imagenet.prototxt similarity index 100% rename from src/programs/imagenet.prototxt rename to examples/imagenet.prototxt diff --git a/src/programs/imagenet_solver.prototxt b/examples/imagenet_solver.prototxt similarity index 100% rename from src/programs/imagenet_solver.prototxt rename to examples/imagenet_solver.prototxt diff --git a/src/programs/net_speed_benchmark.cpp b/examples/net_speed_benchmark.cpp similarity index 97% rename from src/programs/net_speed_benchmark.cpp rename to examples/net_speed_benchmark.cpp index 560c5d8..97e8223 100644 --- a/src/programs/net_speed_benchmark.cpp +++ b/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 b/examples/test_read_imagenet.cpp similarity index 100% rename from src/programs/test_read_imagenet.cpp rename to examples/test_read_imagenet.cpp diff --git a/src/programs/train_net.cpp b/examples/train_net.cpp similarity index 96% rename from src/programs/train_net.cpp rename to examples/train_net.cpp index 15f4315..ec88b6f 100644 --- a/src/programs/train_net.cpp +++ b/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 b/include/caffe/blob.hpp similarity index 100% rename from src/caffe/blob.hpp rename to include/caffe/blob.hpp diff --git a/src/caffe/caffe.hpp b/include/caffe/caffe.hpp similarity index 100% rename from src/caffe/caffe.hpp rename to include/caffe/caffe.hpp diff --git a/src/caffe/common.hpp b/include/caffe/common.hpp similarity index 100% rename from src/caffe/common.hpp rename to include/caffe/common.hpp diff --git a/src/caffe/filler.hpp b/include/caffe/filler.hpp similarity index 100% rename from src/caffe/filler.hpp rename to include/caffe/filler.hpp diff --git a/src/caffe/layer.hpp b/include/caffe/layer.hpp similarity index 100% rename from src/caffe/layer.hpp rename to include/caffe/layer.hpp diff --git a/src/caffe/net.hpp b/include/caffe/net.hpp similarity index 100% rename from src/caffe/net.hpp rename to include/caffe/net.hpp diff --git a/src/caffe/optimization/solver.hpp b/include/caffe/solver.hpp similarity index 100% rename from src/caffe/optimization/solver.hpp rename to include/caffe/solver.hpp diff --git a/src/caffe/syncedmem.hpp b/include/caffe/syncedmem.hpp similarity index 100% rename from src/caffe/syncedmem.hpp rename to include/caffe/syncedmem.hpp diff --git a/src/caffe/util/im2col.hpp b/include/caffe/util/im2col.hpp similarity index 100% rename from src/caffe/util/im2col.hpp rename to include/caffe/util/im2col.hpp diff --git a/src/caffe/util/io.hpp b/include/caffe/util/io.hpp similarity index 100% rename from src/caffe/util/io.hpp rename to include/caffe/util/io.hpp diff --git a/src/caffe/util/math_functions.hpp b/include/caffe/util/math_functions.hpp similarity index 100% rename from src/caffe/util/math_functions.hpp rename to include/caffe/util/math_functions.hpp diff --git a/src/caffe/vision_layers.hpp b/include/caffe/vision_layers.hpp similarity index 100% rename from src/caffe/vision_layers.hpp rename to include/caffe/vision_layers.hpp diff --git a/src/caffe/optimization/solver.cpp b/src/caffe/solver.cpp similarity index 99% rename from src/caffe/optimization/solver.cpp rename to src/caffe/solver.cpp index 0c68330..425bd42 100644 --- a/src/caffe/optimization/solver.cpp +++ b/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 deleted file mode 100644 index 8fd504b..0000000 --- a/src/caffe/test/test_solver_linear_regression.cpp +++ /dev/null @@ -1,125 +0,0 @@ -// Copyright 2013 Yangqing Jia - -#include -#include -#include -#include -#include - -#include - -#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 -class SolverTest : public ::testing::Test {}; - -typedef ::testing::Types 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*> bottom_vec; - Net 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 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*> bottom_vec; - Net 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 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 -- 2.7.4