Commit Graph

10899 Commits

Author SHA1 Message Date
Hieu Hoang
7214be82d4 lattice decoding with sparse features 2013-09-08 16:43:18 +02:00
Hieu Hoang
1adf7d0521 lattice decoding with sparse features 2013-09-08 15:57:31 +02:00
Hieu Hoang
65e2806b1d move lattice scoring into InputFeature class 2013-09-08 13:47:32 +02:00
Rico Sennrich
b421f7c9b0 refactoring to minimize overhead from flexibility score code (if off) 2013-09-07 23:04:40 +02:00
Rico Sennrich
7138056b8f flexibility scores 2013-09-07 23:04:01 +02:00
Kenneth Heafield
b27d140619 Unfortunately UTrieNode wants a non-explicit copy constructor 2013-09-07 09:51:09 +01:00
Lane Schwartz
7e1cfc981f Merge branch 'master' of www:/repos/git/Decoders/mosesdecoder 2013-09-06 14:01:32 -04:00
Lane Schwartz
226031ecf6 Checking in examples of CMake files.
The example in contrib works, as does the one in biconcor.

The examples in lm and moses don't work at the moment,
but checking them in anyway as a starting point
for any potential work on them next week during the
MT Marathon.
2013-09-06 13:39:46 -04:00
Ulrich Germann
384650fb60 Merge branch 'master' of github.com:moses-smt/mosesdecoder 2013-09-06 17:05:39 +01:00
Ulrich Germann
64cfd3ec16 Minor cosmetic changes. 2013-09-06 17:04:46 +01:00
Ulrich Germann
8154654e7c Added using namespace std; 2013-09-06 17:02:32 +01:00
Chris Dyer
41493e1a9e Merge branch 'master' of https://github.com/moses-smt/mosesdecoder 2013-09-06 10:40:21 -04:00
Chris Dyer
eb7afdaf4f fix for check plf 2013-09-06 10:40:10 -04:00
Barry Haddow
867c6efe6c Merge branch 'master' of github.com:moses-smt/mosesdecoder 2013-09-06 13:29:29 +01:00
Barry Haddow
7425036c3a scoring correction 2013-09-06 13:29:20 +01:00
Hieu Hoang
8ae1614be4 no change commit. Force rerun of cruise control 2013-09-06 08:53:17 +02:00
Chris Dyer
cd80fb6db8 fix to use current interface 2013-09-06 00:28:41 -04:00
Hieu Hoang
fbb2f9abb0 Merge branch 'master' of github.com:moses-smt/mosesdecoder 2013-09-05 23:34:39 +02:00
Hieu Hoang
12c4a0a68e lattice decoding with sparse features 2013-09-05 23:34:22 +02:00
Hieu Hoang
6f81004e20 lattice decoding with sparse features 2013-09-05 22:26:19 +02:00
Hieu Hoang
8803bcdba6 lattice decoding with sparse features 2013-09-05 22:25:32 +02:00
Hieu Hoang
56c4a41231 lattice decoding with sparse features 2013-09-05 22:22:53 +02:00
Lane Schwartz
addc8be211 Merge branch 'master' of www:/repos/git/Decoders/mosesdecoder 2013-09-05 14:06:15 -04:00
Lane Schwartz
192bd8313c Adding more executables to XCode project 2013-09-05 14:06:09 -04:00
Hieu Hoang
cec177b493 no change commit. Force rerun of cruise control 2013-09-05 18:31:45 +01:00
Lane Schwartz
31203ec308 XCode can now compile biconcor 2013-09-03 11:10:37 -04:00
Lane Schwartz
3be2f54a51 XCode can now compile moses_chart 2013-09-03 11:05:16 -04:00
Lane Schwartz
f1e4d6eb04 XCode can now compile moses and lmbrgrid 2013-09-03 10:59:53 -04:00
Lane Schwartz
fd81ca799d XCode can now compile queryOnDiskPt
Also fixed some inconsistencies between
debug and release for some targets.
2013-09-03 10:37:20 -04:00
Lane Schwartz
21801e85e7 XCode project can now compile CreateOnDiskPt
If libmoses.a was compiled with LM_IRST,
then the following flags must be passed to the linker
when compiling CreateOnDiskPt:
-L $(XCODE_MOSES_LIBRARY_IRSTLM)
-lirstlm

If libmoses.a was compiled with LM_SRI,
then the following flags must be passed to the linker
when compiling CreateOnDiskPt:
-L $(XCODE_MOSES_LIBRARY_SRILM)
-ldstruct
-liconv
-lz
-lmisc
-loolm

Additionally, if libmoses.a was compiled with LM_SRI,
and SRILM was compiled with lbfgs,
then the following flags must be passed to the linker
when compiling CreateOnDiskPt:
-L $(XCODE_MOSES_LIBRARY_LBFGS)
-Xlinker -search_paths_first
-llbfgs

An note of explanation here may be warranted
with regard to the above lbfgs-related flags:
Mac OS X ships with a dynamic library that is loaded
with the flag -lz. SRILM compiles its own version of this
library. If SRILM is compiled statically, this becomes a problem.
We need XCode to link against the SRILM version of zlib,
but by default, the linker will search through all known library paths
for a dynamic version first. Only if no dynamic version is found will
it then search the library paths for a static version.
The fix for this problem is to use the -Xlinker flag to pass an additional
flag to the linker: -search_paths_first. This flag forces to linker to
iterate only once through each directory in its library path; within each
such directory it will first look for a dynamic version and
then, if necessary, for a static version. This solves the problem.
2013-09-03 10:23:26 -04:00
Hieu Hoang
9894941294 properties is on 7th column, not 6th 2013-09-03 15:02:53 +02:00
Hieu Hoang
01b7f8a1e8 add skeleton feature functions 2013-09-01 16:58:23 +01:00
Hieu Hoang
af6b1f2b4e start on forced decoding for SCFG 2013-08-31 01:37:15 +01:00
Lane Schwartz
19e94b4869 In XCode, removed headers from libmoses target. 2013-08-30 15:33:05 -04:00
Lane Schwartz
3bb4ac803a Adding targets to XCode project.
Have working targets for kenlm binaries
and for libmoses, with the caveat that
only source files from the lm, moses, and util dirs
are currently included in libmoses.

The next step is adding the other relevant dirs
to libmoses.
2013-08-30 15:26:59 -04:00
Hieu Hoang
769f2fe00c start on forced decoding for SCFG 2013-08-30 17:45:56 +01:00
Hieu Hoang
fe36cbf737 move LexicalReordering to FF directory 2013-08-30 16:28:28 +01:00
Hieu Hoang
04783309ba move DecodeFeature to FF directory 2013-08-30 16:03:06 +01:00
Hieu Hoang
03fd06b38b convert Evaluate() methods into abstract, rather than empty functions. Every FF must implement them all 2013-08-30 15:49:00 +01:00
Lane Schwartz
70eb3f13b9 More XCode configuration cleanup. 2013-08-29 16:26:49 -04:00
Lane Schwartz
27be036572 Clean up XCode configuration. 2013-08-29 16:02:19 -04:00
Lane Schwartz
f5a55e105b Cleaning up XCode project.
Project is now configured such that it should compile
cleanly with or without optional libraries.

To compile the project, the user must (at minimum) have boost installed.

If boost is installed in a standard location, such as /usr/local,
then XCode should be able to find boost without any help from the user.

If boost is in a non-standard location, the user must configure XCode
such that the Source Tree variable XCODE_MOSES_INCLUDE_BOOST is set to
the directory where boost is installed.

For example, if you download and unzip boost in /path/to/boost_1_53_0,
then after compiling boost, headers would be located in
/path/to/boost_1_53_0/include and libraries would be located in
/path/too/boost_1_53_0/lib. In this case, set XCODE_MOSES_INCLUDE_BOOST=
/path/to/boost_1_53_0/include.

If you want to compile using IRSTLM, RandLM, SRILM, or the HHMM SynLM,
you will need to set the paths to those projects' respective include dirs
in the respective corresponding Source Tree variables:

For IRSTLM:
XCODE_MOSES_INCLUDE_IRSTLM

For RandLM:
XCODE_MOSES_INCLUDE_RANDLM

For SRILM:
XCODE_MOSES_INCLUDE_SRILM

For the HHMM syntactic LM:
XCODE_MOSES_INCLUDE_SYNLM_RVTL
XCODE_MOSES_INCLUED_SYNLM_WSJPARSE

At the moment, the project is configured with the
LM_SRI, LM_IRST, and LM_RAND preprocessor macros enabled,
which means that to compile the project, the respective source tree
variables must be defined. Alternatively, you could remove those macros
from the project definitions.
2013-08-29 15:10:54 -04:00
Lane Schwartz
c0fe9bb4ea Updating XCode project 2013-08-29 12:56:25 -04:00
Lane Schwartz
6b4d6b435a Merge branch 'master' of www:/repos/git/Decoders/mosesdecoder 2013-08-29 10:50:00 -04:00
Hieu Hoang
f5fc57008f save properties in target phrase object 2013-08-29 13:36:01 +01:00
Lane Schwartz
406f3bdd0e Tell gitignore about Mac OS X hidden files 2013-08-28 13:57:06 -04:00
Lane Schwartz
7675825eb7 Merge branch 'master' of www:/repos/git/Decoders/mosesdecoder 2013-08-28 13:27:12 -04:00
Lane Schwartz
8a726a9de4 Changes to allow SRILM on Mac OS X.
By default, SRILM defines a function called zopen.

However, on Mac OS X (and possibly other BSDs),
<stdio.h> already defines a zopen function.

To resolve this conflict, SRILM checks to see if HAVE_ZOPEN is defined.
If it is, SRILM will rename its zopen function as my_zopen.

So, before importing any SRILM headers,
it is important to define HAVE_ZOPEN if we are on an Apple OS.
2013-08-28 12:39:47 -04:00
Hieu Hoang
d79d97c0e6 Merge branch 'master' of github.com:moses-smt/mosesdecoder 2013-08-28 11:06:44 +01:00
Hieu Hoang
1848946cb3 beautify 2013-08-28 11:06:27 +01:00