Merge pull request #7 from carschno/fasttext_0.9.1

Upgrade to Fasttext 0.9.1
vinhkhuc · Oct 27, 2019 · 16d19f7 · 16d19f7
2 parents 012397e + 230a513
commit 16d19f7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ JFastText is ideal for building fast text classifiers in Java.
 <dependency>
   <groupId>io.github.carschno</groupId>
   <artifactId>jfasttext</artifactId>
-  <version>0.5.0</version>
+  <version>0.9.1-SNAPSHOT</version>
 </dependency>
 ```
 The Jar package on Maven Central is bundled with precompiled fastText library for ~~Windows,~~ Linux ~~and

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.carschno</groupId>
     <artifactId>jfasttext</artifactId>
-    <version>0.5.0</version>
+    <version>0.9.1-SNAPSHOT</version>
     <name>Java interface for fastText</name>
     <description>
         JFastText is a Java interface for fastText, a library for efficient learning of

diff --git a/src/main/cpp/fastText b/src/main/cpp/fastText
diff --git a/src/main/cpp/fasttext_wrapper_javacpp.h b/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"
 

diff --git a/src/main/java/com/github/jfasttext/FastTextWrapper.java b/src/main/java/com/github/jfasttext/FastTextWrapper.java
@@ -333,12 +333,15 @@ public DoubleIntPair put(float firstValue, int secondValue) {
 // 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"
+27 −27		.circleci/config.yml
+8 −2		CMakeLists.txt
+77 −0		CODE_OF_CONDUCT.md
+16 −7		Makefile
+4 −4		README.md
+43 −4		alignment/README.md
+1 −0		alignment/align.py
+6 −6		alignment/example.sh
+109 −0		alignment/unsup_align.py
+198 −0		alignment/unsup_multialign.py
+26 −0		crawl/README.md
+51 −0		crawl/dedup.cc
+57 −0		crawl/download_crawl.sh
+13 −0		crawl/filter_dedup.sh
+105 −0		crawl/filter_utf8.cc
+30 −0		crawl/process_wet_file.sh
+11 −11		docs/aligned-vectors.md
+138 −0		docs/autotune.md
+23 −0		docs/cheatsheet.md
+54 −54		docs/crawl-vectors.md
+4 −4		docs/english-vectors.md
+7 −2		docs/faqs.md
+2 −2		docs/language-identification.md
+15 −5		docs/options.md
+98 −98		docs/pretrained-vectors.md
+314 −0		docs/python-module.md
+4 −4		docs/supervised-models.md
+337 −29		docs/supervised-tutorial.md
+23 −1		docs/support.md
+188 −18		docs/unsupervised-tutorials.md
+0 −134		pretrained-vectors.md
+265 −38		python/README.md
+327 −53		python/README.rst
+2 −2		python/benchmarks/get_word_vector.py
+1 −1		python/doc/examples/FastTextEmbeddingBag.py
+1 −1		python/doc/examples/bin_to_vec.py
+2 −2		python/doc/examples/compute_accuracy.py
+1 −1		python/doc/examples/get_vocab.py
+1 −1		python/doc/examples/train_supervised.py
+1 −1		python/doc/examples/train_unsupervised.py
+167 −75		python/fasttext_module/fasttext/FastText.py
+4 −0		python/fasttext_module/fasttext/__init__.py
+140 −47		python/fasttext_module/fasttext/pybind/fasttext_pybind.cc
+0 −0		python/fasttext_module/fasttext/tests/__init__.py
+1 −1		python/fasttext_module/fasttext/tests/test_configurations.py
+15 −15		python/fasttext_module/fasttext/tests/test_script.py
+0 −0		python/fasttext_module/fasttext/util/__init__.py
+0 −0		python/fasttext_module/fasttext/util/util.py
+2 −2		runtests.py
+18 −14		setup.py
+123 −2		src/args.cc
+21 −1		src/args.h
+458 −0		src/autotune.cc
+90 −0		src/autotune.h
+167 −0		src/densematrix.cc
+82 −0		src/densematrix.h
+195 −201		src/fasttext.cc
+30 −67		src/fasttext.h
+358 −0		src/loss.cc
+163 −0		src/loss.h
+19 −6		src/main.cc
+7 −115		src/matrix.cc
+12 −46		src/matrix.h
+14 −1		src/meter.cc
+13 −3		src/meter.h
+37 −373		src/model.cc
+39 −93		src/model.h
+1 −1		src/productquantizer.cc
+1 −1		src/productquantizer.h
+0 −59		src/qmatrix.h
+37 −32		src/quantmatrix.cc
+60 −0		src/quantmatrix.h
+21 −0		src/utils.cc
+19 −0		src/utils.h
+4 −30		src/vector.cc
+4 −7		src/vector.h
+1 −1		tests/fetch_test_data.sh
+168 −0		website/blog/2019-06-25-blog-post.md
+5 −4		website/core/Footer.js
+2 −2		website/sidebars.json
+5 −2		website/siteConfig.js
+42 −0		website/static/tabber.js