From 39b1967870e6fabe6764360bccefad8a2a9db24d Mon Sep 17 00:00:00 2001 From: Determinant Date: Wed, 24 Feb 2016 17:00:40 +0800 Subject: adjust the code according to the changes made in nerv/wrapped-handles --- kaldi_seq/src/init.c | 2 +- kaldi_seq/src/kaldi_mmi.cpp | 5 +++-- kaldi_seq/src/kaldi_mmi.h | 4 ++-- kaldi_seq/src/kaldi_mpe.cpp | 5 +++-- kaldi_seq/src/kaldi_mpe.h | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) (limited to 'kaldi_seq/src') diff --git a/kaldi_seq/src/init.c b/kaldi_seq/src/init.c index 9b38056..c2002cf 100644 --- a/kaldi_seq/src/init.c +++ b/kaldi_seq/src/init.c @@ -1,4 +1,4 @@ -#include "nerv/common.h" +#include "nerv/lib/common.h" #include "kaldi_mpe.h" #include "kaldi_mmi.h" #include diff --git a/kaldi_seq/src/kaldi_mmi.cpp b/kaldi_seq/src/kaldi_mmi.cpp index ea9b4f1..6f8dad9 100644 --- a/kaldi_seq/src/kaldi_mmi.cpp +++ b/kaldi_seq/src/kaldi_mmi.cpp @@ -36,9 +36,10 @@ extern "C" { #include "kaldi_mmi.h" #include "string.h" #include "assert.h" -#include "nerv/common.h" +#include "nerv/lib/common.h" +#include "nerv/lib/matrix/mmatrix.h" - extern NervMatrix *nerv_matrix_host_float_create(long nrow, long ncol, Status *status); + extern NervMatrix *nerv_matrix_host_float_create(long nrow, long ncol, MContext *context, Status *status); extern void nerv_matrix_host_float_copy_fromd(NervMatrix *mat, const NervMatrix *cumat, int, int, int, Status *); using namespace kaldi; using namespace kaldi::nnet1; diff --git a/kaldi_seq/src/kaldi_mmi.h b/kaldi_seq/src/kaldi_mmi.h index ce6787c..6175479 100644 --- a/kaldi_seq/src/kaldi_mmi.h +++ b/kaldi_seq/src/kaldi_mmi.h @@ -1,7 +1,7 @@ #ifndef NERV_kaldi_KALDI_MMI #define NERV_kaldi_KALDI_MMI -#include "nerv/matrix/matrix.h" -#include "nerv/common.h" +#include "nerv/lib/matrix/matrix.h" +#include "nerv/lib/common.h" #ifdef __cplusplus extern "C" { #endif diff --git a/kaldi_seq/src/kaldi_mpe.cpp b/kaldi_seq/src/kaldi_mpe.cpp index 60384e2..5d4149c 100644 --- a/kaldi_seq/src/kaldi_mpe.cpp +++ b/kaldi_seq/src/kaldi_mpe.cpp @@ -68,9 +68,10 @@ extern "C" { #include "kaldi_mpe.h" #include "string.h" #include "assert.h" -#include "nerv/common.h" +#include "nerv/lib/common.h" +#include "nerv/lib/matrix/mmatrix.h" - extern NervMatrix *nerv_matrix_host_float_create(long nrow, long ncol, Status *status); + extern NervMatrix *nerv_matrix_host_float_create(long nrow, long ncol, MContext *context, Status *status); extern void nerv_matrix_host_float_copy_fromd(NervMatrix *mat, const NervMatrix *cumat, int, int, int, Status *); using namespace kaldi; using namespace kaldi::nnet1; diff --git a/kaldi_seq/src/kaldi_mpe.h b/kaldi_seq/src/kaldi_mpe.h index fd09574..218cff5 100644 --- a/kaldi_seq/src/kaldi_mpe.h +++ b/kaldi_seq/src/kaldi_mpe.h @@ -1,7 +1,7 @@ #ifndef NERV_kaldi_KALDI_MPE #define NERV_kaldi_KALDI_MPE -#include "nerv/matrix/matrix.h" -#include "nerv/common.h" +#include "nerv/lib/matrix/matrix.h" +#include "nerv/lib/common.h" #ifdef __cplusplus extern "C" { #endif -- cgit v1.2.3-70-g09d2