Set fastText submodule to v0.2.0.

.travis.yml

@@ -1,9 +1,8 @@
 language: java
 jdk:
-  - oraclejdk8
+  - openjdk11
 os:
   - linux
-  - osx
 cache: bundler
 # Setting install to 'true' to prevent Travis CI from installing depedencies via:
 # "mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V" which fails due to missing the GPG secret key.

CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+## Version 0.9.1
+
+* Use [FastText v0.9.1](https://github.com/facebookresearch/fastText/releases/tag/v0.9.1)
+* Minor bug fixes
+

README.md

@@ -1,17 +1,19 @@
-[![Build Status](https://travis-ci.org/vinhkhuc/JFastText.svg?branch=master)](https://travis-ci.org/vinhkhuc/JFastText)
+[![Build Status](https://travis-ci.org/carschno/JFastText.svg?branch=master)](https://travis-ci.org/carschno/JFastText)
 
 Table of Contents
 =================
 
   * [Introduction](#introduction)
   * [Maven Dependency](#maven-dependency)
+    * [Windows and Mac OSX](#windows-and-mac-os-x)
   * [Building](#building)
   * [Quick Application - Language Identification](#quick-application-\--language-identification)
   * [Detailed Examples](#detailed-examples)
   * [API](#api)
   * [FastText's Command Line](#fasttexts-command-line)
   * [License](#license)
   * [References](#references)
+  * [Changelog](CHANGELOG.md)
 
 
 ## Introduction
@@ -28,23 +30,39 @@ JFastText is ideal for building fast text classifiers in Java.
 ## Maven Dependency
 ```xml
 <dependency>
-  <groupId>com.github.vinhkhuc</groupId>
+  <groupId>io.github.carschno</groupId>
   <artifactId>jfasttext</artifactId>
-  <version>0.4</version>
+  <version>0.9.1</version>
 </dependency>
 ```
-The Jar package on Maven Central is bundled with precompiled fastText library for Windows, Linux and
-MacOSX 64bit.
+The Jar package on Maven Central is bundled with precompiled fastText library for ~~Windows,~~ Linux ~~and
+MacOSX~~ 64bit.
+
+### Windows and Mac OS X
+
+Currently, the Maven dependency only contains binaries for Linux (64 bit), _not_ for Windows or Mac OS X.
+In order to use JFastText for Windows or Mac OS X (or any other system), you need to build it yourself (see [below](#building)). 
 
 ## Building
-C++ compiler (g++ on Mac/Linux or cl.exe on Windows) is required to compile fastText's code.
+C++ compiler (g++ on Mac/Linux or `cl.exe` on Windows) is required to compile fastText's code.
 
 ```bash
-git clone --recursive https://github.com/vinhkhuc/JFastText
+git clone --recursive https://github.com/carschno/JFastText
 cd JFastText
+git submodule init
+git submodule update
 mvn package
 ```
 
+### Building on Windows
+
+The (automatic) build seems to fail on some Windows systems/C++ compilers.
+See [this issue](https://github.com/carschno/JFastText/issues/5#issuecomment-546485377): 
+
+> I used MS's developer tools, not the full-blown Visual Studio. If I run `cl` directly, the compilation fails with the same error.
+>
+>  I was able to build on Windows by changing the call to `cl.exe` and running it outside the Maven build. I changed one parameter in the call to `cl`: I use `/MT` (whereas Maven uses `/MD`). Bundling the generated DLLs works fine.
+
 ## Quick Application - Language Identification
 JFastText can use FastText's pretrained models directly. Language identification models can be downloaded [here](https://fasttext.cc/docs/en/language-identification.html).
 In this quick example, we will use the [quantized model](https://s3-us-west-1.amazonaws.com/fasttext-vectors/supervised_models/lid.176.ftz)

examples/api/pom.xml

@@ -7,12 +7,15 @@
     <groupId>com.github.vinhkhuc</groupId>
     <artifactId>java_sandbox</artifactId>
     <version>0.1</version>
-
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
     <dependencies>
         <dependency>
-            <groupId>com.github.vinhkhuc</groupId>
+            <groupId>io.github.carschno</groupId>
             <artifactId>jfasttext</artifactId>
-            <version>0.4</version>
+            <version>0.5.0</version>
         </dependency>
     </dependencies>
 </project>

pom.xml

@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.github.vinhkhuc</groupId>
+    <groupId>io.github.carschno</groupId>
     <artifactId>jfasttext</artifactId>
-    <version>0.4</version>
+    <version>0.9.1</version>
     <name>Java interface for fastText</name>
     <description>
         JFastText is a Java interface for fastText, a library for efficient learning of
@@ -22,6 +22,15 @@
     </licenses>
 
     <developers>
+        <developer>
+            <id>carschno</id>
+            <name>Carsten Schnober</name>
+            <url>http://github.com/carschno</url>
+            <roles>
+                <role>developer</role>
+                <role>maintainer</role>
+            </roles>
+        </developer>
         <developer>
             <id>vinhkhuc</id>
             <name>Vinh Khuc</name>
@@ -34,13 +43,14 @@
     </developers>
 
     <scm>
-        <connection>scm:git:https://github.com/vinhkhuc/JFastText.git</connection>
-        <developerConnection>scm:git:git@github.com:vinhkhuc/JFastText.git</developerConnection>
-        <url>https://github.com/vinhkhuc/JFastText</url>
+        <connection>scm:git:https://github.com/carschno/JFastText.git</connection>
+        <developerConnection>scm:git:git@github.com:carschno/JFastText.git</developerConnection>
+        <url>https://github.com/carschno/JFastText</url>
     </scm>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <javacpp.version>1.5.1</javacpp.version>
     </properties>
 
     <distributionManagement>
@@ -65,21 +75,42 @@
                 <additionalparam>-Xdoclint:none</additionalparam>
             </properties>
         </profile>
-    </profiles>
-
-    <build>
-        <plugins>
-            <plugin>
+        <profile>
+          <id>release</id>
+          <build>
+            <plugins>
+              <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
                 <version>1.6.3</version>
                 <extensions>true</extensions>
                 <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                  <serverId>ossrh</serverId>
+                  <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                  <autoReleaseAfterClose>false</autoReleaseAfterClose>
                 </configuration>
-            </plugin>
+              </plugin>
+              <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>1.5</version>
+                <executions>
+                  <execution>
+                    <id>sign-artifacts</id>
+                    <phase>verify</phase>
+                    <goals>
+                      <goal>sign</goal>
+                    </goals>
+                  </execution>
+                </executions>
+              </plugin>
+            </plugins>
+          </build>
+        </profile>
+    </profiles>
+
+    <build>
+        <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -110,6 +141,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.9.1</version>
+                <configuration>
+                    <source>8</source>
+                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -119,20 +153,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.5</version>
-                <executions>
-                    <execution>
-                        <id>sign-artifacts</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -155,7 +175,7 @@
             <plugin>
                 <groupId>org.bytedeco</groupId>
                 <artifactId>javacpp</artifactId>
-                <version>1.3.1</version>
+                <version>${javacpp.version}</version>
                 <executions>
                     <execution>
                         <id>run-javacpp-parser</id>
@@ -234,8 +254,8 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>javacpp</artifactId>
-            <version>1.3.1</version>
+            <version>${javacpp.version}</version>
         </dependency>
     </dependencies>
 
-</project>
+</project>

src/main/cpp/fasttext_wrapper.cc

@@ -74,13 +74,20 @@ namespace FastTextWrapper {
             const std::string& text, int32_t k) {
         std::vector<std::pair<real,std::string>> predictions;
         std::istringstream in(text);
-        fastText.predict(in, k, predictions);
+        fastText.predictLine(in, predictions, k, 0.0);
         return predictions;
     }
 
     std::vector<real> FastTextApi::getVector(const std::string& word) {
         Vector vec(privateMembers->args_->dim);
-        fastText.getVector(vec, word);
+        fastText.getWordVector(vec, word);
+        return std::vector<real>(vec.data(), vec.data() + vec.size());
+    }
+
+    std::vector<real> FastTextApi::getSentenceVector(const std::string& sentence) {
+        Vector vec(privateMembers->args_->dim);
+        std::istringstream in(sentence);
+        fastText.getSentenceVector(in, vec);
         return std::vector<real>(vec.data(), vec.data() + vec.size());
     }
 

src/main/cpp/fasttext_wrapper.h

@@ -29,6 +29,7 @@ namespace FastTextWrapper {
         std::vector<std::string> predict(const std::string&, int32_t);
         std::vector<std::pair<real,std::string>> predictProba(const std::string&, int32_t);
         std::vector<real> getVector(const std::string&);
+        std::vector<real> getSentenceVector(const std::string&);
         std::vector<std::string> getWords();
         std::vector<std::string> getLabels();
         std::string getWord(int32_t);

src/main/cpp/fasttext_wrapper_javacpp.h

@@ -1,12 +1,15 @@
 // Added <numeric> since VS 14.0 complains about missing std::iota
 #include <numeric>
 #include "fastText/src/args.cc"
+#include "fastText/src/densematrix.cc"
 #include "fastText/src/dictionary.cc"
 #include "fastText/src/fasttext.cc"
+#include "fastText/src/loss.cc"
 #include "fastText/src/matrix.cc"
+#include "fastText/src/meter.cc"
 #include "fastText/src/model.cc"
 #include "fastText/src/productquantizer.cc"
-#include "fastText/src/qmatrix.cc"
+#include "fastText/src/quantmatrix.cc"
 #include "fastText/src/vector.cc"
 #include "fastText/src/utils.cc"