MLE-1053 rebase asapp fixes

.circleci/cmake_test.sh

@@ -3,9 +3,8 @@
 # Copyright (c) 2016-present, Facebook, Inc.
 # All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 #
 
 RESULTDIR=result

.circleci/config.yml

@@ -5,9 +5,8 @@
 # Copyright (c) 2016-present, Facebook, Inc.
 # All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 #
 
 # Maybe one day this will work
@@ -68,51 +67,6 @@ jobs:
             . .circleci/setup_circleimg.sh
             . .circleci/python_test.sh
 
-  "py361-pypi":
-    docker:
-      - image: circleci/python:3.6.1
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run:
-          command: |
-            . .circleci/setup_circleimg.sh
-            . .circleci/pip_test.sh
-
-
-  "py353-pypi":
-    docker:
-      - image: circleci/python:3.5.3
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run:
-          command: |
-            . .circleci/setup_circleimg.sh
-            . .circleci/pip_test.sh
-
-  "py346-pypi":
-    docker:
-      - image: circleci/python:3.4.6
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run:
-          command: |
-            . .circleci/setup_circleimg.sh
-            . .circleci/pip_test.sh
-
-  "py2713-pypi":
-    docker:
-      - image: circleci/python:2.7.13
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run:
-          command: |
-            . .circleci/setup_circleimg.sh
-            . .circleci/pip_test.sh
-
   "gcc5":
     docker:
       - image: gcc:5
@@ -230,10 +184,6 @@ workflows:
       - "py353"
       - "py346"
       - "py2713"
-      - "py361-pypi"
-      - "py353-pypi"
-      - "py346-pypi"
-      - "py2713-pypi"
       - "gcc5"
       - "gcc6"
       - "gcc7"

.circleci/gcc_test.sh

@@ -3,9 +3,8 @@
 # Copyright (c) 2016-present, Facebook, Inc.
 # All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 #
 
 RESULTDIR=result

.circleci/pip_test.sh

@@ -3,9 +3,8 @@
 # Copyright (c) 2016-present, Facebook, Inc.
 # All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 #
 
 sudo pip install --index-url https://test.pypi.org/simple/ fasttext

.circleci/pull_data.sh

@@ -3,9 +3,8 @@
 # Copyright (c) 2016-present, Facebook, Inc.
 # All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 #
 
 myshuf() {

.circleci/python_test.sh

@@ -3,9 +3,8 @@
 # Copyright (c) 2016-present, Facebook, Inc.
 # All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 #
 
 sudo pip install .

.circleci/run_locally.sh

@@ -3,9 +3,8 @@
 # Copyright (c) 2016-present, Facebook, Inc.
 # All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 #
 
 # This script illustrates how to run the build tests locally

.circleci/setup_circleimg.sh

@@ -3,9 +3,8 @@
 # Copyright (c) 2016-present, Facebook, Inc.
 # All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 #
 
 sudo apt-get update

.circleci/setup_debian.sh

@@ -3,9 +3,8 @@
 # Copyright (c) 2016-present, Facebook, Inc.
 # All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 #
 
 apt-get update

CMakeLists.txt

@@ -2,9 +2,8 @@
 # Copyright (c) 2016-present, Facebook, Inc.
 # All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 #
 
 cmake_minimum_required(VERSION 2.8.9)
@@ -23,6 +22,7 @@ set(HEADER_FILES
     src/dictionary.h
     src/fasttext.h
     src/matrix.h
+    src/meter.h
     src/model.h
     src/productquantizer.h
     src/qmatrix.h
@@ -36,6 +36,7 @@ set(SOURCE_FILES
     src/fasttext.cc
     src/main.cc
     src/matrix.cc
+    src/meter.cc
     src/model.cc
     src/productquantizer.cc
     src/qmatrix.cc

CONTRIBUTING.md

@@ -29,4 +29,4 @@ to do this once to work on any of Facebook's open source projects.
 Complete your CLA here: <https://code.facebook.com/cla>
 
 ## License
-By contributing to fastText, you agree that your contributions will be licensed under its BSD license.
+By contributing to fastText, you agree that your contributions will be licensed under its MIT license.

LICENSE

@@ -1,30 +1,21 @@
-BSD License
+MIT License
 
-For fastText software
+Copyright (c) 2016-present, Facebook, Inc.
 
-Copyright (c) 2016-present, Facebook, Inc. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
- * Neither the name Facebook nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -2,19 +2,21 @@
 # Copyright (c) 2016-present, Facebook, Inc.
 # All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 #
 
 CXX = c++
 CXXFLAGS = -pthread -std=c++0x -march=native
-OBJS = args.o dictionary.o productquantizer.o matrix.o qmatrix.o vector.o model.o utils.o fasttext.o
+OBJS = args.o dictionary.o productquantizer.o matrix.o qmatrix.o vector.o model.o utils.o meter.o fasttext.o
 INCLUDES = -I.
 
 opt: CXXFLAGS += -O3 -funroll-loops
 opt: fasttext
 
+coverage: CXXFLAGS += -O0 -fno-inline -fprofile-arcs --coverage
+coverage: fasttext
+
 debug: CXXFLAGS += -g -O0 -fno-inline
 debug: fasttext
 
@@ -42,11 +44,14 @@ model.o: src/model.cc src/model.h src/args.h
 utils.o: src/utils.cc src/utils.h
 	$(CXX) $(CXXFLAGS) -c src/utils.cc
 
+meter.o: src/meter.cc src/meter.h
+	$(CXX) $(CXXFLAGS) -c src/meter.cc
+
 fasttext.o: src/fasttext.cc src/*.h
 	$(CXX) $(CXXFLAGS) -c src/fasttext.cc
 
 fasttext: $(OBJS) src/fasttext.cc
 	$(CXX) $(CXXFLAGS) $(OBJS) src/main.cc -o fasttext
 
 clean:
-	rm -rf *.o fasttext
+	rm -rf *.o *.gcno *.gcda fasttext

README.md

@@ -1,6 +1,10 @@
+# fastText
+[fastText](https://fasttext.cc/) is a library for efficient learning of word representations and sentence classification.
+
+[![CircleCI](https://circleci.com/gh/facebookresearch/fastText/tree/master.svg?style=svg)](https://circleci.com/gh/facebookresearch/fastText/tree/master)
+
 ## Table of contents
 
-* [Introduction](#introduction)
 * [Resources](#resources)
    * [Models](#models)
    * [Supplementary data](#supplementary-data)
@@ -24,10 +28,6 @@
 * [Join the fastText community](#join-the-fasttext-community)
 * [License](#license)
 
-## Introduction
-
-[fastText](https://fasttext.cc/) is a library for efficient learning of word representations and sentence classification.
-
 ## Resources
 
 ### Models
@@ -48,7 +48,7 @@ We also provide a [cheatsheet](https://fasttext.cc/docs/en/cheatsheet.html#conte
 
 ## Requirements
 
-We are continously building and testing our library, CLI and Python bindings under various docker images using [circleci](https://circleci.com/).
+We are continuously building and testing our library, CLI and Python bindings under various docker images using [circleci](https://circleci.com/).
 
 Generally, **fastText** builds on modern Mac OS and Linux distributions.
 Since it uses some C++11 features, it requires a compiler with good C++11 support.
@@ -243,8 +243,8 @@ The following arguments are optional:
   -verbose            verbosity level [2]
 
 The following arguments for the dictionary are optional:
-  -minCount           minimal number of word occurences [1]
-  -minCountLabel      minimal number of label occurences [0]
+  -minCount           minimal number of word occurrences [1]
+  -minCountLabel      minimal number of label occurrences [0]
   -wordNgrams         max length of word ngram [1]
   -bucket             number of buckets [2000000]
   -minn               min length of char ngram [0]
@@ -336,4 +336,4 @@ See the CONTRIBUTING file for information about how to help out.
 
 ## License
 
-fastText is BSD-licensed. We also provide an additional patent grant.
+fastText is MIT-licensed.

classification-example.sh

@@ -3,9 +3,8 @@
 # Copyright (c) 2016-present, Facebook, Inc.
 # All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 #
 
 myshuf() {