From 84f13ebd3ec48bb651fb546c14decf34013f7290 Mon Sep 17 00:00:00 2001 From: Carsten Schnober Date: Fri, 25 Oct 2019 12:16:38 +0200 Subject: [PATCH 1/7] Remove claim for Windows/MacOSX binary support (Closes #5). --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 98204a2..7b960a9 100644 --- a/README.md +++ b/README.md @@ -33,11 +33,11 @@ JFastText is ideal for building fast text classifiers in Java. 0.5.0 ``` -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. ## 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/carschno/JFastText From e7c7c12e719c3340f70ddb89eb4fa6b91b0fe85d Mon Sep 17 00:00:00 2001 From: Carsten Schnober Date: Fri, 25 Oct 2019 12:36:40 +0200 Subject: [PATCH 2/7] Bump version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8c13b6..1155405 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.carschno jfasttext - 0.5.0 + 0.9.1-SNAPSHOT Java interface for fastText JFastText is a Java interface for fastText, a library for efficient learning of From 38521029ca1fd597741da185aed9e43ce1bc80d6 Mon Sep 17 00:00:00 2001 From: Carsten Schnober Date: Fri, 25 Oct 2019 12:42:28 +0200 Subject: [PATCH 3/7] Update to FastText v0.9.1. --- src/main/cpp/fastText | 2 +- src/main/cpp/fasttext_wrapper_javacpp.h | 2 +- src/main/java/com/github/jfasttext/FastTextWrapper.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/cpp/fastText b/src/main/cpp/fastText index 7842495..b5b7d30 160000 --- a/src/main/cpp/fastText +++ b/src/main/cpp/fastText @@ -1 +1 @@ -Subproject commit 7842495a4d64c7a3bb4339d45d6e64321d002ed8 +Subproject commit b5b7d307274ce00ef52198fbc692ed3bd11d9856 diff --git a/src/main/cpp/fasttext_wrapper_javacpp.h b/src/main/cpp/fasttext_wrapper_javacpp.h index 3991d2e..a49c223 100644 --- a/src/main/cpp/fasttext_wrapper_javacpp.h +++ b/src/main/cpp/fasttext_wrapper_javacpp.h @@ -6,7 +6,7 @@ #include "fastText/src/matrix.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" diff --git a/src/main/java/com/github/jfasttext/FastTextWrapper.java b/src/main/java/com/github/jfasttext/FastTextWrapper.java index 21db8c4..6f013d9 100644 --- a/src/main/java/com/github/jfasttext/FastTextWrapper.java +++ b/src/main/java/com/github/jfasttext/FastTextWrapper.java @@ -338,7 +338,7 @@ public DoubleIntPair put(float firstValue, int secondValue) { // #include "fastText/src/matrix.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" From 143f94b6eb85c32c7f4f1e30198b01ae51948ac1 Mon Sep 17 00:00:00 2001 From: Carsten Schnober Date: Fri, 25 Oct 2019 14:50:44 +0200 Subject: [PATCH 4/7] Update to most FastText branch with fix for comparePairs() call. cf. https://github.com/facebookresearch/fastText/pull/936 --- src/main/cpp/fastText | 2 +- src/main/cpp/fasttext_wrapper_javacpp.h | 2 ++ src/main/java/com/github/jfasttext/FastTextWrapper.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/cpp/fastText b/src/main/cpp/fastText index b5b7d30..cda295f 160000 --- a/src/main/cpp/fastText +++ b/src/main/cpp/fastText @@ -1 +1 @@ -Subproject commit b5b7d307274ce00ef52198fbc692ed3bd11d9856 +Subproject commit cda295f1b5851df0a26a6ac2ab04230fb864a89d diff --git a/src/main/cpp/fasttext_wrapper_javacpp.h b/src/main/cpp/fasttext_wrapper_javacpp.h index a49c223..93e92e0 100644 --- a/src/main/cpp/fasttext_wrapper_javacpp.h +++ b/src/main/cpp/fasttext_wrapper_javacpp.h @@ -1,8 +1,10 @@ // Added since VS 14.0 complains about missing std::iota #include #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/model.cc" #include "fastText/src/productquantizer.cc" diff --git a/src/main/java/com/github/jfasttext/FastTextWrapper.java b/src/main/java/com/github/jfasttext/FastTextWrapper.java index 6f013d9..02d405c 100644 --- a/src/main/java/com/github/jfasttext/FastTextWrapper.java +++ b/src/main/java/com/github/jfasttext/FastTextWrapper.java @@ -333,8 +333,10 @@ public DoubleIntPair put(float firstValue, int secondValue) { // Added since VS 14.0 complains about missing std::iota // #include // #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/model.cc" // #include "fastText/src/productquantizer.cc" From 685cad2fafb5d6b9280d166bce360ded316a4d9c Mon Sep 17 00:00:00 2001 From: Carsten Schnober Date: Fri, 25 Oct 2019 16:06:38 +0200 Subject: [PATCH 5/7] Include meter.cc. --- src/main/cpp/fasttext_wrapper_javacpp.h | 1 + src/main/java/com/github/jfasttext/FastTextWrapper.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/cpp/fasttext_wrapper_javacpp.h b/src/main/cpp/fasttext_wrapper_javacpp.h index 93e92e0..3666f44 100644 --- a/src/main/cpp/fasttext_wrapper_javacpp.h +++ b/src/main/cpp/fasttext_wrapper_javacpp.h @@ -6,6 +6,7 @@ #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/quantmatrix.cc" diff --git a/src/main/java/com/github/jfasttext/FastTextWrapper.java b/src/main/java/com/github/jfasttext/FastTextWrapper.java index 02d405c..5fe8295 100644 --- a/src/main/java/com/github/jfasttext/FastTextWrapper.java +++ b/src/main/java/com/github/jfasttext/FastTextWrapper.java @@ -338,6 +338,7 @@ public DoubleIntPair put(float firstValue, int secondValue) { // #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/quantmatrix.cc" From 6b125f5312f4aa3ae4b2a79a245df2d66d98cc50 Mon Sep 17 00:00:00 2001 From: Carsten Schnober Date: Sat, 26 Oct 2019 11:14:30 +0200 Subject: [PATCH 6/7] Update Maven dependency version. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b960a9..aa94d55 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ JFastText is ideal for building fast text classifiers in Java. io.github.carschno jfasttext - 0.5.0 + 0.9.1 ``` The Jar package on Maven Central is bundled with precompiled fastText library for ~~Windows,~~ Linux ~~and From 230a5136db4b6fcdc27fb34896234646777f9014 Mon Sep 17 00:00:00 2001 From: Carsten Schnober Date: Sun, 27 Oct 2019 12:20:37 +0100 Subject: [PATCH 7/7] Update Maven dependency version. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 537b711..d4665b7 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ JFastText is ideal for building fast text classifiers in Java. io.github.carschno jfasttext - 0.9.1 + 0.9.1-SNAPSHOT ``` The Jar package on Maven Central is bundled with precompiled fastText library for ~~Windows,~~ Linux ~~and