1 files changed, 41 insertions, 16 deletions

diff --git a/kaldi_io/tools/kaldi_to_nerv.cpp b/kaldi_io/tools/kaldi_to_nerv.cpp
index 1edb0f2..f16de44 100644
--- a/kaldi_io/tools/kaldi_to_nerv.cpp
+++ b/kaldi_io/tools/kaldi_to_nerv.cpp
@@ -3,31 +3,53 @@
 #include <string>
 #include <cstring>
 #include <cassert>
+#include <cstdlib>
 
 char token[1024];
 char output[1024];
-double mat[4096][4096];
+
+double **new_matrix(int nrow, int ncol) {
+    double **mat = new double *[nrow];
+    int i;
+    for (i = 0; i < nrow; i++)
+        mat[i] = new double[ncol];
+    return mat;
+}
+
+void free_matrix(double **mat, int nrow, int ncol) {
+    int i;
+    for (i = 0; i < nrow; i++)
+        delete [] mat[i];
+    delete [] mat;
+}
+
 int main(int argc, char **argv) {
+    FILE *fin;
     std::ofstream fout;
-    fout.open(argv[1]);
-    int cnt = 0;
+    assert(argc >= 3);
+    fin = fopen(argv[1], "r");
+    fout.open(argv[2]);
+    assert(fin != NULL);
+    int cnt = argc > 3 ? atoi(argv[3]) : 0;
     bool shift;
-    while (scanf("%s", token) != EOF)
+    while (fscanf(fin, "%s", token) != EOF)
     {
         int nrow, ncol;
         int i, j;
+        double **mat;
         if (strcmp(token, "<AffineTransform>") == 0)
         {
             double lrate, blrate, mnorm;
-            scanf("%d %d", &ncol, &nrow);
-            scanf("%s %lf %s %lf %s %lf",
+            fscanf(fin, "%d %d", &ncol, &nrow);
+            fscanf(fin, "%s %lf %s %lf %s %lf",
                     token, &lrate, token, &blrate, token, &mnorm);
-            scanf("%s", token);
+            fscanf(fin, "%s", token);
             assert(*token == '[');
             printf("%d %d\n", nrow, ncol);
+            mat = new_matrix(nrow, ncol);
             for (j = 0; j < ncol; j++)
                 for (i = 0; i < nrow; i++)
-                    scanf("%lf", mat[i] + j);
+                    fscanf(fin, "%lf", mat[i] + j);
             long base = fout.tellp();
             sprintf(output, "%16d", 0);
             fout << output;
@@ -47,13 +69,13 @@ int main(int argc, char **argv) {
             sprintf(output, "[%13lu]\n", length);
             fout << output;
             fout.seekp(0, std::ios_base::end);
-            scanf("%s", token);
+            fscanf(fin, "%s", token);
             assert(*token == ']');
-            if (scanf("%s", token) == 1 && *token == '[')
+            if (fscanf(fin, "%s", token) == 1 && *token == '[')
             {
                 base = fout.tellp();
                 for (j = 0; j < ncol; j++)
-                    scanf("%lf", mat[0] + j);
+                    fscanf(fin, "%lf", mat[0] + j);
                 sprintf(output, "%16d", 0);
                 fout << output;
                 sprintf(output, "{type=\"nerv.BiasParam\",id=\"affine%d_bp\"}\n",
@@ -71,19 +93,21 @@ int main(int argc, char **argv) {
                 fout.seekp(0, std::ios_base::end);
                 cnt++;
             }
+            free_matrix(mat, nrow, ncol);
         }
         else if ((shift = (strcmp(token, "<AddShift>") == 0)) ||
                 strcmp(token, "<Rescale>") == 0)
         {
             double lrate, blrate, mnorm;
-            scanf("%d %d", &ncol, &ncol);
-            scanf("%s %lf",
+            fscanf(fin, "%d %d", &ncol, &ncol);
+            mat = new_matrix(1, ncol);
+            fscanf(fin, "%s %lf",
                     token, &lrate);
-            scanf("%s", token);
+            fscanf(fin, "%s", token);
             assert(*token == '[');
             printf("%d\n", ncol);
             for (j = 0; j < ncol; j++)
-                    scanf("%lf", mat[0] + j);
+                    fscanf(fin, "%lf", mat[0] + j);
             long base = fout.tellp();
             sprintf(output, "%16d", 0);
             fout << output;
@@ -101,8 +125,9 @@ int main(int argc, char **argv) {
             sprintf(output, "[%13lu]\n", length);
             fout << output;
             fout.seekp(0, std::ios_base::end);
-            scanf("%s", token);
+            fscanf(fin, "%s", token);
             assert(*token == ']');
+            free_matrix(mat, 1, ncol);
         }
     }
     return 0;