From b1628d8bedb8a4145c77ed5917999379fc99a5d5 Mon Sep 17 00:00:00 2001
From: Chris Dyer <redpony@gmail.com>
Date: Wed, 15 Jan 2014 20:33:02 -0500
Subject: maybe better randomization to prevent port conflicts on big machines?

---
 training/utils/parallelize.pl | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'training')

diff --git a/training/utils/parallelize.pl b/training/utils/parallelize.pl
index 4197e0e5..c9ab88ce 100755
--- a/training/utils/parallelize.pl
+++ b/training/utils/parallelize.pl
@@ -45,11 +45,22 @@ my $numnodes = 8;
 my $user = $ENV{"USER"};
 my $pmem = "9g";
 my $basep=50300;
-my $randp=300;
 my $tryp=50;
 my $no_which;
 my $no_cd;
 
+if (-r '/dev/urandom') {
+  open(RR,'</dev/urandom') or die "Failed to read /dev/urandom: $!";
+  my $buffer;
+  die "Failed to read 4 bytes of entropy" unless read(RR,$buffer,4) == 4;
+  close RR;
+  my ($val) = unpack 'L1', $buffer;
+  srand($val);
+} else {
+  srand();
+}
+my $randp=4000;
+
 my $DEBUG=$ENV{DEBUG};
 print STDERR "DEBUG=$DEBUG output enabled.\n" if $DEBUG;
 my $verbose = 1;
@@ -206,8 +217,7 @@ chomp $host;
 
 
 # find open port
-srand;
-my $port = 50300+int(rand($randp));
+my $port = $basep+int(rand($randp));
 my $endp=$port+$tryp;
 sub listening_port_lines {
     my $quiet=$verbose?'':'2>/dev/null';
-- 
cgit v1.2.3


From ff248364f8385ec2b60a7e7bfbab260c2695116d Mon Sep 17 00:00:00 2001
From: Chris Dyer <redpony@gmail.com>
Date: Mon, 20 Jan 2014 20:25:00 -0500
Subject: update date, copyright

---
 configure.ac                  |  2 +-
 decoder/decoder.cc            |  2 +-
 extractor/Makefile.am         | 36 +++++++++++++++++++++++++++++++++++-
 training/liblbfgs/Makefile.am |  7 +++----
 4 files changed, 40 insertions(+), 7 deletions(-)

(limited to 'training')

diff --git a/configure.ac b/configure.ac
index d5261b8e..e5d2dadb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_CONFIG_MACRO_DIR([m4])
-AC_INIT([cdec],[2014-01-19])
+AC_INIT([cdec],[2014-01-20])
 AC_CONFIG_SRCDIR([decoder/cdec.cc])
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS(config.h)
diff --git a/decoder/decoder.cc b/decoder/decoder.cc
index 5bb62710..e02c7730 100644
--- a/decoder/decoder.cc
+++ b/decoder/decoder.cc
@@ -86,7 +86,7 @@ struct ELengthWeightFunction {
   }
 };
 inline void ShowBanner() {
-  cerr << "cdec (c) 2009--2013 by Chris Dyer\n";
+  cerr << "cdec (c) 2009--2014 by Chris Dyer\n";
 }
 
 inline string str(char const* name,po::variables_map const& conf) {
diff --git a/extractor/Makefile.am b/extractor/Makefile.am
index 40112e5e..a4ffac11 100644
--- a/extractor/Makefile.am
+++ b/extractor/Makefile.am
@@ -132,6 +132,14 @@ libextractor_a_SOURCES = \
   features/max_lex_target_given_source.cc \
   features/sample_source_count.cc \
   features/target_given_source_coherent.cc \
+  features/count_source_target.h \
+  features/feature.h \
+  features/is_source_singleton.h \
+  features/is_source_target_singleton.h \
+  features/max_lex_source_given_target.h \
+  features/max_lex_target_given_source.h \
+  features/sample_source_count.h \
+  features/target_given_source_coherent.h \
   grammar.cc \
   grammar_extractor.cc \
   matchings_finder.cc \
@@ -152,7 +160,33 @@ libextractor_a_SOURCES = \
   target_phrase_extractor.cc \
   time_util.cc \
   translation_table.cc \
-  vocabulary.cc
+  vocabulary.cc \
+  alignment.h \
+  backoff_sampler.h \
+  data_array.h \
+  fast_intersector.h \
+  grammar.h \
+  grammar_extractor.h \
+  matchings_finder.h \
+  matchings_sampler.h \
+  matchings_trie.h \
+  phrase.h \
+  phrase_builder.h \
+  phrase_location.h \
+  phrase_location_sampler.h \
+  precomputation.h \
+  rule.h \
+  rule_extractor.h \
+  rule_extractor_helper.h \
+  rule_factory.h \
+  sampler.h \
+  scorer.h \
+  suffix_array.h \
+  suffix_array_sampler.h \
+  target_phrase_extractor.h \
+  time_util.h \
+  translation_table.h \
+  vocabulary.h
 
 AM_CPPFLAGS = -W -Wall -Wno-sign-compare -fopenmp $(GTEST_CPPFLAGS) $(GMOCK_CPPFLAGS)
 AM_LDFLAGS = -fopenmp
diff --git a/training/liblbfgs/Makefile.am b/training/liblbfgs/Makefile.am
index 272d6f56..aa3af377 100644
--- a/training/liblbfgs/Makefile.am
+++ b/training/liblbfgs/Makefile.am
@@ -1,10 +1,9 @@
-TESTS = ll_test
-noinst_PROGRAMS = ll_test
+noinst_LIBRARIES = liblbfgs.a
 
+noinst_PROGRAMS = ll_test
 ll_test_SOURCES = ll_test.cc
 ll_test_LDADD = liblbfgs.a -lz
-
-noinst_LIBRARIES = liblbfgs.a
+TESTS = ll_test
 
 liblbfgs_a_SOURCES = \
   lbfgs.c \
-- 
cgit v1.2.3