diff options
author | Yangqing Jia <jiayq84@gmail.com> | 2013-11-21 11:16:08 -0800 |
---|---|---|
committer | Yangqing Jia <jiayq84@gmail.com> | 2013-11-21 11:18:34 -0800 |
commit | 04f5224cc2993d76d5a998304cb68cf3ba8561f6 (patch) | |
tree | ebef9b4b963144197086ba4ec933fc7d414223fa | |
parent | 3385a1452aba741fbb052333e9565fde5ea65c72 (diff) | |
download | caffeonacl-04f5224cc2993d76d5a998304cb68cf3ba8561f6.tar.gz caffeonacl-04f5224cc2993d76d5a998304cb68cf3ba8561f6.tar.bz2 caffeonacl-04f5224cc2993d76d5a998304cb68cf3ba8561f6.zip |
remove remaining distributed solver stuff
-rw-r--r-- | examples/dist_train_server.cpp | 46 | ||||
-rw-r--r-- | include/caffe/caffe.hpp | 1 |
2 files changed, 0 insertions, 47 deletions
diff --git a/examples/dist_train_server.cpp b/examples/dist_train_server.cpp deleted file mode 100644 index e5ae41e8..00000000 --- a/examples/dist_train_server.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2013 Yangqing Jia -// -// This is a simple script that allows one to quickly train a network whose -// parameters are specified by text format protocol buffers. -// Usage: -// train_net net_proto_file solver_proto_file [resume_point_file] - -#include <cuda_runtime.h> - -#include <cstring> - -#include "caffe/caffe.hpp" - -using namespace caffe; - -int main(int argc, char** argv) { - ::google::InitGoogleLogging(argv[0]); - if (argc < 3) { - LOG(ERROR) << "Usage: dist_train_server solver_proto_file (server|client) [resume_point_file]"; - return 0; - } - - //Caffe::SetDevice(0); - Caffe::set_mode(Caffe::CPU); - - SolverParameter solver_param; - ReadProtoFromTextFile(argv[1], &solver_param); - - LOG(INFO) << "Starting Optimization"; - shared_ptr<Solver<float> > solver; - if (strcmp(argv[2], "server") == 0) { - solver.reset(new DistributedSolverParamServer<float>(solver_param)); - } else if (strcmp(argv[2], "client") == 0) { - solver.reset(new DistributedSolverParamClient<float>(solver_param)); - } - - if (argc == 4) { - LOG(INFO) << "Resuming from " << argv[2]; - solver->Solve(argv[2]); - } else { - solver->Solve(); - } - LOG(INFO) << "Optimization Done."; - - return 0; -} diff --git a/include/caffe/caffe.hpp b/include/caffe/caffe.hpp index 6ce38aa5..6557dfd0 100644 --- a/include/caffe/caffe.hpp +++ b/include/caffe/caffe.hpp @@ -11,7 +11,6 @@ #include "caffe/layer.hpp" #include "caffe/net.hpp" #include "caffe/solver.hpp" -#include "caffe/distributed_solver.hpp" #include "caffe/util/io.hpp" #include "caffe/vision_layers.hpp" |