[BUILD] Fix VTA build in CI (apache#5165)

neo-ai · Apr 17, 2020 · 0be8888 · 0be8888
1 parent c676ee5
commit 0be8888
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/cmake/modules/VTA.cmake b/cmake/modules/VTA.cmake
@@ -20,7 +20,7 @@ find_program(PYTHON NAMES python python3 python3.6)
 
 # Throw error if VTA_HW_PATH is not set
 if(NOT DEFINED ENV{VTA_HW_PATH})
-    set(ENV{VTA_HW_PATH} vta/vta-hw)
+    set(ENV{VTA_HW_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/vta/vta-hw)
 endif()
 
 if(MSVC)

diff --git a/vta/python/vta/environment.py b/vta/python/vta/environment.py
@@ -30,7 +30,7 @@ def get_vta_hw_path():
     curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
     vta_hw_default = os.path.abspath(os.path.join(curr_path, "../../vta-hw"))
     VTA_HW_PATH = os.getenv('VTA_HW_PATH', vta_hw_default)
-    return VTA_HW_PATH
+    return os.path.abspath(VTA_HW_PATH)
 
 def pkg_config(cfg):
     """Returns PkgConfig pkg config object."""

diff --git a/vta/vta-hw/config/vta_config.py b/vta/vta-hw/config/vta_config.py
@@ -108,11 +108,21 @@ def main():
         return
 
     # Path to vta config
-    config_path = "vta_config.json"
-    if not os.path.exists(config_path):
-        raise RuntimeError("Cannot find config in %s" % str(config_path))
-    cfg = json.load(open(config_path))
+    curr_path = os.path.dirname(
+        os.path.abspath(os.path.expanduser(__file__)))
 
+    path_list = [
+        "vta_config.json", os.path.join(curr_path, "vta_config.json")
+    ]
+
+    if args.use_cfg:
+        path_list = [args.use_cfg]
+
+    ok_path_list = [p for p in path_list if os.path.exists(p)]
+    if not ok_path_list:
+        raise RuntimeError("Cannot find config in %s" % str(path_list))
+
+    cfg = json.load(open(ok_path_list[0]))
     pkg = pkg_config(cfg)
 
     if args.target: