From 9aa075c79122709d8d5b8adf8c91ebd348eac658 Mon Sep 17 00:00:00 2001 From: Patrick Simianer Date: Wed, 25 Mar 2015 15:23:41 +0100 Subject: updated network_decoder --- decoder/Makefile.am | 6 +++--- decoder/feed.cc | 53 ++++++++++++++++++++++++++++++++++++++++++++++ decoder/feed.rb | 21 ++++++++++++++++++ decoder/local.cc | 51 -------------------------------------------- decoder/network_decoder.cc | 12 +++++++---- 5 files changed, 85 insertions(+), 58 deletions(-) create mode 100644 decoder/feed.cc create mode 100755 decoder/feed.rb delete mode 100644 decoder/local.cc (limited to 'decoder') diff --git a/decoder/Makefile.am b/decoder/Makefile.am index 563ca0b9..dcc518bc 100644 --- a/decoder/Makefile.am +++ b/decoder/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = cdec minimal_decoder network_decoder local +bin_PROGRAMS = cdec minimal_decoder network_decoder feed noinst_PROGRAMS = \ trule_test \ @@ -29,8 +29,8 @@ minimal_decoder_LDADD = libcdec.a ../utils/libutils.a network_decoder_SOURCES = network_decoder.cc nn.hpp network_decoder_LDADD = libcdec.a ../klm/search/libksearch.a ../mteval/libmteval.a ../utils/libutils.a ../klm/lm/libklm.a ../klm/util/libklm_util.a ../klm/util/double-conversion/libklm_util_double.a /usr/lib64/libnanomsg.so -local_SOURCES = local.cc nn.hpp -local_LDADD = /usr/lib64/libnanomsg.so +feed_SOURCES = feed.cc nn.hpp +feed_LDADD = /usr/lib64/libnanomsg.so AM_CPPFLAGS = -DTEST_DATA=\"$(top_srcdir)/decoder/test_data\" -DBOOST_TEST_DYN_LINK -W -Wno-sign-compare -I$(top_srcdir) -I$(top_srcdir)/mteval -I$(top_srcdir)/utils -I$(top_srcdir)/klm diff --git a/decoder/feed.cc b/decoder/feed.cc new file mode 100644 index 00000000..477d6599 --- /dev/null +++ b/decoder/feed.cc @@ -0,0 +1,53 @@ +#include +#include +#include +#include +#include + +#include +#include +#include "nn.hpp" + +using namespace std; + +void +recv(nn::socket& sock) +{ + char *buf = NULL; + size_t sz = sock.recv(&buf, NN_MSG, 0); + if (buf) { + string translation(buf, buf+sz); + cout << "received translation '" << translation << "'" << endl; + } +} + +void +send(nn::socket& sock, const string& msg) +{ + cout << "sending source '" << msg << "'" << endl; + sock.send(msg.c_str(), msg.size()+1, 0); +} + +void +loop(nn::socket& sock) +{ + int to = 100; + sock.setsockopt(NN_SOL_SOCKET, NN_RCVTIMEO, &to, sizeof(to)); + for (string line; getline(cin, line);) { + send(sock, line); + sleep(1); + recv(sock); + } +} + +int main(int argc, char const* argv[]) +{ + nn::socket sock(AF_SP, NN_PAIR); + //string url = "ipc:///tmp/network_decoder.ipc"; + string url = "tcp://127.0.0.1:60666"; + sock.connect(url.c_str()); + loop(sock); + + return 0; +} + diff --git a/decoder/feed.rb b/decoder/feed.rb new file mode 100755 index 00000000..c835536c --- /dev/null +++ b/decoder/feed.rb @@ -0,0 +1,21 @@ +#!/usr/bin/env ruby + +require 'nanomsg' + +port = 60666 +sock = NanoMsg::PairSocket.new +addr = "tcp://127.0.0.1:#{port}" +#addr = "ipc:///tmp/network_decoder.ipc" +sock.connect addr + +while true + line = STDIN.gets + if !line + sock.send 'shutdown' + break + end + sock.send line.strip + sleep 1 + puts "got translation: #{sock.recv}\n\n" +end + diff --git a/decoder/local.cc b/decoder/local.cc deleted file mode 100644 index b03fd17e..00000000 --- a/decoder/local.cc +++ /dev/null @@ -1,51 +0,0 @@ -#include -#include -#include -#include - -#include -#include -#include "nn.hpp" - -using namespace std; - -void -recv(nn::socket& sock) -{ - char *buf = NULL; - sock.recv(&buf, NN_MSG, 0); - if (buf) { - string translation(buf); - cout << "received translation '" << translation << "'" << endl; - } -} - -void -send(nn::socket& sock, const string& msg) -{ - cout << "sending source '" << msg << "'" << endl; - sock.send(msg.c_str(), msg.size()+1, 0); -} - -void -loop(nn::socket& sock) -{ - int to = 100; - sock.setsockopt(NN_SOL_SOCKET, NN_RCVTIMEO, &to, sizeof(to)); - while(1) { - send(sock, "das ist ein test ."); - sleep(1); - recv(sock); - } -} - -int main(int argc, char const* argv[]) -{ - nn::socket sock(AF_SP, NN_PAIR); - string url = "ipc:///tmp/network_decoder.ipc"; - sock.connect(url.c_str()); - loop(sock); - - return 0; -} - diff --git a/decoder/network_decoder.cc b/decoder/network_decoder.cc index aaa1842d..ebbb91b5 100644 --- a/decoder/network_decoder.cc +++ b/decoder/network_decoder.cc @@ -28,7 +28,7 @@ struct TheObserver : public DecoderObserver int send(nn::socket& sock, const string trans) { - cout << "sending translation '" << trans << "'" << endl; + cout << "sending translation '" << trans << "'" << endl << endl; sock.send(trans.c_str(), trans.size()+1, 0); } @@ -36,10 +36,11 @@ bool recv(nn::socket& sock, string& source) { char *buf = NULL; - sock.recv(&buf, NN_MSG, 0); + size_t sz = sock.recv(&buf, NN_MSG, 0); if (buf) { - string s(buf); + string s(buf, buf+sz); source = s; + nn::freemsg(buf); return true; } @@ -62,6 +63,8 @@ loop(Decoder& decoder, nn::socket& sock) cout << "received source '" << source << "'" << endl; decoder.Decode(source, &o); send(sock, o.translation); + } else { + // Oh no! } } } @@ -75,7 +78,8 @@ main(int argc, char** argv) SetSilent(true); nn::socket sock(AF_SP, NN_PAIR); - string url = "ipc:///tmp/network_decoder.ipc"; + //string url = "ipc:///tmp/network_decoder.ipc"; + string url = "tcp://127.0.0.1:60666"; sock.bind(url.c_str()); loop(decoder, sock); -- cgit v1.2.3 From ce920c84348050d2bd2861c1ce4e645a8690afc1 Mon Sep 17 00:00:00 2001 From: Patrick Simianer Date: Wed, 25 Mar 2015 15:39:29 +0100 Subject: unified feed.rb feed.cc, README --- decoder/README.net | 8 ++++++++ decoder/feed.cc | 2 +- decoder/feed.rb | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 decoder/README.net (limited to 'decoder') diff --git a/decoder/README.net b/decoder/README.net new file mode 100644 index 00000000..05bb66d8 --- /dev/null +++ b/decoder/README.net @@ -0,0 +1,8 @@ +to run the server do +cd ../training/dtrain/examples/standard/ +../../../../decoder/network_decoder cdec.ini + +to run the 'feeder' do +cd ../training/dtrain/examples/standard/ +zcat nc-wmt11.100.gz | ../../../../decoder/feed.rb + diff --git a/decoder/feed.cc b/decoder/feed.cc index 477d6599..f8923fc4 100644 --- a/decoder/feed.cc +++ b/decoder/feed.cc @@ -17,7 +17,7 @@ recv(nn::socket& sock) size_t sz = sock.recv(&buf, NN_MSG, 0); if (buf) { string translation(buf, buf+sz); - cout << "received translation '" << translation << "'" << endl; + cout << "got translation '" << translation << "'" << endl << endl; } } diff --git a/decoder/feed.rb b/decoder/feed.rb index c835536c..5ea9737d 100755 --- a/decoder/feed.rb +++ b/decoder/feed.rb @@ -14,6 +14,7 @@ while true sock.send 'shutdown' break end + puts "sending source '#{line.strip}'" sock.send line.strip sleep 1 puts "got translation: #{sock.recv}\n\n" -- cgit v1.2.3 From af1af342b5c3faf1d5e290c6b623b6287fa8c2b0 Mon Sep 17 00:00:00 2001 From: Patrick Simianer Date: Wed, 13 May 2015 18:07:17 +0200 Subject: remove obsolete stuff --- decoder/Makefile.am | 7 +- decoder/feed.cc | 53 -------------- decoder/feed.rb | 22 ------ decoder/nn.hpp | 204 ---------------------------------------------------- 4 files changed, 2 insertions(+), 284 deletions(-) delete mode 100644 decoder/feed.cc delete mode 100755 decoder/feed.rb delete mode 100644 decoder/nn.hpp (limited to 'decoder') diff --git a/decoder/Makefile.am b/decoder/Makefile.am index dcc518bc..8398411e 100644 --- a/decoder/Makefile.am +++ b/decoder/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = cdec minimal_decoder network_decoder feed +bin_PROGRAMS = cdec minimal_decoder network_decoder noinst_PROGRAMS = \ trule_test \ @@ -29,10 +29,7 @@ minimal_decoder_LDADD = libcdec.a ../utils/libutils.a network_decoder_SOURCES = network_decoder.cc nn.hpp network_decoder_LDADD = libcdec.a ../klm/search/libksearch.a ../mteval/libmteval.a ../utils/libutils.a ../klm/lm/libklm.a ../klm/util/libklm_util.a ../klm/util/double-conversion/libklm_util_double.a /usr/lib64/libnanomsg.so -feed_SOURCES = feed.cc nn.hpp -feed_LDADD = /usr/lib64/libnanomsg.so - -AM_CPPFLAGS = -DTEST_DATA=\"$(top_srcdir)/decoder/test_data\" -DBOOST_TEST_DYN_LINK -W -Wno-sign-compare -I$(top_srcdir) -I$(top_srcdir)/mteval -I$(top_srcdir)/utils -I$(top_srcdir)/klm +AM_CPPFLAGS = -DTEST_DATA=\"$(top_srcdir)/decoder/test_data\" -DBOOST_TEST_DYN_LINK -W -Wno-sign-compare -I$(top_srcdir) -I$(top_srcdir)/mteval -I$(top_srcdir)/utils -I$(top_srcdir)/klm -I/fast_scratch/simianer/lfpe/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/cppnanomsg rule_lexer.cc: rule_lexer.ll $(LEX) -s -CF -8 -o$@ $< diff --git a/decoder/feed.cc b/decoder/feed.cc deleted file mode 100644 index f8923fc4..00000000 --- a/decoder/feed.cc +++ /dev/null @@ -1,53 +0,0 @@ -#include -#include -#include -#include -#include - -#include -#include -#include "nn.hpp" - -using namespace std; - -void -recv(nn::socket& sock) -{ - char *buf = NULL; - size_t sz = sock.recv(&buf, NN_MSG, 0); - if (buf) { - string translation(buf, buf+sz); - cout << "got translation '" << translation << "'" << endl << endl; - } -} - -void -send(nn::socket& sock, const string& msg) -{ - cout << "sending source '" << msg << "'" << endl; - sock.send(msg.c_str(), msg.size()+1, 0); -} - -void -loop(nn::socket& sock) -{ - int to = 100; - sock.setsockopt(NN_SOL_SOCKET, NN_RCVTIMEO, &to, sizeof(to)); - for (string line; getline(cin, line);) { - send(sock, line); - sleep(1); - recv(sock); - } -} - -int main(int argc, char const* argv[]) -{ - nn::socket sock(AF_SP, NN_PAIR); - //string url = "ipc:///tmp/network_decoder.ipc"; - string url = "tcp://127.0.0.1:60666"; - sock.connect(url.c_str()); - loop(sock); - - return 0; -} - diff --git a/decoder/feed.rb b/decoder/feed.rb deleted file mode 100755 index 5ea9737d..00000000 --- a/decoder/feed.rb +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env ruby - -require 'nanomsg' - -port = 60666 -sock = NanoMsg::PairSocket.new -addr = "tcp://127.0.0.1:#{port}" -#addr = "ipc:///tmp/network_decoder.ipc" -sock.connect addr - -while true - line = STDIN.gets - if !line - sock.send 'shutdown' - break - end - puts "sending source '#{line.strip}'" - sock.send line.strip - sleep 1 - puts "got translation: #{sock.recv}\n\n" -end - diff --git a/decoder/nn.hpp b/decoder/nn.hpp deleted file mode 100644 index 50b8304c..00000000 --- a/decoder/nn.hpp +++ /dev/null @@ -1,204 +0,0 @@ -/* - Copyright (c) 2013 250bpm s.r.o. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom - the Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - IN THE SOFTWARE. -*/ - -#ifndef NN_HPP_INCLUDED -#define NN_HPP_INCLUDED - -#include - -#include -#include -#include -#include - -#if defined __GNUC__ -#define nn_slow(x) __builtin_expect ((x), 0) -#else -#define nn_slow(x) (x) -#endif - -namespace nn -{ - - class exception : public std::exception - { - public: - - exception () : err (nn_errno ()) {} - - virtual const char *what () const throw () - { - return nn_strerror (err); - } - - int num () const - { - return err; - } - - private: - - int err; - }; - - inline const char *symbol (int i, int *value) - { - return nn_symbol (i, value); - } - - inline void *allocmsg (size_t size, int type) - { - void *msg = nn_allocmsg (size, type); - if (nn_slow (!msg)) - throw nn::exception (); - return msg; - } - - inline int freemsg (void *msg) - { - int rc = nn_freemsg (msg); - if (nn_slow (rc != 0)) - throw nn::exception (); - return rc; - } - - class socket - { - public: - - inline socket (int domain, int protocol) - { - s = nn_socket (domain, protocol); - if (nn_slow (s < 0)) - throw nn::exception (); - } - - inline ~socket () - { - int rc = nn_close (s); - assert (rc == 0); - } - - inline void setsockopt (int level, int option, const void *optval, - size_t optvallen) - { - int rc = nn_setsockopt (s, level, option, optval, optvallen); - if (nn_slow (rc != 0)) - throw nn::exception (); - } - - inline void getsockopt (int level, int option, void *optval, - size_t *optvallen) - { - int rc = nn_getsockopt (s, level, option, optval, optvallen); - if (nn_slow (rc != 0)) - throw nn::exception (); - } - - inline int bind (const char *addr) - { - int rc = nn_bind (s, addr); - if (nn_slow (rc < 0)) - throw nn::exception (); - return rc; - } - - inline int connect (const char *addr) - { - int rc = nn_connect (s, addr); - if (nn_slow (rc < 0)) - throw nn::exception (); - return rc; - } - - inline void shutdown (int how) - { - int rc = nn_shutdown (s, how); - if (nn_slow (rc != 0)) - throw nn::exception (); - } - - inline int send (const void *buf, size_t len, int flags) - { - int rc = nn_send (s, buf, len, flags); - if (nn_slow (rc < 0)) { - if (nn_slow (nn_errno () != EAGAIN)) - throw nn::exception (); - return -1; - } - return rc; - } - - inline int recv (void *buf, size_t len, int flags) - { - int rc = nn_recv (s, buf, len, flags); - if (nn_slow (rc < 0)) { - if (nn_slow (nn_errno () != EAGAIN)) - throw nn::exception (); - return -1; - } - return rc; - } - - inline int sendmsg (const struct nn_msghdr *msghdr, int flags) - { - int rc = nn_sendmsg (s, msghdr, flags); - if (nn_slow (rc < 0)) { - if (nn_slow (nn_errno () != EAGAIN)) - throw nn::exception (); - return -1; - } - return rc; - } - - inline int recvmsg (struct nn_msghdr *msghdr, int flags) - { - int rc = nn_recvmsg (s, msghdr, flags); - if (nn_slow (rc < 0)) { - if (nn_slow (nn_errno () != EAGAIN)) - throw nn::exception (); - return -1; - } - return rc; - } - - private: - - int s; - - /* Prevent making copies of the socket by accident. */ - socket (const socket&); - void operator = (const socket&); - }; - - inline void term () - { - nn_term (); - } - -} - -#undef nn_slow - -#endif - - -- cgit v1.2.3 From 308d6472f1fba1acbfb15895b3b5c3926a59d949 Mon Sep 17 00:00:00 2001 From: Patrick Simianer Date: Wed, 10 Jun 2015 12:37:08 +0200 Subject: fix Makefile --- decoder/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'decoder') diff --git a/decoder/Makefile.am b/decoder/Makefile.am index 8398411e..1130cea7 100644 --- a/decoder/Makefile.am +++ b/decoder/Makefile.am @@ -27,7 +27,7 @@ minimal_decoder_SOURCES = minimal_decoder.cc minimal_decoder_LDADD = libcdec.a ../utils/libutils.a network_decoder_SOURCES = network_decoder.cc nn.hpp -network_decoder_LDADD = libcdec.a ../klm/search/libksearch.a ../mteval/libmteval.a ../utils/libutils.a ../klm/lm/libklm.a ../klm/util/libklm_util.a ../klm/util/double-conversion/libklm_util_double.a /usr/lib64/libnanomsg.so +network_decoder_LDADD = libcdec.a ../klm/search/libksearch.a ../mteval/libmteval.a ../utils/libutils.a ../klm/lm/libklm.a ../klm/util/libklm_util.a ../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/nanomsg-0.5-beta/lib/libnanomsg.so AM_CPPFLAGS = -DTEST_DATA=\"$(top_srcdir)/decoder/test_data\" -DBOOST_TEST_DYN_LINK -W -Wno-sign-compare -I$(top_srcdir) -I$(top_srcdir)/mteval -I$(top_srcdir)/utils -I$(top_srcdir)/klm -I/fast_scratch/simianer/lfpe/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/cppnanomsg -- cgit v1.2.3 From 68e76d09d2f5828b2955594d0e0cddc7b2517feb Mon Sep 17 00:00:00 2001 From: Patrick Simianer Date: Thu, 25 Jun 2015 16:21:42 +0200 Subject: fix Makefiles --- decoder/Makefile.am | 4 ++-- training/dtrain/Makefile.am | 6 +++--- utils/Makefile.am | 4 ++-- word-aligner/Makefile.am | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'decoder') diff --git a/decoder/Makefile.am b/decoder/Makefile.am index 1130cea7..0b06bff9 100644 --- a/decoder/Makefile.am +++ b/decoder/Makefile.am @@ -27,9 +27,9 @@ minimal_decoder_SOURCES = minimal_decoder.cc minimal_decoder_LDADD = libcdec.a ../utils/libutils.a network_decoder_SOURCES = network_decoder.cc nn.hpp -network_decoder_LDADD = libcdec.a ../klm/search/libksearch.a ../mteval/libmteval.a ../utils/libutils.a ../klm/lm/libklm.a ../klm/util/libklm_util.a ../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/nanomsg-0.5-beta/lib/libnanomsg.so +network_decoder_LDADD = libcdec.a ../klm/search/libksearch.a ../mteval/libmteval.a ../utils/libutils.a ../klm/lm/libklm.a ../klm/util/libklm_util.a ../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/lib/libnanomsg.so -AM_CPPFLAGS = -DTEST_DATA=\"$(top_srcdir)/decoder/test_data\" -DBOOST_TEST_DYN_LINK -W -Wno-sign-compare -I$(top_srcdir) -I$(top_srcdir)/mteval -I$(top_srcdir)/utils -I$(top_srcdir)/klm -I/fast_scratch/simianer/lfpe/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/cppnanomsg +AM_CPPFLAGS = -DTEST_DATA=\"$(top_srcdir)/decoder/test_data\" -DBOOST_TEST_DYN_LINK -W -Wno-sign-compare -I$(top_srcdir) -I$(top_srcdir)/mteval -I$(top_srcdir)/utils -I$(top_srcdir)/klm -I/fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/lib/cppnanomsg rule_lexer.cc: rule_lexer.ll $(LEX) -s -CF -8 -o$@ $< diff --git a/training/dtrain/Makefile.am b/training/dtrain/Makefile.am index a0b5545b..fcc2b218 100644 --- a/training/dtrain/Makefile.am +++ b/training/dtrain/Makefile.am @@ -4,10 +4,10 @@ dtrain_SOURCES = dtrain.cc dtrain.h sample.h score.h update.h dtrain_LDADD = ../../decoder/libcdec.a ../../klm/search/libksearch.a ../../mteval/libmteval.a ../../utils/libutils.a ../../klm/lm/libklm.a ../../klm/util/libklm_util.a ../../klm/util/double-conversion/libklm_util_double.a dtrain_net_SOURCES = dtrain_net.cc dtrain_net.h dtrain.h sample.h score.h update.h -dtrain_net_LDADD = ../../decoder/libcdec.a ../../klm/search/libksearch.a ../../mteval/libmteval.a ../../utils/libutils.a ../../klm/lm/libklm.a ../../klm/util/libklm_util.a ../../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/nanomsg-0.5-beta/lib/libnanomsg.so +dtrain_net_LDADD = ../../decoder/libcdec.a ../../klm/search/libksearch.a ../../mteval/libmteval.a ../../utils/libutils.a ../../klm/lm/libklm.a ../../klm/util/libklm_util.a ../../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/lib/libnanomsg.so dtrain_net_interface_SOURCES = dtrain_net_interface.cc dtrain_net_interface.h dtrain.h sample_net_interface.h score_net_interface.h update.h -dtrain_net_interface_LDADD = ../../decoder/libcdec.a ../../klm/search/libksearch.a ../../mteval/libmteval.a ../../utils/libutils.a ../../klm/lm/libklm.a ../../klm/util/libklm_util.a ../../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/nanomsg-0.5-beta/lib/libnanomsg.so +dtrain_net_interface_LDADD = ../../decoder/libcdec.a ../../klm/search/libksearch.a ../../mteval/libmteval.a ../../utils/libutils.a ../../klm/lm/libklm.a ../../klm/util/libklm_util.a ../../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/lib/libnanomsg.so -AM_CPPFLAGS = -W -Wall -Wno-sign-compare -I$(top_srcdir)/utils -I$(top_srcdir)/decoder -I$(top_srcdir)/mteval -I/fast_scratch/simianer/lfpe/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/cppnanomsg +AM_CPPFLAGS = -W -Wall -Wno-sign-compare -I$(top_srcdir)/utils -I$(top_srcdir)/decoder -I$(top_srcdir)/mteval -I/fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/lib/cppnanomsg diff --git a/utils/Makefile.am b/utils/Makefile.am index f057ddbe..f6bf3131 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -100,7 +100,7 @@ atools_LDFLAGS = $(STATIC_FLAGS) atools_net_SOURCES = atools_net.cc nn.hpp atools_net_LDADD = libutils.a -atools_net_LDFLAGS = $(STATIC_FLAGS) /fast_scratch/simianer/lfpe/nanomsg-0.5-beta/lib/libnanomsg.so +atools_net_LDFLAGS = $(STATIC_FLAGS) /fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/lib/libnanomsg.so dedup_corpus_SOURCES = dedup_corpus.cc dedup_corpus_LDADD = libutils.a @@ -127,5 +127,5 @@ stringlib_test_LDADD = libutils.a $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_U ################################################################ # do NOT NOT NOT add any other -I includes NO NO NO NO NO ###### -AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -W -Wall -I. -I$(top_srcdir) -DTEST_DATA=\"$(top_srcdir)/utils/test_data\" -I/fast_scratch/simianer/lfpe/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/cppnanomsg +AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -W -Wall -I. -I$(top_srcdir) -DTEST_DATA=\"$(top_srcdir)/utils/test_data\" -I/fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/lib/cppnanomsg ################################################################ diff --git a/word-aligner/Makefile.am b/word-aligner/Makefile.am index 3985d14b..cd83c10d 100644 --- a/word-aligner/Makefile.am +++ b/word-aligner/Makefile.am @@ -9,9 +9,9 @@ binderiv_LDADD = ../utils/libutils.a net_fa_SOURCES = net_fa.cc ttables.cc da.h ttables.h nn.hpp net_fa_LDADD = ../utils/libutils.a -net_fa_LDFLAGS = $(STATIC_FLAGS) /fast_scratch/simianer/lfpe/nanomsg-0.5-beta/lib/libnanomsg.so +net_fa_LDFLAGS = $(STATIC_FLAGS) /fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/lib/libnanomsg.so EXTRA_DIST = aligner.pl ortho-norm support makefiles stemmers -AM_CPPFLAGS = -W -Wall -I$(top_srcdir) -I$(top_srcdir)/utils -I$(top_srcdir)/training -I/fast_scratch/simianer/lfpe/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/cppnanomsg +AM_CPPFLAGS = -W -Wall -I$(top_srcdir) -I$(top_srcdir)/utils -I$(top_srcdir)/training -I/fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/lib/cppnanomsg -- cgit v1.2.3 From ce655a6544c56d3a70ee4f0a4d4b199a170f2e88 Mon Sep 17 00:00:00 2001 From: simianer Date: Tue, 3 May 2016 12:52:03 +0200 Subject: move --- decoder/Makefile.am | 4 ++-- training/dtrain/Makefile.am | 6 +++--- utils/Makefile.am | 4 ++-- word-aligner/Makefile.am | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'decoder') diff --git a/decoder/Makefile.am b/decoder/Makefile.am index 0b06bff9..bcdc34ed 100644 --- a/decoder/Makefile.am +++ b/decoder/Makefile.am @@ -27,9 +27,9 @@ minimal_decoder_SOURCES = minimal_decoder.cc minimal_decoder_LDADD = libcdec.a ../utils/libutils.a network_decoder_SOURCES = network_decoder.cc nn.hpp -network_decoder_LDADD = libcdec.a ../klm/search/libksearch.a ../mteval/libmteval.a ../utils/libutils.a ../klm/lm/libklm.a ../klm/util/libklm_util.a ../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/lib/libnanomsg.so +network_decoder_LDADD = libcdec.a ../klm/search/libksearch.a ../mteval/libmteval.a ../utils/libutils.a ../klm/lm/libklm.a ../klm/util/libklm_util.a ../klm/util/double-conversion/libklm_util_double.a /srv/postedit/lib/nanomsg-0.5-beta/lib/libnanomsg.so -AM_CPPFLAGS = -DTEST_DATA=\"$(top_srcdir)/decoder/test_data\" -DBOOST_TEST_DYN_LINK -W -Wno-sign-compare -I$(top_srcdir) -I$(top_srcdir)/mteval -I$(top_srcdir)/utils -I$(top_srcdir)/klm -I/fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/lib/cppnanomsg +AM_CPPFLAGS = -DTEST_DATA=\"$(top_srcdir)/decoder/test_data\" -DBOOST_TEST_DYN_LINK -W -Wno-sign-compare -I$(top_srcdir) -I$(top_srcdir)/mteval -I$(top_srcdir)/utils -I$(top_srcdir)/klm -I/srv/postedit/lib/nanomsg-0.5-beta/include -I/srv/postedit/lib/cppnanomsg rule_lexer.cc: rule_lexer.ll $(LEX) -s -CF -8 -o$@ $< diff --git a/training/dtrain/Makefile.am b/training/dtrain/Makefile.am index fcc2b218..db36d0f6 100644 --- a/training/dtrain/Makefile.am +++ b/training/dtrain/Makefile.am @@ -4,10 +4,10 @@ dtrain_SOURCES = dtrain.cc dtrain.h sample.h score.h update.h dtrain_LDADD = ../../decoder/libcdec.a ../../klm/search/libksearch.a ../../mteval/libmteval.a ../../utils/libutils.a ../../klm/lm/libklm.a ../../klm/util/libklm_util.a ../../klm/util/double-conversion/libklm_util_double.a dtrain_net_SOURCES = dtrain_net.cc dtrain_net.h dtrain.h sample.h score.h update.h -dtrain_net_LDADD = ../../decoder/libcdec.a ../../klm/search/libksearch.a ../../mteval/libmteval.a ../../utils/libutils.a ../../klm/lm/libklm.a ../../klm/util/libklm_util.a ../../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/lib/libnanomsg.so +dtrain_net_LDADD = ../../decoder/libcdec.a ../../klm/search/libksearch.a ../../mteval/libmteval.a ../../utils/libutils.a ../../klm/lm/libklm.a ../../klm/util/libklm_util.a ../../klm/util/double-conversion/libklm_util_double.a /srv/postedit/lib/nanomsg-0.5-beta/lib/libnanomsg.so dtrain_net_interface_SOURCES = dtrain_net_interface.cc dtrain_net_interface.h dtrain.h sample_net_interface.h score_net_interface.h update.h -dtrain_net_interface_LDADD = ../../decoder/libcdec.a ../../klm/search/libksearch.a ../../mteval/libmteval.a ../../utils/libutils.a ../../klm/lm/libklm.a ../../klm/util/libklm_util.a ../../klm/util/double-conversion/libklm_util_double.a /fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/lib/libnanomsg.so +dtrain_net_interface_LDADD = ../../decoder/libcdec.a ../../klm/search/libksearch.a ../../mteval/libmteval.a ../../utils/libutils.a ../../klm/lm/libklm.a ../../klm/util/libklm_util.a ../../klm/util/double-conversion/libklm_util_double.a /srv/postedit/lib/nanomsg-0.5-beta/lib/libnanomsg.so -AM_CPPFLAGS = -W -Wall -Wno-sign-compare -I$(top_srcdir)/utils -I$(top_srcdir)/decoder -I$(top_srcdir)/mteval -I/fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/lib/cppnanomsg +AM_CPPFLAGS = -W -Wall -Wno-sign-compare -I$(top_srcdir)/utils -I$(top_srcdir)/decoder -I$(top_srcdir)/mteval -I/srv/postedit/lib/nanomsg-0.5-beta/include -I/srv/postedit/lib/cppnanomsg diff --git a/utils/Makefile.am b/utils/Makefile.am index f6bf3131..ceffd5d6 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -100,7 +100,7 @@ atools_LDFLAGS = $(STATIC_FLAGS) atools_net_SOURCES = atools_net.cc nn.hpp atools_net_LDADD = libutils.a -atools_net_LDFLAGS = $(STATIC_FLAGS) /fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/lib/libnanomsg.so +atools_net_LDFLAGS = $(STATIC_FLAGS) /srv/postedit/lib/nanomsg-0.5-beta/lib/libnanomsg.so dedup_corpus_SOURCES = dedup_corpus.cc dedup_corpus_LDADD = libutils.a @@ -127,5 +127,5 @@ stringlib_test_LDADD = libutils.a $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_U ################################################################ # do NOT NOT NOT add any other -I includes NO NO NO NO NO ###### -AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -W -Wall -I. -I$(top_srcdir) -DTEST_DATA=\"$(top_srcdir)/utils/test_data\" -I/fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/lib/cppnanomsg +AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -W -Wall -I. -I$(top_srcdir) -DTEST_DATA=\"$(top_srcdir)/utils/test_data\" -I/srv/postedit/lib/nanomsg-0.5-beta/include -I/srv/postedit/lib/cppnanomsg ################################################################ diff --git a/word-aligner/Makefile.am b/word-aligner/Makefile.am index cd83c10d..2bffa267 100644 --- a/word-aligner/Makefile.am +++ b/word-aligner/Makefile.am @@ -9,9 +9,9 @@ binderiv_LDADD = ../utils/libutils.a net_fa_SOURCES = net_fa.cc ttables.cc da.h ttables.h nn.hpp net_fa_LDADD = ../utils/libutils.a -net_fa_LDFLAGS = $(STATIC_FLAGS) /fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/lib/libnanomsg.so +net_fa_LDFLAGS = $(STATIC_FLAGS) /srv/postedit/lib/nanomsg-0.5-beta/lib/libnanomsg.so EXTRA_DIST = aligner.pl ortho-norm support makefiles stemmers -AM_CPPFLAGS = -W -Wall -I$(top_srcdir) -I$(top_srcdir)/utils -I$(top_srcdir)/training -I/fast_scratch/simianer/lfpe/lib/nanomsg-0.5-beta/include -I/fast_scratch/simianer/lfpe/lib/cppnanomsg +AM_CPPFLAGS = -W -Wall -I$(top_srcdir) -I$(top_srcdir)/utils -I$(top_srcdir)/training -I/srv/postedit/lib/nanomsg-0.5-beta/include -I/srv/postedit/lib/cppnanomsg -- cgit v1.2.3