Synced finn-hlslib version to dev, removed dataset_loading from pip install

Author: bwintermann

external_dependencies.yaml

@@ -21,7 +21,7 @@ git_deps:
         install_editable: False
     finn-hlslib:
         url: "https://github.com/Xilinx/finn-hlslib.git"
-        commit: "5c5ad631e3602a8dd5bd3399a016477a407d6ee7"
+        commit: "5dde96382b84979c6caa6f34cdad2ac72fa28489"
         pip_install: False
         install_editable: False
     attention-hlslib:

pyproject.toml

@@ -42,7 +42,6 @@ finn = "finn.interface.run_finn:main"
 python = ">=3.10,<3.12"
 pybind11 = "3.0.1"                              # pybind11==3.0.1 already for FIFO sim rework, after rework remove module load
 bitstring = "~4.3.1"
-dataset_loading = { git = "https://github.com/fbcotter/dataset_loading.git", rev = "5b9faa226e5f7c857579d31cdd9acde8cdfb816f" }
 numpy = "1.26.4"               # numpy<=1.24.4 required by brevitas
 # Cannot upgrade onnx and onnxruntime any further. For now this seems to be the
 # last compatible pair which is also consistent with qonnx.

src/finn/transformation/fpgadataflow/instrumentation.py

@@ -94,10 +94,10 @@ def apply(self, model):
         prjname = "project_instrwrap"
         ipgentcl = ipgentcl_template
         ipgentcl = ipgentcl.replace("$PROJECTNAME$", prjname)
-        ipgentcl = ipgentcl.replace("$HWSRCDIR$", wrapper_output_dir)
-        ipgentcl = ipgentcl.replace("$FINNHLSLIB$", get_settings().finn_deps / "finn-hlslib")
+        ipgentcl = ipgentcl.replace("$HWSRCDIR$", str(wrapper_output_dir))
+        ipgentcl = ipgentcl.replace("$FINNHLSLIB$", str(get_settings().finn_deps / "finn-hlslib"))
         ipgentcl = ipgentcl.replace(
-            "$ATTENTIONHLSLIB$", get_settings().finn_deps / "attention-hlslib"
+            "$ATTENTIONHLSLIB$", str(get_settings().finn_deps / "attention-hlslib")
         )
         ipgentcl = ipgentcl.replace("$TOPFXN$", "instrumentation_wrapper")
         ipgentcl = ipgentcl.replace("$FPGAPART$", self.fpga_part)