Skip to content

Commit e0cbd32

Browse files
author
kkm
committed
Separated ARPA parsing from const LM construction
1 parent b478057 commit e0cbd32

File tree

6 files changed

+800
-233
lines changed

6 files changed

+800
-233
lines changed

src/base/kaldi-math.h

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,19 @@
4141
#endif
4242

4343
#ifndef M_PI
44-
# define M_PI 3.1415926535897932384626433832795
44+
#define M_PI 3.1415926535897932384626433832795
4545
#endif
4646

4747
#ifndef M_SQRT2
48-
# define M_SQRT2 1.4142135623730950488016887
48+
#define M_SQRT2 1.4142135623730950488016887
4949
#endif
5050

51-
5251
#ifndef M_2PI
53-
# define M_2PI 6.283185307179586476925286766559005
52+
#define M_2PI 6.283185307179586476925286766559005
5453
#endif
5554

5655
#ifndef M_SQRT1_2
57-
# define M_SQRT1_2 0.7071067811865475244008443621048490
56+
#define M_SQRT1_2 0.7071067811865475244008443621048490
5857
#endif
5958

6059
#ifndef M_LOG_2PI
@@ -65,6 +64,11 @@
6564
#define M_LN2 0.693147180559945309417232121458
6665
#endif
6766

67+
#ifndef M_LN10
68+
#define M_LN10 2.302585092994045684017991454684
69+
#endif
70+
71+
6872
#define KALDI_ISNAN std::isnan
6973
#define KALDI_ISINF std::isinf
7074
#define KALDI_ISFINITE(x) std::isfinite(x)

src/lm/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ MATHLIB = NONE
1010

1111
include ../kaldi.mk
1212

13-
TESTFILES = lm-lib-test
13+
TESTFILES = arpa-file-parser-test lm-lib-test
1414

15-
OBJFILES = const-arpa-lm.o kaldi-lmtable.o kaldi-lm.o kaldi-rnnlm.o \
16-
mikolov-rnnlm-lib.o
15+
OBJFILES = arpa-file-parser.o const-arpa-lm.o kaldi-lmtable.o kaldi-lm.o \
16+
kaldi-rnnlm.o mikolov-rnnlm-lib.o
1717

1818
TESTOUTPUTS = composed.fst output.fst output1.fst output2.fst
1919

0 commit comments

Comments
 (0)