summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--decoder/ff_wordset.h6
-rw-r--r--environment/LocalConfig.pm3
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;
}
}