[src] Some style-related fixes (and fix compiler warnings) in src/lm/

keli78 · danpovey · commit d117c955d1a5 · 2017-01-20T16:18:38.000-05:00
diff --git a/src/lm/arpa-file-parser-test.cc b/src/lm/arpa-file-parser-test.cc
@@ -165,18 +165,18 @@ ngram 2=2\n\
 ngram 3=2\n\
 \n\
 \\1-grams:\n\
--5.2      4 -3.3\n\
--3.4      5\n\
-0         1 -2.5\n\
--4.3      2\n\
+-5.2\t4\t-3.3\n\
+-3.4\t5\n\
+0\t1\t-2.5\n\
+-4.3\t2\n\
 \n\
 \\2-grams:\n\
--1.4       4 5 -3.2\n\
--1.3       1 4 -4.2\n\
+-1.4\t4 5\t-3.2\n\
+-1.3\t1 4\t-4.2\n\
 \n\
 \\3-grams:\n\
--0.3       1 4 5\n\
--0.2       4 5 2\n\
+-0.3\t1 4 5\n\
+-0.2\t4 5 2\n\
 \n\
 \\end\\";
 
@@ -220,18 +220,18 @@ ngram 2=2\n\
 ngram 3=2\n\
 \n\
 \\1-grams: \n\
--5.2    a -3.3\n\
--3.4    \xCE\xB2\n\
-0.0     <s> -2.5\n\
--4.3    </s>\n\
+-5.2\ta\t-3.3\n\
+-3.4\t\xCE\xB2\n\
+0.0\t<s>\t-2.5\n\
+-4.3\t</s>\n\
 \n\
 \\2-grams:\t\n\
--1.5    a \xCE\xB2 -3.2\n\
--1.3    <s> a -4.2\n\
+-1.5\ta \xCE\xB2\t-3.2\n\
+-1.3\t<s> a\t-4.2\n\
 \n\
 \\3-grams:\n\
--0.3    <s> a \xCE\xB2\n\
--0.2    <s> a </s>\n\
+-0.3\t<s> a \xCE\xB2\n\
+-0.2\t<s> a </s>\n\
 \\end\\";
 
 // Symbol table that is created with predefined test symbols, "a" but no "b".
diff --git a/src/lm/mikolov-rnnlm-lib.cc b/src/lm/mikolov-rnnlm-lib.cc
@@ -376,13 +376,13 @@ void CRnnLM::initNet() {
     }
 
   syn_d =
-    reinterpret_cast<direct_t *>(calloc(static_cast<int64>(direct_size),
+    reinterpret_cast<direct_t *>(calloc(static_cast<long long>(direct_size),
                                          sizeof(direct_t)));
 
   if (syn_d == NULL) {
     printf("Memory allocation for direct"
-     " connections failed (requested %ld bytes)\n",
-     static_cast<int64>(direct_size) * static_cast<int64>(sizeof(direct_t)));
+     " connections failed (requested %lld bytes)\n",
+     static_cast<long long>(direct_size) * static_cast<long long>(sizeof(direct_t)));
     exit(1);
   }
 
@@ -461,7 +461,7 @@ void CRnnLM::initNet() {
     }
   }
 
-  int64 aa;
+  long long aa;
   for (aa = 0; aa < direct_size; aa++) {
     syn_d[aa] = 0;
   }
@@ -621,7 +621,7 @@ void CRnnLM::restoreNet() {   // will read whole network structure
   fscanf(fi, "%d", &layer2_size);
   if (ver > 5) {
     goToDelimiter(':', fi);
-    fscanf(fi, "%ld", &direct_size);
+    fscanf(fi, "%lld", &direct_size);
   }
   if (ver > 6) {
     goToDelimiter(':', fi);
@@ -760,14 +760,14 @@ void CRnnLM::restoreNet() {   // will read whole network structure
   }
   if (filetype == TEXT) {
     goToDelimiter(':', fi);    // direct conenctions
-    int64 aa;
+    long long aa;
     for (aa = 0; aa < direct_size; aa++) {
       fscanf(fi, "%lf", &d);
       syn_d[aa] = d;
     }
   }
   if (filetype == BINARY) {
-    int64 aa;
+    long long aa;
     for (aa = 0; aa < direct_size; aa++) {
       fread(&fl, 4, 1, fi);
       syn_d[aa] = fl;
@@ -982,7 +982,7 @@ void CRnnLM::computeNet(int last_word, int word) {
 
   // apply direct connections to classes
   if (direct_size > 0) {
-    uint64 hash[MAX_NGRAM_ORDER];
+    unsigned long long hash[MAX_NGRAM_ORDER];
     // this will hold pointers to syn_d that contains hash parameters
 
     for (a = 0; a < direct_order; a++) {
@@ -997,7 +997,7 @@ void CRnnLM::computeNet(int last_word, int word) {
 
       for (b = 1; b <= a; b++) {
         hash[a] += PRIMES[(a * PRIMES[b] + b) % PRIMES_SIZE]
-            * static_cast<uint64>(history[b - 1] + 1);
+            * static_cast<unsigned long long>(history[b - 1] + 1);
       }
       // update hash value based on words from the history
 
@@ -1061,7 +1061,7 @@ void CRnnLM::computeNet(int last_word, int word) {
 
   // apply direct connections to words
   if (word != -1) if (direct_size > 0) {
-    uint64  hash[MAX_NGRAM_ORDER];
+    unsigned long long  hash[MAX_NGRAM_ORDER];
 
     for (a = 0; a < direct_order; a++) {
       hash[a] = 0;
@@ -1072,11 +1072,11 @@ void CRnnLM::computeNet(int last_word, int word) {
       if (a > 0) if (history[a - 1] == -1) break;
       hash[a] =
           PRIMES[0] * PRIMES[1] *
-          static_cast<uint64>(vocab[word].class_index + 1);
+          static_cast<unsigned long long>(vocab[word].class_index + 1);
 
       for (b = 1; b <= a; b++) {
         hash[a] += PRIMES[(a * PRIMES[b] + b) % PRIMES_SIZE]
-            * static_cast<uint64>(history[b - 1] + 1);
+            * static_cast<unsigned long long>(history[b - 1] + 1);
       }
       hash[a] = (hash[a] % (direct_size / 2)) + (direct_size) / 2;
     }
diff --git a/src/lm/mikolov-rnnlm-lib.h b/src/lm/mikolov-rnnlm-lib.h
@@ -143,7 +143,7 @@ class CRnnLM {
   int layerc_size;
   int layer2_size;
 
-  int64 direct_size;
+  long long direct_size;
   int direct_order;
   int history[MAX_NGRAM_ORDER];
 
