[BUILD] Fix VTA build in CI (#5165)
diff --git a/python/vta/environment.py b/python/vta/environment.py
index 22ae0f9..ddd6b7a 100644
--- a/python/vta/environment.py
+++ b/python/vta/environment.py
@@ -30,7 +30,7 @@
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-hw/config/vta_config.py b/vta-hw/config/vta_config.py
index 3b84076..9bb6d7b 100644
--- a/vta-hw/config/vta_config.py
+++ b/vta-hw/config/vta_config.py
@@ -108,11 +108,21 @@
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:
