diff --git a/.gitignore b/.gitignore index adce04e177caa7dad2a7665449f1d9f922ade717..4f6a819247b68822cda94ea099f9d51de56c3a24 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,8 @@ build/ docs/_build/ *.a +.vscode/ +builds/ +mace/examples/android/macelibrary/src/main/cpp/mace/ + \.project/ diff --git a/mace/examples/android/build.sh b/mace/examples/android/build.sh index 9a662d9709796155d8cfe9b9829ffba00e3ecd71..1533e80695299f140fb769af93aae5f3ea2fcc06 100755 --- a/mace/examples/android/build.sh +++ b/mace/examples/android/build.sh @@ -5,8 +5,8 @@ set -e -u -o pipefail pushd ../../../ python tools/converter.py build --config=docs/getting_started/models/demo_app_models.yaml -cp -r build/mobilenet/include/ mace/examples/android/macelibrary/src/main/cpp/ -cp -r build/mobilenet/lib/ mace/examples/android/macelibrary/src/main/cpp/ +cp -r builds/mobilenet/include/ mace/examples/android/macelibrary/src/main/cpp/ +cp -r builds/mobilenet/lib/ mace/examples/android/macelibrary/src/main/cpp/ popd diff --git a/tools/converter.py b/tools/converter.py index 9e7973a94ba328b63d5191ee4f739bf12dc7a76f..da590b4fde954693724459744edccaf568f21353 100644 --- a/tools/converter.py +++ b/tools/converter.py @@ -35,10 +35,12 @@ from common import mace_check from common import MaceLogger from common import StringFormatter + +os.environ['TF_CPP_MIN_LOG_LEVEL'] = '2' ################################ # common definitions ################################ -BUILD_OUTPUT_DIR = 'build' +BUILD_OUTPUT_DIR = 'builds' BUILD_DOWNLOADS_DIR = BUILD_OUTPUT_DIR + '/downloads' PHONE_DATA_DIR = "/data/local/tmp/mace_run" MODEL_OUTPUT_DIR_NAME = 'model' diff --git a/tools/sh_commands.py b/tools/sh_commands.py index 1a48fff077b4c1ecada1e12297a8aebf54ee9d6d..7533f77b3b2bab843f810f3f4f3424ba030e0e6a 100644 --- a/tools/sh_commands.py +++ b/tools/sh_commands.py @@ -25,6 +25,7 @@ import subprocess import sys import time import urllib +import platform from enum import Enum import common @@ -1056,10 +1057,15 @@ def merge_libs(target_soc, mri_stream += "save\n" mri_stream += "end\n" - - cmd = sh.Command("%s/toolchains/" % os.environ["ANDROID_NDK_HOME"] + - "aarch64-linux-android-4.9/prebuilt/linux-x86_64/" + - "bin/aarch64-linux-android-ar") + which_sys = platform.system() + if which_sys == "Linux": + cmd = sh.Command("%s/toolchains/" % os.environ["ANDROID_NDK_HOME"] + + "aarch64-linux-android-4.9/prebuilt/linux-x86_64/" + + "bin/aarch64-linux-android-ar") + elif which_sys == "Darwin": + cmd = sh.Command("%s/toolchains/" % os.environ["ANDROID_NDK_HOME"] + + "aarch64-linux-android-4.9/prebuilt/darwin-x86_64/" + + "bin/aarch64-linux-android-ar") cmd("-M", _in=mri_stream) @@ -1076,13 +1082,23 @@ def packaging_lib(libmace_output_dir, project_name): print("Start packaging '%s' libs into %s" % (project_name, tar_package_path)) - sh.tar( - "cvzf", - "%s" % tar_package_path, - glob.glob("%s/*" % project_dir), - "--exclude", - "%s/_tmp" % project_dir, - _fg=True) + which_sys = platform.system() + if which_sys == "Linux": + sh.tar( + "cvzf", + "%s" % tar_package_path, + glob.glob("%s/*" % project_dir), + "--exclude", + "%s/_tmp" % project_dir, + _fg=True) + elif which_sys == "Darwin": + sh.tar( + "--exclude", + "%s/_tmp" % project_dir, + "-cvzf", + "%s" % tar_package_path, + glob.glob("%s/*" % project_dir), + _fg=True) print("Packaging Done!\n")