don't bundle

CMakeLists.txt

@@ -195,7 +195,7 @@ set_target_properties(_bootgen _xclbinutil bootgen-lib cdo_driver xaie
                       xclbinutil-lib PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 set_target_properties(
-  _bootgen _xclbinutil pyxrt xaie xclbinutil-lib xclbinutil
+  _bootgen _xclbinutil pyxrt xaie xclbinutil-lib
   PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_DIR}
              ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIR}
              RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR})

setup.py

@@ -129,12 +129,6 @@ def build_extension(self, ext: CMakeExtension) -> None:
             check=True,
             env=env,
         )
-        subprocess.run(
-            [CMAKE_EXE_PATH, "--build", ".", "--target", "xclbinutil", *build_args],
-            cwd=build_temp,
-            check=True,
-            env=env,
-        )
 
         sys.path.append(str(HERE))
         from util import gen_xaie_ctypes
@@ -146,14 +140,11 @@ def build_extension(self, ext: CMakeExtension) -> None:
         )
 
 
-PACKAGE_NAME = "xaiepy"
-
 build_temp = Path.cwd() / "build" / "temp"
 if not build_temp.exists():
     build_temp.mkdir(parents=True)
 
-
-EXE_EXT = ".exe" if platform.system() == "Windows" else ""
+PACKAGE_NAME = "xaiepy"
 
 setup(
     name=PACKAGE_NAME,
@@ -164,7 +155,6 @@ def build_extension(self, ext: CMakeExtension) -> None:
     cmdclass={"editable_wheel": editable_wheel, "build_ext": CMakeBuild},
     zip_safe=False,
     packages=[PACKAGE_NAME],
-    package_data={PACKAGE_NAME: ["xclbinutil" + EXE_EXT]},
     include_package_data=True,
     install_requires=[
         str(ir.requirement)

tests/test_merge_two_xclbins_through_xclbinutil.py

@@ -1,7 +1,11 @@
-#! /usr/bin/env python
 from pathlib import Path
 
-from xaiepy.xclbinutil import merge_two_xclbins
+import pytest
+
+try:
+    from xaiepy.xclbinutil import merge_two_xclbins
+except:
+    pytest.skip(allow_module_level=True)
 
 
 def test_merge():

xaiepy/xclbinutil.py

@@ -3,6 +3,7 @@
 import os
 import platform
 import random
+import shutil
 import subprocess
 import sys
 from pathlib import Path
@@ -137,10 +138,15 @@ def do_run(command):
     subprocess.check_call(command)
 
 
-_EXE_EXT = ".exe" if platform.system() == "Windows" else ""
-_XCLBIN_PATH = Path(__file__).parent / ("xclbinutil" + _EXE_EXT)
-XCLBIN_PATH = Path(os.getenv("XCLBIN_PATH", _XCLBIN_PATH))
-assert XCLBIN_PATH.exists(), "couldn't find xclbinutil"
+__XCLBIN_PATH = Path("/opt/xilinx/xrt/bin/xclbinutil")
+_XCLBIN_PATH = shutil.which("xclbinutil")
+if os.getenv("XCLBIN_PATH"):
+    XCLBIN_PATH = Path(os.getenv("XCLBIN_PATH"))
+elif _XCLBIN_PATH is not None:
+    XCLBIN_PATH = Path(_XCLBIN_PATH)
+elif __XCLBIN_PATH.exists():
+    XCLBIN_PATH = __XCLBIN_PATH
+assert XCLBIN_PATH is not None and XCLBIN_PATH.exists(), "couldn't find xclbinutil"
 
 
 def get_dpu_kernel_id_from_pdi(pdi):