Merge branch 'master' of github.com:kpu/kenlm

Magellen · Mar 26, 2018 · 46f0214 · 46f0214
2 parents eb48aaf + 91745e8
commit 46f0214
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 10 deletions.
diff --git a/lm/max_order.hh b/lm/max_order.hh
@@ -7,7 +7,7 @@
  * sizeof(float*) + (kMaxOrder - 1) * sizeof(float) + malloc overhead
  */
 #ifndef KENLM_ORDER_MESSAGE
-#define KENLM_ORDER_MESSAGE "If your build system supports changing KENLM_MAX_ORDER, change it there and recompile.  In the KenLM tarball or Moses, use e.g. `bjam --max-kenlm-order=6 -a'.  Otherwise, edit lm/max_order.hh."
+#define KENLM_ORDER_MESSAGE "If your build system supports changing KENLM_MAX_ORDER, change it there and recompile.  With cmake:\n cmake -DKENLM_MAX_ORDER=10 ..\nWith Moses:\n bjam --max-kenlm-order=10 -a\nOtherwise, edit lm/max_order.hh."
 #endif
 
 #endif // LM_MAX_ORDER_H
diff --git a/windows/kenlm.vcxproj b/windows/kenlm.vcxproj
@@ -161,37 +161,58 @@
     <None Include="..\lm\max_order.hh" />
     <None Include="..\lm\model.hh" />
     <None Include="..\lm\model_type.hh" />
+    <None Include="..\lm\ngram_query.hh" />
+    <None Include="..\lm\partial.hh" />
     <None Include="..\lm\quantize.hh" />
     <None Include="..\lm\read_arpa.hh" />
     <None Include="..\lm\return.hh" />
     <None Include="..\lm\search_hashed.hh" />
     <None Include="..\lm\search_trie.hh" />
-    <None Include="..\lm\test.arpa" />
-    <None Include="..\lm\test_nounk.arpa" />
+    <None Include="..\lm\sizes.hh" />
+    <None Include="..\lm\state.hh" />
     <None Include="..\lm\trie.hh" />
     <None Include="..\lm\trie_sort.hh" />
+    <None Include="..\lm\value_build.hh" />
+    <None Include="..\lm\value.hh" />
     <None Include="..\lm\virtual_interface.hh" />
     <None Include="..\lm\vocab.hh" />
     <None Include="..\lm\weights.hh" />
     <None Include="..\lm\word_index.hh" />
     <None Include="..\util\bit_packing.hh" />
     <None Include="..\util\ersatz_progress.hh" />
     <None Include="..\util\exception.hh" />
+    <None Include="..\util\fake_ifstream.hh" />
+    <None Include="..\util\fake_ostream.hh" />
     <None Include="..\util\file.hh" />
     <None Include="..\util\file_piece.hh" />
+    <None Include="..\util\file_stream.hh" />
+    <None Include="..\util\fixed_array.hh" />
+    <None Include="..\util\float_to_string.hh" />
     <None Include="..\util\getopt.hh" />
     <None Include="..\util\have.hh" />
+    <None Include="..\util\integer_to_string.hh" />
     <None Include="..\util\joint_sort.hh" />
-    <None Include="..\util\key_value_packing.hh" />
+    <None Include="..\util\keep_buffer.hh" />
     <None Include="..\util\mmap.hh" />
+    <None Include="..\util\multi_intersection.hh" />
     <None Include="..\util\murmur_hash.hh" />
+    <None Include="..\util\parallel_read.hh" />
+    <None Include="..\util\pcqueue.hh" />
+    <None Include="..\util\pool.hh" />
     <None Include="..\util\probing_hash_table.hh" />
     <None Include="..\util\proxy_iterator.hh" />
+    <None Include="..\util\read_compressed.hh" />
     <None Include="..\util\scoped.hh" />
     <None Include="..\util\sized_iterator.hh" />
     <None Include="..\util\sorted_uniform.hh" />
+    <None Include="..\util\spaces.hh" />
+    <None Include="..\util\string_piece_hash.hh" />
     <None Include="..\util\string_piece.hh" />
+    <None Include="..\util\string_stream.hh" />
+    <None Include="..\util\sum_exp.hh" />
+    <None Include="..\util\thread_pool.hh" />
     <None Include="..\util\tokenize_piece.hh" />
+    <None Include="..\util\usage.hh" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\lm\value_build.cc" />
@@ -203,10 +224,6 @@
     <ClCompile Include="..\util\double-conversion\fast-dtoa.cc" />
     <ClCompile Include="..\util\double-conversion\fixed-dtoa.cc" />
     <ClCompile Include="..\util\double-conversion\strtod.cc" />
-    <ClCompile Include="..\util\pool.cc" />
-    <ClCompile Include="..\util\read_compressed.cc" />
-    <ClCompile Include="..\util\scoped.cc" />
-    <ClCompile Include="..\util\usage.cc" />
     <ClCompile Include="..\lm\bhiksha.cc" />
     <ClCompile Include="..\lm\binary_format.cc" />
     <ClCompile Include="..\lm\config.cc" />
@@ -219,16 +236,26 @@
     <ClCompile Include="..\lm\sizes.cc" />
     <ClCompile Include="..\lm\trie.cc" />
     <ClCompile Include="..\lm\trie_sort.cc" />
+    <ClCompile Include="..\lm\value_build.cc" />
     <ClCompile Include="..\lm\virtual_interface.cc" />
     <ClCompile Include="..\lm\vocab.cc" />
     <ClCompile Include="..\util\bit_packing.cc" />
     <ClCompile Include="..\util\ersatz_progress.cc" />
     <ClCompile Include="..\util\exception.cc" />
     <ClCompile Include="..\util\file.cc" />
     <ClCompile Include="..\util\file_piece.cc" />
-    <ClCompile Include="..\util\getopt.c" />
+    <ClCompile Include="..\util\float_to_string.cc" />
+    <ClCompile Include="..\util\integer_to_string.cc" />
     <ClCompile Include="..\util\mmap.cc" />
     <ClCompile Include="..\util\murmur_hash.cc" />
+    <ClCompile Include="..\util\parallel_read.cc" />
+    <ClCompile Include="..\util\pool.cc" />
+    <ClCompile Include="..\util\read_compressed.cc" />
+    <ClCompile Include="..\util\scoped.cc" />
+    <ClCompile Include="..\util\spaces.cc" />
+    <ClCompile Include="..\util\string_piece.cc" />
+    <ClCompile Include="..\util\usage.cc" />
+    <ClCompile Include="..\util\getopt.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\util\double-conversion\bignum-dtoa.h" />
@@ -245,4 +272,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>