wowool-sdk-cpp 3.6.0__tar.gz → 3.6.3__tar.gz

{wowool_sdk_cpp-3.6.0 → wowool_sdk_cpp-3.6.3}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: wowool-sdk-cpp
-Version: 3.6.0
-Summary: Wowool NLP Toolkit C++ SDK Python Bindings
+Version: 3.6.3
+Summary: Wowool NLP Toolkit C++ SDK Python Bindings, (use nlp-wowool-sdk instead if you want the Python SDK)
 Author: Wowool
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{wowool_sdk_cpp-3.6.0 → wowool_sdk_cpp-3.6.3}/pre_setup.py

@@ -147,7 +147,8 @@ def prep_build_setup(wow_stage: Path):
 
     platform_name = platform.system()
     if "Windows" == platform_name:
-        icu_files = ["icudt.lib", "icuuc.lib"]
+        icu_files = ["icudt77.dll", "icuuc77.dll"]
+        icu_lib_folder = stage_bin_folder
     elif "Darwin" == platform_name:
         icu_files = ["libicudata.dylib", "libicuuc.dylib"]
     else:
@@ -196,6 +197,7 @@ def prep_build_setup(wow_stage: Path):
 
     for fn in icu_files:
         target_fn = package_lib_folder / fn
+        logger.info(f"!!!!! COPY ICU {icu_lib_folder} {fn} --> {target_fn}")
         shutil.copy2(icu_lib_folder / fn, target_fn)
         # remove_rpath(target_fn)
         # set_rpath_origin(target_fn)

wowool_sdk_cpp-3.6.3/sdk_version.txt

@@ -0,0 +1 @@
+3.3.0

{wowool_sdk_cpp-3.6.0 → wowool_sdk_cpp-3.6.3}/setup.py

@@ -332,10 +332,13 @@ class BuildExt(build_ext):
         ct = self.compiler.compiler_type
         opts = self.c_opts.get(ct, [])
         link_opts = self.l_opts.get(ct, [])
+        print(f"!!!!!!!!!!! Compiler type: {ct}, opts: {opts}, link_opts: {link_opts}")
         if ct == "unix":
             opts.append(cpp_flag(self.compiler))
             if has_flag(self.compiler, "-fvisibility=hidden"):
                 opts.append("-fvisibility=hidden")
+        elif ct == "msvc":
+            opts.append("/std:c++17")
 
         for ext in self.extensions:
             ext.define_macros = [("VERSION_INFO", '"{}"'.format(self.distribution.get_version()))]
@@ -404,6 +407,7 @@ def extension_modules():
         library_dirs = [str(Path(WOWOOL_STAGE, "lib")), get_config_var("LIBDEST")]
         libraries = ["wowool"]
         plugin_libraries = libraries
+        extra_compile_args.extend(["/DWIN32"])
     else:
         runtime_library_dirs = [runtime_library_path]
         extra_link_args = ["-Xlinker", "-rpath", "-Xlinker", get_origin_keyword(), "-static-libstdc++"]
@@ -486,11 +490,11 @@ install_requires = [
 version = open("version.txt").read().strip()
 
 
-results = setup(
+setup(
     name=package_name,
     version=version,
     author="Wowool",
-    description="Wowool NLP Toolkit C++ SDK Python Bindings",
+    description="Wowool NLP Toolkit C++ SDK Python Bindings, (use nlp-wowool-sdk instead if you want the Python SDK)",
     long_description=long_description,
     long_description_content_type="text/markdown",
     setup_requires=["pybind11"],

wowool_sdk_cpp-3.6.3/version.txt

@@ -0,0 +1 @@
+3.6.3

{wowool_sdk_cpp-3.6.0 → wowool_sdk_cpp-3.6.3}/wowool/native/core/wowool_sdk.cpp

@@ -38,13 +38,15 @@ namespace py = pybind11;
 std::mutex global_python_mutex;
 #define PYTHON_LOCK std::lock_guard<std::mutex> guard(global_python_mutex);
 
-bool get_environment_bool(std::string const &env_id, bool default_value) {
-  char const *value_ptr = std::getenv(env_id.c_str());
-  if (value_ptr) {
-    std::string value(value_ptr);
-    return value == "true" or value == "True";
-  }
-  return default_value;
+bool get_environment_bool(std::string const &env_id, bool default_value)
+{
+	char const *value_ptr = std::getenv(env_id.c_str());
+	if (value_ptr)
+	{
+		std::string value(value_ptr);
+		return value == "true" || value == "True";
+	}
+	return default_value;
 }
 
 bool lock_gil = get_environment_bool("WOWOOL_LOCK_GIL", false);

{wowool_sdk_cpp-3.6.0 → wowool_sdk_cpp-3.6.3}/wowool/package/lib/wowool_plugin.py

@@ -1,13 +1,13 @@
 from pathlib import Path
 import os
 import sys
+from platform import system
 
 if "WOWOOL_ROOT" in os.environ:
     WOWOOL_ROOT = os.environ["WOWOOL_ROOT"]
     expanded_wowool_root = Path(WOWOOL_ROOT).expanduser().resolve()
-    import platform
-
-    if platform.system() == "Windows":
+    
+    if system() == "Windows":
         WOWOOL_LIB = expanded_wowool_root / "bin"
         if str(WOWOOL_LIB) not in sys.path:
             sys.path.append(str(WOWOOL_LIB))
@@ -19,4 +19,7 @@ else:
 if str(WOWOOL_LIB) not in sys.path:
     sys.path.append(str(WOWOOL_LIB))
 
+if system() == "Windows":
+    os.add_dll_directory(str(WOWOOL_LIB))
+
 from _wowool_plugin import *  # noqa: F401, F403

{wowool_sdk_cpp-3.6.0 → wowool_sdk_cpp-3.6.3}/wowool/package/lib/wowool_sdk.py

@@ -1,14 +1,13 @@
 from pathlib import Path
 import os
 import sys
-
+from platform import system
 
 if "WOWOOL_ROOT" in os.environ:
     WOWOOL_ROOT = os.environ["WOWOOL_ROOT"]
     expanded_wowool_root = Path(WOWOOL_ROOT).expanduser().resolve()
-    import platform
-
-    if platform.system() == "Windows":
+    
+    if system() == "Windows":
         WOWOOL_LIB = expanded_wowool_root / "bin"
         if str(WOWOOL_LIB) not in sys.path:
             sys.path.append(str(WOWOOL_LIB))
@@ -20,6 +19,8 @@ else:
 if str(WOWOOL_LIB) not in sys.path:
     sys.path.append(str(WOWOOL_LIB))
 
+if system() == "Windows":
+    os.add_dll_directory(str(WOWOOL_LIB))
 
 from _wowool_sdk import *  # noqa
 from _wowool_sdk import (

{wowool_sdk_cpp-3.6.0 → wowool_sdk_cpp-3.6.3}/wowool_sdk_cpp.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: wowool-sdk-cpp
-Version: 3.6.0
-Summary: Wowool NLP Toolkit C++ SDK Python Bindings
+Version: 3.6.3
+Summary: Wowool NLP Toolkit C++ SDK Python Bindings, (use nlp-wowool-sdk instead if you want the Python SDK)
 Author: Wowool
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

wowool_sdk_cpp-3.6.0/sdk_version.txt

@@ -1 +0,0 @@
-3.2.0

wowool_sdk_cpp-3.6.0/version.txt

@@ -1 +0,0 @@
-3.6.0