diff options
| author | Patrick Simianer <p@simianer.de> | 2011-11-29 21:39:02 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2011-11-29 21:39:02 +0100 |
| commit | af34238d6a18152f3d543422277bdd111d84e211 (patch) | |
| tree | d3afad1a828e812841ae9d90a9a5daef9c90b6a1 | |
| parent | 7d317d2af4e035dcf5c2168294731337231ed6a2 (diff) | |
| parent | 7fc75dc9107203f1e51ab313d647fbbb1624d5a8 (diff) | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | decoder/ff_wordset.h | 6 | ||||
| -rw-r--r-- | environment/LocalConfig.pm | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/decoder/ff_wordset.h b/decoder/ff_wordset.h index 643097ef..7c9a3fb7 100644 --- a/decoder/ff_wordset.h +++ b/decoder/ff_wordset.h @@ -3,7 +3,7 @@ #include "ff.h" -#include <boost/unordered/unordered_set.hpp> +#include <tr1/unordered_set> #include <boost/algorithm/string.hpp> #include <vector> @@ -43,7 +43,7 @@ class WordSet : public FeatureFunction { void* context) const; private: - static void loadVocab(const std::string& vocabFile, boost::unordered_set<WordID>* vocab) { + static void loadVocab(const std::string& vocabFile, std::tr1::unordered_set<WordID>* vocab) { std::ifstream file; std::string line; @@ -105,7 +105,7 @@ class WordSet : public FeatureFunction { int fid_; bool oovMode_; - boost::unordered_set<WordID> vocab_; + std::tr1::unordered_set<WordID> vocab_; }; #endif diff --git a/environment/LocalConfig.pm b/environment/LocalConfig.pm index a8cbeffb..ecabe75d 100644 --- a/environment/LocalConfig.pm +++ b/environment/LocalConfig.pm @@ -31,7 +31,7 @@ my $CCONFIG = { 'JobControl' => 'qsub', 'QSubMemFlag' => '-l pmem=', 'QSubQueue' => '-q batch', - 'QSubExtraFlags' => '-l walltime=144:00:00', + 'QSubExtraFlags' => '-V -l walltime=144:00:00', 'DefaultJobs' => 15, }, 'CLSP' => { @@ -75,6 +75,7 @@ for my $config_key (keys %$CCONFIG) { die "Can't find HOST_REGEXP for $config_key" unless $re; if ($host =~ /$re/) { $senvironment_name = $config_key; + last; } } |