Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tic
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wenyuanbo
tic
Commits
c1627aad
Unverified
Commit
c1627aad
authored
Mar 28, 2020
by
Tianqi Chen
Committed by
GitHub
Mar 28, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[BUILD] Fix VTA build in CI (#5165)
parent
bbad7362
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
6 deletions
+16
-6
cmake/modules/VTA.cmake
+1
-1
vta/python/vta/environment.py
+1
-1
vta/vta-hw/config/vta_config.py
+14
-4
No files found.
cmake/modules/VTA.cmake
View file @
c1627aad
...
...
@@ -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
)
...
...
vta/python/vta/environment.py
View file @
c1627aad
...
...
@@ -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."""
...
...
vta/vta-hw/config/vta_config.py
View file @
c1627aad
...
...
@@ -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
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment