Fixed missing pip dep on fresh venv bug; fixed missing pyxsi_utils bug

Author: bwintermann

src/finn/interface/manage_deps.py

@@ -245,7 +245,7 @@ def pull_board(args: tuple) -> bool:
             else:
                 update_status(
                     pkg_name,
-                    f"Installation failed! " f"Expected commit {commit} but got {read_commit}",
+                    f"Installation failed! Expected commit {commit} but got {read_commit}",
                     "red",
                 )
                 return False
@@ -275,11 +275,11 @@ def pull_board(args: tuple) -> bool:
         sys.exit(1)
 
 
-def install_pyxsi():
+def install_pyxsi() -> bool:
     # TODO: integrate properly into the rich.Live above?
     # Will soon be replaced by finnXSI
-    pyxsi_path = os.path.join(get_deps_path(), "pyxsi")
-    pyxsi_so_path = os.path.join(pyxsi_path, "pyxsi.so")
+    pyxsi_path = get_deps_path() / "pyxsi"
+    pyxsi_so_path = pyxsi_path / "pyxsi.so"
 
     # Disable PyXSI makefile Docker wrapper
     os.environ["PYXSI_MAKE_USE_DOCKER"] = "0"
@@ -291,11 +291,13 @@ def install_pyxsi():
         return False
 
     # Check if .so was created
-    if not os.path.isfile(pyxsi_so_path):
+    if not pyxsi_so_path.exists():
         return False
 
     # Set environment variables
     os.environ["PYTHONPATH"] = f"{os.environ['PYTHONPATH']}:{pyxsi_path}:{pyxsi_path}/py"
+    sys.path.append(str(pyxsi_path))
+    sys.path.append(str(pyxsi_path / "py"))
     vivado_path = os.environ["XILINX_VIVADO"]
     if "LD_LIBRARY_PATH" not in os.environ.keys():
         os.environ["LD_LIBRARY_PATH"] = f"/lib/x86_64-linux-gnu/:{vivado_path}/lib/lnx64.o"

src/finn/interface/run_finn.py

@@ -173,9 +173,6 @@ def build(
     config: str,
     model: str,
 ) -> None:
-    from finn.builder.build_dataflow import build_dataflow_cfg
-    from finn.builder.build_dataflow_config import DataflowBuildConfig
-
     config_path = Path(config).expanduser()
     model_path = Path(model).expanduser()
     build_dir = Path(build_path).expanduser() if build_path != "" else None
@@ -190,6 +187,12 @@ def build(
         num_workers,
         skip_dep_update=(skip_dep_update or skip_update_by_default()),
     )
+
+    # Can import from finn now, since all deps are installed
+    # and all environment variables are set correctly
+    from finn.builder.build_dataflow import build_dataflow_cfg
+    from finn.builder.build_dataflow_config import DataflowBuildConfig
+
     status("Creating dataflow build config...")
     dfbc: DataflowBuildConfig | None = None
     match config_path.suffix: