Explorar o código

add verbose option

Summary: Add verbose option.

Reviewed By: ajoulin

Differential Revision: D3828123

fbshipit-source-id: 1f3769f696a89370759f28fa4a018fb4b021f357
Edouard Grave %!s(int64=9) %!d(string=hai) anos
pai
achega
6ab48c5cc4
Modificáronse 4 ficheiros con 7 adicións e 2 borrados
  1. 4 0
      src/args.cc
  2. 1 0
      src/args.h
  3. 1 1
      src/dictionary.cc
  4. 1 1
      src/fasttext.cc

+ 4 - 0
src/args.cc

@@ -31,6 +31,7 @@ Args::Args() {
   lrUpdateRate = 100;
   t = 1e-4;
   label = "__label__";
+  verbose = 2;
 }
 
 void Args::parseArgs(int argc, char** argv) {
@@ -102,6 +103,8 @@ void Args::parseArgs(int argc, char** argv) {
       t = atof(argv[ai + 1]);
     } else if (strcmp(argv[ai], "-label") == 0) {
       label = std::string(argv[ai + 1]);
+    } else if (strcmp(argv[ai], "-verbose") == 0) {
+      verbose = atoi(argv[ai + 1]);
     } else {
       std::cout << "Unknown argument: " << argv[ai] << std::endl;
       printHelp();
@@ -141,6 +144,7 @@ void Args::printHelp() {
     << "  -thread       number of threads [" << thread << "]\n"
     << "  -t            sampling threshold [" << t << "]\n"
     << "  -label        labels prefix [" << label << "]\n"
+    << "  -verbose      verbosity level [" << verbose << "]\n"
     << std::endl;
 }
 

+ 1 - 0
src/args.h

@@ -39,6 +39,7 @@ class Args {
     int thread;
     double t;
     std::string label;
+    int verbose;
 
     void parseArgs(int, char**);
     void printHelp();

+ 1 - 1
src/dictionary.cc

@@ -172,7 +172,7 @@ void Dictionary::readFromFile(std::istream& in) {
   int64_t minThreshold = 1;
   while (readWord(in, word)) {
     add(word);
-    if (ntokens_ % 1000000 == 0) {
+    if (ntokens_ % 1000000 == 0 && args_->verbose > 1) {
       std::cout << "\rRead " << ntokens_  / 1000000 << "M words" << std::flush;
     }
     if (size_ > 0.75 * MAX_VOCAB_SIZE) {

+ 1 - 1
src/fasttext.cc

@@ -237,7 +237,7 @@ void FastText::trainThread(int32_t threadId) {
     if (localTokenCount > args_->lrUpdateRate) {
       tokenCount += localTokenCount;
       localTokenCount = 0;
-      if (threadId == 0) {
+      if (threadId == 0 && args_->verbose > 1) {
         printInfo(progress, model.getLoss());
       }
     }