Merge pull request #7 from facebookresearch/master

Merge upstream
xiamx · Jun 27, 2018 · 4ef5028 · 4ef5028
2 parents 50d21a0 + 25d0bb0
commit 4ef5028
Show file tree

Hide file tree

Showing 19 changed files with 293 additions and 116 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -153,59 +153,59 @@ jobs:
           command: |
             . .circleci/gcc_test.sh
 
-  "debian-wheezy-gcc":        
-    docker:        
-      - image: debian:wheezy        
-    working_directory: ~/repo        
-    steps:        
-      - checkout        
-      - run:        
-          command: |        
-            . .circleci/setup_debian.sh        
-            . .circleci/gcc_test.sh        
-         
-  "debian-wheezy-cmake":        
-    docker:        
-      - image: debian:wheezy        
-    working_directory: ~/repo        
-    steps:        
-      - checkout        
-      - run:        
-          command: |        
-            . .circleci/setup_debian.sh        
-            . .circleci/cmake_test.sh        
-        
-  "debian-jessie-gcc":        
-    docker:        
-      - image: debian:jessie        
-    working_directory: ~/repo        
-    steps:        
-      - checkout        
-      - run:        
-          command: |        
-            . .circleci/setup_debian.sh        
-            . .circleci/gcc_test.sh        
-        
-  "debian-jessie-cmake":        
-    docker:        
-      - image: debian:jessie        
-    working_directory: ~/repo        
-    steps:        
-      - checkout        
-      - run:        
-          command: |        
-            . .circleci/setup_debian.sh        
-            . .circleci/cmake_test.sh        
-        
-  "debian-jessie-python":        
-    docker:        
-      - image: debian:jessie        
-    working_directory: ~/repo        
-    steps:        
-      - checkout        
-      - run:        
-          command: |        
-            . .circleci/setup_debian.sh        
+  "debian-wheezy-gcc":
+    docker:
+      - image: debian:wheezy
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - run:
+          command: |
+            . .circleci/setup_debian.sh
+            . .circleci/gcc_test.sh
+
+  "debian-wheezy-cmake":
+    docker:
+      - image: debian:wheezy
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - run:
+          command: |
+            . .circleci/setup_debian.sh
+            . .circleci/cmake_test.sh
+
+  "debian-jessie-gcc":
+    docker:
+      - image: debian:jessie
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - run:
+          command: |
+            . .circleci/setup_debian.sh
+            . .circleci/gcc_test.sh
+
+  "debian-jessie-cmake":
+    docker:
+      - image: debian:jessie
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - run:
+          command: |
+            . .circleci/setup_debian.sh
+            . .circleci/cmake_test.sh
+
+  "debian-jessie-python":
+    docker:
+      - image: debian:jessie
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - run:
+          command: |
+            . .circleci/setup_debian.sh
             pip install .
             python runtests.py -u
 
@@ -217,10 +217,10 @@ jobs:
       - checkout
       - run:
           command: |
-            git config --global user.email "cpuhrsch@users.noreply.github.com"
+            git config --global user.email "docusaurus-bot@users.noreply.github.com"
             git config --global user.name "Website Deployment Script"
-            echo "machine github.com login cpuhrsch password $GITHUB_TOKEN" > ~/.netrc
-            cd website && npm install && GIT_USER=cpuhrsch npm run publish-gh-pages
+            echo "machine github.com login docusaurus-bot password $GITHUB_TOKEN_DOCUSAURUS_BOT" > ~/.netrc
+            cd website && npm install && GIT_USER=docusaurus-bot npm run publish-gh-pages
 
 workflows:
   version: 2
@@ -239,8 +239,8 @@ workflows:
       - "gcc7"
       - "gcclatest"
       - "website-build"
-      - "debian-wheezy-gcc"        
-      - "debian-wheezy-cmake"        
-      - "debian-jessie-gcc"        
-      - "debian-jessie-cmake"        
+      - "debian-wheezy-gcc"
+      - "debian-wheezy-cmake"
+      - "debian-jessie-gcc"
+      - "debian-jessie-cmake"
       - "debian-jessie-python"
diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ This repository hosts unofficial Windows binary builds of fastText, a library fo
 
 ### Models
 - Recent state-of-the-art [English word vectors](https://fasttext.cc/docs/en/english-vectors.html).
-- Word vectors for [294 languages trained on Wikipedia](https://github.com/facebookresearch/fastText/blob/master/pretrained-vectors.md).
+- Word vectors for [157 languages trained on Wikipedia and Crawl](https://github.com/facebookresearch/fastText/blob/master/docs/crawl-vectors.md).
 - Models for [language identification](https://fasttext.cc/docs/en/language-identification.html#content) and [various supervised tasks](https://fasttext.cc/docs/en/supervised-models.html#content).
 
 ### Supplementary data
@@ -104,7 +104,7 @@ $ unzip v0.1.0.zip
 $ cd fastText-0.1.0
 $ make
 ```
- 
+
 This will produce object files for all the classes as well as the main binary `fasttext`.
 If you do not plan on using the default system-wide compiler, update the two macros defined at the beginning of the Makefile (CC and INCLUDES).
 
@@ -233,7 +233,7 @@ This will create a `.ftz` file with a smaller memory footprint. All the standard
 ```
 $ ./fasttext test model.ftz test.txt
 ```
-The quantization procedure follows the steps described in [3](#fastext-zip). You can
+The quantization procedure follows the steps described in [3](#fasttextzip-compressing-text-classification-models). You can
 run the script `quantization-example.sh` for an example.
 
 
@@ -293,11 +293,14 @@ Please cite [1](#enriching-word-vectors-with-subword-information) if using this
 [1] P. Bojanowski\*, E. Grave\*, A. Joulin, T. Mikolov, [*Enriching Word Vectors with Subword Information*](https://arxiv.org/abs/1607.04606)
 
 ```
-@article{bojanowski2016enriching,
+@article{bojanowski2017enriching,
   title={Enriching Word Vectors with Subword Information},
   author={Bojanowski, Piotr and Grave, Edouard and Joulin, Armand and Mikolov, Tomas},
-  journal={arXiv preprint arXiv:1607.04606},
-  year={2016}
+  journal={Transactions of the Association for Computational Linguistics},
+  volume={5},
+  year={2017},
+  issn={2307-387X},
+  pages={135--146}
 }
 ```
 
@@ -306,11 +309,14 @@ Please cite [1](#enriching-word-vectors-with-subword-information) if using this
 [2] A. Joulin, E. Grave, P. Bojanowski, T. Mikolov, [*Bag of Tricks for Efficient Text Classification*](https://arxiv.org/abs/1607.01759)
 
 ```
-@article{joulin2016bag,
+@InProceedings{joulin2017bag,
   title={Bag of Tricks for Efficient Text Classification},
   author={Joulin, Armand and Grave, Edouard and Bojanowski, Piotr and Mikolov, Tomas},
-  journal={arXiv preprint arXiv:1607.01759},
-  year={2016}
+  booktitle={Proceedings of the 15th Conference of the European Chapter of the Association for Computational Linguistics: Volume 2, Short Papers},
+  month={April},
+  year={2017},
+  publisher={Association for Computational Linguistics},
+  pages={427--431},
 }
 ```