diff --git a/libmace.mri b/libmace.mri deleted file mode 100644 index f121d007d2fb7181c7b472fde8423c1093897d16..0000000000000000000000000000000000000000 --- a/libmace.mri +++ /dev/null @@ -1,8 +0,0 @@ -create build/lib/libmace_generated.a -addlib lib/mace/libmace.a -addlib lib/mace/libmace_prod.a -addlib bazel-bin/codegen/libgenerated_models.a -addlib bazel-bin/codegen/libgenerated_opencl_prod.a -addlib bazel-bin/codegen/libgenerated_tuning_params.a -save -end diff --git a/libmace_local.mri b/libmace_local.mri deleted file mode 100644 index 3d503811ce757ff0f16cf634948074c6a4bdd179..0000000000000000000000000000000000000000 --- a/libmace_local.mri +++ /dev/null @@ -1,6 +0,0 @@ -create build/lib/libmace_generated.a -addlib lib/mace/libmace.a -addlib lib/mace/libmace_prod.a -addlib bazel-bin/codegen/libgenerated_models.pic.a -save -end diff --git a/mace_tools.py b/mace_tools.py index 1c00c5cfb0623e58b9666d37a738f5ad761dbbf1..b4b077321bf97ed82e0444dc9b26ca4593c97378 100644 --- a/mace_tools.py +++ b/mace_tools.py @@ -1,5 +1,6 @@ #!/usr/bin/env python +# Must run at root dir of libmace project. # python tools/mace_tools.py \ # --global_config=models/config \ # --round=100 \ @@ -178,21 +179,18 @@ def parse_model_configs(): model_dirs = [] model_output_map = {} if ("models" in config_sections) and (config_parser.items("models")): - model_dirs_relative_to_config_str = config_parser.get( + model_dirs_str = config_parser.get( "models", "DIRECTORIES") - model_dirs_relative_to_config_str = model_dirs_relative_to_config_str.rstrip( + model_dirs_str = model_dirs_str.rstrip( ",") # Remove repetition element - model_dirs_relative_to_config_str_list = list( - set(model_dirs_relative_to_config_str.split(","))) - - for d in model_dirs_relative_to_config_str_list: - model_dir = os.path.join(global_config_dir, d) - model_dirs.append(model_dir) + model_dirs = list( + set(model_dirs_str.split(","))) + for model_dir in model_dirs: # Create output dirs - model_output_dir = os.path.join(FLAGS.output_dir, d) + model_output_dir = os.path.join(FLAGS.output_dir, model_dir) model_output_map[model_dir] = model_output_dir else: diff --git a/model.config b/model.config deleted file mode 100644 index e6c28e4f6e8044a4addb05c8948f372398de69cd..0000000000000000000000000000000000000000 --- a/model.config +++ /dev/null @@ -1,16 +0,0 @@ -; [models] -; DIRECTORIES = mobile_net/64/ - -[configs] -; If exists 'models' section, this section will be global variable to sub models -; Otherwise this is the model's config and must be put in the same dirs with model.pb -TF_INPUT_NODE=input -TF_OUTPUT_NODE=output -MODEL_TAG=mobile_net -INPUT_SHAPE=1,64,64,3 -OUTPUT_SHAPE=1,64,64,2 -RUNTIME=gpu -TUNING_OR_NOT=1 -ANDROID_ABI=armeabi-v7a ; Or 'arm64-v8a' -LIMIT_OPENCL_KERNEL_TIME=0 -DSP_MODE=0 ; used only for dsp