summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile (renamed from src/Makefile)53
-rw-r--r--caffe.cloc (renamed from src/caffe.cloc)0
-rw-r--r--examples/demo_mnist.cpp (renamed from src/programs/demo_mnist.cpp)2
-rw-r--r--examples/dump_network.cpp (renamed from src/programs/dump_network.cpp)2
-rw-r--r--examples/imagenet.prototxt (renamed from src/programs/imagenet.prototxt)0
-rw-r--r--examples/imagenet_solver.prototxt (renamed from src/programs/imagenet_solver.prototxt)0
-rw-r--r--examples/net_speed_benchmark.cpp (renamed from src/programs/net_speed_benchmark.cpp)2
-rw-r--r--examples/test_read_imagenet.cpp (renamed from src/programs/test_read_imagenet.cpp)0
-rw-r--r--examples/train_net.cpp (renamed from src/programs/train_net.cpp)2
-rw-r--r--include/caffe/blob.hpp (renamed from src/caffe/blob.hpp)0
-rw-r--r--include/caffe/caffe.hpp (renamed from src/caffe/caffe.hpp)0
-rw-r--r--include/caffe/common.hpp (renamed from src/caffe/common.hpp)0
-rw-r--r--include/caffe/filler.hpp (renamed from src/caffe/filler.hpp)0
-rw-r--r--include/caffe/layer.hpp (renamed from src/caffe/layer.hpp)0
-rw-r--r--include/caffe/net.hpp (renamed from src/caffe/net.hpp)0
-rw-r--r--include/caffe/solver.hpp (renamed from src/caffe/optimization/solver.hpp)0
-rw-r--r--include/caffe/syncedmem.hpp (renamed from src/caffe/syncedmem.hpp)0
-rw-r--r--include/caffe/util/im2col.hpp (renamed from src/caffe/util/im2col.hpp)0
-rw-r--r--include/caffe/util/io.hpp (renamed from src/caffe/util/io.hpp)0
-rw-r--r--include/caffe/util/math_functions.hpp (renamed from src/caffe/util/math_functions.hpp)0
-rw-r--r--include/caffe/vision_layers.hpp (renamed from src/caffe/vision_layers.hpp)0
-rw-r--r--src/caffe/solver.cpp (renamed from src/caffe/optimization/solver.cpp)2
-rw-r--r--src/caffe/test/test_solver_linear_regression.cpp125
23 files changed, 38 insertions, 150 deletions
diff --git a/src/Makefile b/Makefile
index 60aa139e..7b28bfba 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
index b2326fb4..b2326fb4 100644
--- a/src/caffe.cloc
+++ b/caffe.cloc
diff --git a/src/programs/demo_mnist.cpp b/examples/demo_mnist.cpp
index 284b671f..c513a6aa 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
index 8dd8b0df..1fb8115a 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
index 53295de2..53295de2 100644
--- a/src/programs/imagenet.prototxt
+++ b/examples/imagenet.prototxt
diff --git a/src/programs/imagenet_solver.prototxt b/examples/imagenet_solver.prototxt
index 6e583638..6e583638 100644
--- a/src/programs/imagenet_solver.prototxt
+++ b/examples/imagenet_solver.prototxt
diff --git a/src/programs/net_speed_benchmark.cpp b/examples/net_speed_benchmark.cpp
index 560c5d87..97e8223b 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
index 508dc54c..508dc54c 100644
--- a/src/programs/test_read_imagenet.cpp
+++ b/examples/test_read_imagenet.cpp
diff --git a/src/programs/train_net.cpp b/examples/train_net.cpp
index 15f43151..ec88b6f5 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
index f31d3b0f..f31d3b0f 100644
--- a/src/caffe/blob.hpp
+++ b/include/caffe/blob.hpp
diff --git a/src/caffe/caffe.hpp b/include/caffe/caffe.hpp
index 5806bc02..5806bc02 100644
--- a/src/caffe/caffe.hpp
+++ b/include/caffe/caffe.hpp
diff --git a/src/caffe/common.hpp b/include/caffe/common.hpp
index cc6e31b7..cc6e31b7 100644
--- a/src/caffe/common.hpp
+++ b/include/caffe/common.hpp
diff --git a/src/caffe/filler.hpp b/include/caffe/filler.hpp
index effe62ff..effe62ff 100644
--- a/src/caffe/filler.hpp
+++ b/include/caffe/filler.hpp
diff --git a/src/caffe/layer.hpp b/include/caffe/layer.hpp
index adc63657..adc63657 100644
--- a/src/caffe/layer.hpp
+++ b/include/caffe/layer.hpp
diff --git a/src/caffe/net.hpp b/include/caffe/net.hpp
index c27442b8..c27442b8 100644
--- a/src/caffe/net.hpp
+++ b/include/caffe/net.hpp
diff --git a/src/caffe/optimization/solver.hpp b/include/caffe/solver.hpp
index 98c872dc..98c872dc 100644
--- a/src/caffe/optimization/solver.hpp
+++ b/include/caffe/solver.hpp
diff --git a/src/caffe/syncedmem.hpp b/include/caffe/syncedmem.hpp
index 862512f9..862512f9 100644
--- a/src/caffe/syncedmem.hpp
+++ b/include/caffe/syncedmem.hpp
diff --git a/src/caffe/util/im2col.hpp b/include/caffe/util/im2col.hpp
index 83c01dda..83c01dda 100644
--- a/src/caffe/util/im2col.hpp
+++ b/include/caffe/util/im2col.hpp
diff --git a/src/caffe/util/io.hpp b/include/caffe/util/io.hpp
index 0dce4e7e..0dce4e7e 100644
--- a/src/caffe/util/io.hpp
+++ b/include/caffe/util/io.hpp
diff --git a/src/caffe/util/math_functions.hpp b/include/caffe/util/math_functions.hpp
index e9e2db8f..e9e2db8f 100644
--- a/src/caffe/util/math_functions.hpp
+++ b/include/caffe/util/math_functions.hpp
diff --git a/src/caffe/vision_layers.hpp b/include/caffe/vision_layers.hpp
index 0dc34763..0dc34763 100644
--- a/src/caffe/vision_layers.hpp
+++ b/include/caffe/vision_layers.hpp
diff --git a/src/caffe/optimization/solver.cpp b/src/caffe/solver.cpp
index 0c68330e..425bd421 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 8fd504b0..00000000
--- a/src/caffe/test/test_solver_linear_regression.cpp
+++ /dev/null
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 20:31:53 +0000