提交 b48db643 编写于 作者: 叶剑武

fix running on host

fix py code format
上级 0f37ee96
...@@ -24,11 +24,16 @@ cwd = os.path.dirname(__file__) ...@@ -24,11 +24,16 @@ cwd = os.path.dirname(__file__)
# TODO: Remove bazel deps # TODO: Remove bazel deps
try: try:
device.execute("bazel build //mace/proto:mace_py") device.execute("bazel version")
device.execute("cp -f bazel-genfiles/mace/proto/mace_pb2.py %s" % cwd)
device.execute("bazel build //third_party/caffe:caffe_py")
device.execute(
"cp -f bazel-genfiles/third_party/caffe/caffe_pb2.py %s" % cwd)
except: # noqa except: # noqa
MaceLogger.warning("No bazel, use cmake.") MaceLogger.warning("No bazel, use cmake.")
else:
try:
device.execute("bazel build //mace/proto:mace_py")
device.execute("cp -f bazel-genfiles/mace/proto/mace_pb2.py %s" % cwd)
device.execute("bazel build //third_party/caffe:caffe_py")
device.execute(
"cp -f bazel-genfiles/third_party/caffe/caffe_pb2.py %s" % cwd)
except: # noqa
MaceLogger.error("Failed in proto files' building")
...@@ -73,7 +73,7 @@ def run_models(flags, args): ...@@ -73,7 +73,7 @@ def run_models(flags, args):
MaceLogger.info("Run on devices: %s" % run_devices) MaceLogger.info("Run on devices: %s" % run_devices)
for device_id in run_devices: for device_id in run_devices:
dev = device.crete_device(flags.target_abi, device_id) dev = device.create_device(flags.target_abi, device_id)
run_models_for_device(flags, args, dev) run_models_for_device(flags, args, dev)
......
...@@ -44,7 +44,7 @@ def run_target(target_abi, install_dir, target_obj, device_ids="all"): ...@@ -44,7 +44,7 @@ def run_target(target_abi, install_dir, target_obj, device_ids="all"):
for device_id in run_devices: for device_id in run_devices:
# initiate device # initiate device
dev = device.crete_device(target_abi, device_id) dev = device.create_device(target_abi, device_id)
# reinstall target # reinstall target
print("Install target from %s to %s" % (target_obj.path, install_dir)) print("Install target from %s to %s" % (target_obj.path, install_dir))
......
...@@ -94,7 +94,10 @@ class HostDevice(Device): ...@@ -94,7 +94,10 @@ class HostDevice(Device):
if install_dir.strip() and install_dir != os.path.dirname(target.path): if install_dir.strip() and install_dir != os.path.dirname(target.path):
execute("mkdir -p %s" % install_dir) execute("mkdir -p %s" % install_dir)
execute("cp %s %s" % (target.path, install_dir)) if os.path.isdir(target.path):
execute("cp %s/* %s" % (target.path, install_dir))
else:
execute("cp %s %s" % (target.path, install_dir))
for lib in target.libs: for lib in target.libs:
execute("cp %s %s" % (lib, install_dir)) execute("cp %s %s" % (lib, install_dir))
...@@ -285,7 +288,7 @@ def device_class(target_abi): ...@@ -285,7 +288,7 @@ def device_class(target_abi):
return globals()[device_dispatch[target_abi]] return globals()[device_dispatch[target_abi]]
def crete_device(target_abi, device_id=None): def create_device(target_abi, device_id=None):
return device_class(target_abi)(device_id, target_abi) return device_class(target_abi)(device_id, target_abi)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册