Fix?

Author: Grufoony

CMakeLists.txt

@@ -195,15 +195,14 @@ if(BUILD_PYTHON_BINDINGS)
   endif()
 
   # Add the Python binding module
-  add_library(dsf_python_module MODULE src/dsf/bindings.cpp)
+  pybind11_add_module(dsf_python_module src/dsf/bindings.cpp)
 
   # Ensure the Python module name has no 'lib' prefix on Unix systems
-  set_target_properties(dsf_python_module PROPERTIES PREFIX "" OUTPUT_NAME
-                                                               "dsf_cpp")
+  set_target_properties(dsf_python_module PROPERTIES OUTPUT_NAME "dsf_cpp")
 
   # Link the pybind11 module with your static library and pybind11
   target_link_libraries(
-    dsf_python_module PRIVATE dsf pybind11::module pybind11::headers TBB::tbb
+    dsf_python_module PRIVATE dsf pybind11::headers TBB::tbb
                               spdlog::spdlog)
   target_compile_definitions(dsf_python_module PRIVATE SPDLOG_USE_STD_FORMAT)
 

setup.py

@@ -78,6 +78,11 @@ def build_extension(self, ext: CMakeExtension):
             "-DBUILD_PYTHON_BINDINGS=ON",
         ]
 
+        if platform.system() == "Windows":
+            cmake_args += [
+                f"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{cfg.upper()}={extdir}"
+            ]
+
         # Add macOS-specific CMake prefix paths for Homebrew dependencies
         if platform.system() == "Darwin":  # macOS
             try:
@@ -155,6 +160,33 @@ def build_extension(self, ext: CMakeExtension):
             else:
                 print("Warning: No TBB shared libraries found to copy.")
 
+        elif platform.system() == "Windows":
+            print(f"Searching for TBB DLLs in {build_temp}...")
+            # Look for tbb*.dll recursively
+            tbb_dlls = list(build_temp.glob("**/tbb*.dll"))
+            
+            if tbb_dlls:
+                print(f"Found TBB DLLs: {tbb_dlls}")
+                # We want to copy them to the 'dsf' package directory so we can load them in __init__.py
+                # extdir is where dsf_cpp.pyd is (site-packages root usually)
+                # We want site-packages/dsf/
+                
+                # self.build_lib is usually the root of the build (e.g. build/lib.win...)
+                # So we can construct the path to dsf package
+                dsf_pkg_dir = Path(self.build_lib) / "dsf"
+                dsf_pkg_dir.mkdir(parents=True, exist_ok=True)
+                
+                # Also copy to source directory for editable installs
+                source_dsf_dir = Path(__file__).parent / "src" / "dsf"
+                
+                for dll in tbb_dlls:
+                    print(f"Copying {dll} to {dsf_pkg_dir}")
+                    shutil.copy2(dll, dsf_pkg_dir)
+                    print(f"Copying {dll} to {source_dsf_dir}")
+                    shutil.copy2(dll, source_dsf_dir)
+            else:
+                print("Warning: No TBB DLLs found. This might cause import errors.")
+
     def pre_build(self):
         """Extracts doxygen documentation from XML files and creates a C++ unordered_map"""
 

src/dsf/__init__.py

@@ -1,3 +1,18 @@
+import sys
+import os
+
+# On Windows, we need to explicitly load the bundled TBB DLLs
+if sys.platform == "win32":
+    import glob
+    import ctypes
+    # Look for tbb dlls in the same directory as this __init__.py
+    _dll_dir = os.path.dirname(__file__)
+    for _dll in glob.glob(os.path.join(_dll_dir, "tbb*.dll")):
+        try:
+            ctypes.CDLL(_dll)
+        except Exception as e:
+            print(f"Warning: Failed to load {_dll}: {e}")
+
 from dsf_cpp import __version__, LogLevel, get_log_level, set_log_level, mobility, mdt
 
 from .python.cartography import (