Merge upstream changes.

CAMeL-Lab · Jan 30, 2024 · f8d74bb · f8d74bb
2 parents 0b12c82 + 35f1458
commit f8d74bb
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 25 deletions.
diff --git a/python/kenlm.cpp b/python/kenlm.cpp
diff --git a/setup.py b/setup.py
@@ -117,13 +117,14 @@ def run(self):
         sources=FILES + ['python/kenlm.cpp'],
         language='C++', 
         include_dirs=['.'] + INCLUDE_PATHS,
+        depends = ['python/BuildStandalone.cmake'],
         libraries=LIBS, 
         extra_compile_args=ARGS),
 ]
 
 setup(
     name='camel-kenlm',
-    version='2023.3.17.2',
+    version='2024.1.30',
     url='https://github.com/CAMeL-Lab/camel-kenlm',
     ext_modules=ext_modules,
     cmdclass={"build_ext": build_ext},

diff --git a/util/pool.hh b/util/pool.hh
@@ -1,6 +1,7 @@
 #ifndef UTIL_POOL_H
 #define UTIL_POOL_H
 
+#include <algorithm>
 #include <cassert>
 #include <cstring>
 #include <vector>

diff --git a/util/string_piece_hash.hh b/util/string_piece_hash.hh
@@ -1,6 +1,7 @@
 #ifndef UTIL_STRING_PIECE_HASH_H
 #define UTIL_STRING_PIECE_HASH_H
 
+#include <functional>
 #include "have.hh"
 #include "string_piece.hh"