diff options
| author | Paul Baltescu <pauldb89@gmail.com> | 2013-11-23 17:33:47 +0000 |
|---|---|---|
| committer | Paul Baltescu <pauldb89@gmail.com> | 2013-11-23 17:33:47 +0000 |
| commit | cc6313b23cac25eb05976b6cf64f96faf1ed4163 (patch) | |
| tree | 3dc28060ad25b43773e875bea7388ab1cefcd927 /training/crf/mpi_online_optimize.cc | |
| parent | 7990c750829af93f0a1e0fc14534582f52ee9e8c (diff) | |
| parent | f2fb69b10a897e8beb4e6e6d6cbb4327096235ef (diff) | |
Merge branch 'master' of https://github.com/redpony/cdec
Diffstat (limited to 'training/crf/mpi_online_optimize.cc')
| -rw-r--r-- | training/crf/mpi_online_optimize.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/training/crf/mpi_online_optimize.cc b/training/crf/mpi_online_optimize.cc index 9e1ae34c..6b5b7d64 100644 --- a/training/crf/mpi_online_optimize.cc +++ b/training/crf/mpi_online_optimize.cc @@ -4,11 +4,11 @@ #include <vector> #include <cassert> #include <cmath> -#include <tr1/memory> #include <ctime> #include <boost/program_options.hpp> #include <boost/program_options/variables_map.hpp> +#include <boost/shared_ptr.hpp> #include "stringlib.h" #include "verbose.h" @@ -219,7 +219,7 @@ int main(int argc, char** argv) { #endif if (size > 1) SetSilent(true); // turn off verbose decoder output register_feature_functions(); - std::tr1::shared_ptr<MT19937> rng; + boost::shared_ptr<MT19937> rng; po::variables_map conf; if (!InitCommandLine(argc, argv, &conf)) @@ -264,8 +264,8 @@ int main(int argc, char** argv) { ReadTrainingCorpus(conf["training_data"].as<string>(), rank, size, &corpus, &ids); assert(corpus.size() > 0); - std::tr1::shared_ptr<OnlineOptimizer> o; - std::tr1::shared_ptr<LearningRateSchedule> lr; + boost::shared_ptr<OnlineOptimizer> o; + boost::shared_ptr<LearningRateSchedule> lr; const unsigned size_per_proc = conf["minibatch_size_per_proc"].as<unsigned>(); if (size_per_proc > corpus.size()) { |