From d3e3a0cb2993b2ca17411724f1417ebce225189c Mon Sep 17 00:00:00 2001 From: Advait Jain Date: Mon, 27 Mar 2023 10:03:06 -0700 Subject: [PATCH 1/2] Delete the magic_wand example We are moving in a direction where the goal of the code within the TFLM examples directory is to illustrate how to use different functionality of the framework. Examples that don't exercise very different functionality from the others can be removed. BUG=cleanup --- .../lite/micro/examples/magic_wand/BUILD | 171 ------------- .../micro/examples/magic_wand/Makefile.inc | 85 ------- .../lite/micro/examples/magic_wand/README.md | 33 --- .../magic_wand/accelerometer_handler.cc | 35 --- .../magic_wand/accelerometer_handler.h | 27 -- .../magic_wand/accelerometer_handler_test.cc | 44 ---- .../micro/examples/magic_wand/constants.h | 38 --- .../examples/magic_wand/gesture_predictor.cc | 72 ------ .../examples/magic_wand/gesture_predictor.h | 21 -- .../magic_wand/gesture_predictor_test.cc | 66 ----- .../examples/magic_wand/magic_wand.tflite | Bin 19616 -> 0 bytes .../examples/magic_wand/magic_wand_test.cc | 145 ----------- .../lite/micro/examples/magic_wand/main.cc | 27 -- .../examples/magic_wand/main_functions.cc | 113 --------- .../examples/magic_wand/main_functions.h | 37 --- .../examples/magic_wand/output_handler.cc | 37 --- .../examples/magic_wand/output_handler.h | 23 -- .../magic_wand/output_handler_test.cc | 29 --- .../magic_wand/ring_micro_features_data.cc | 65 ----- .../magic_wand/ring_micro_features_data.h | 23 -- .../magic_wand/slope_micro_features_data.cc | 65 ----- .../magic_wand/slope_micro_features_data.h | 23 -- .../micro/examples/magic_wand/train/README.md | 191 -------------- .../magic_wand/train/data_augmentation.py | 71 ------ .../train/data_augmentation_test.py | 56 ----- .../examples/magic_wand/train/data_load.py | 104 -------- .../magic_wand/train/data_load_test.py | 97 ------- .../examples/magic_wand/train/data_prepare.py | 162 ------------ .../magic_wand/train/data_prepare_test.py | 73 ------ .../examples/magic_wand/train/data_split.py | 89 ------- .../magic_wand/train/data_split_person.py | 73 ------ .../train/data_split_person_test.py | 52 ---- .../magic_wand/train/data_split_test.py | 76 ------ .../magic_wand/train/netmodels/CNN/weights.h5 | Bin 40512 -> 0 bytes .../magic_wand/train/requirements.txt | 2 - .../micro/examples/magic_wand/train/train.py | 200 --------------- .../train/train_magic_wand_model.ipynb | 238 ------------------ .../examples/magic_wand/train/train_test.py | 76 ------ 38 files changed, 2739 deletions(-) delete mode 100644 tensorflow/lite/micro/examples/magic_wand/BUILD delete mode 100644 tensorflow/lite/micro/examples/magic_wand/Makefile.inc delete mode 100644 tensorflow/lite/micro/examples/magic_wand/README.md delete mode 100644 tensorflow/lite/micro/examples/magic_wand/accelerometer_handler.cc delete mode 100644 tensorflow/lite/micro/examples/magic_wand/accelerometer_handler.h delete mode 100644 tensorflow/lite/micro/examples/magic_wand/accelerometer_handler_test.cc delete mode 100644 tensorflow/lite/micro/examples/magic_wand/constants.h delete mode 100644 tensorflow/lite/micro/examples/magic_wand/gesture_predictor.cc delete mode 100644 tensorflow/lite/micro/examples/magic_wand/gesture_predictor.h delete mode 100644 tensorflow/lite/micro/examples/magic_wand/gesture_predictor_test.cc delete mode 100755 tensorflow/lite/micro/examples/magic_wand/magic_wand.tflite delete mode 100644 tensorflow/lite/micro/examples/magic_wand/magic_wand_test.cc delete mode 100644 tensorflow/lite/micro/examples/magic_wand/main.cc delete mode 100644 tensorflow/lite/micro/examples/magic_wand/main_functions.cc delete mode 100644 tensorflow/lite/micro/examples/magic_wand/main_functions.h delete mode 100644 tensorflow/lite/micro/examples/magic_wand/output_handler.cc delete mode 100644 tensorflow/lite/micro/examples/magic_wand/output_handler.h delete mode 100644 tensorflow/lite/micro/examples/magic_wand/output_handler_test.cc delete mode 100644 tensorflow/lite/micro/examples/magic_wand/ring_micro_features_data.cc delete mode 100644 tensorflow/lite/micro/examples/magic_wand/ring_micro_features_data.h delete mode 100644 tensorflow/lite/micro/examples/magic_wand/slope_micro_features_data.cc delete mode 100644 tensorflow/lite/micro/examples/magic_wand/slope_micro_features_data.h delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/README.md delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/data_augmentation.py delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/data_augmentation_test.py delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/data_load.py delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/data_load_test.py delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/data_prepare.py delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/data_prepare_test.py delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/data_split.py delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/data_split_person.py delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/data_split_person_test.py delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/data_split_test.py delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/netmodels/CNN/weights.h5 delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/requirements.txt delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/train.py delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/train_magic_wand_model.ipynb delete mode 100644 tensorflow/lite/micro/examples/magic_wand/train/train_test.py diff --git a/tensorflow/lite/micro/examples/magic_wand/BUILD b/tensorflow/lite/micro/examples/magic_wand/BUILD deleted file mode 100644 index 238614c6196..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/BUILD +++ /dev/null @@ -1,171 +0,0 @@ -# Description: -# TensorFlow Lite for Microcontrollers "gesture recognition" example. -load("//tensorflow/lite/micro:build_def.bzl", "generate_cc_arrays") - -package( - default_visibility = ["//visibility:public"], - # Disabling layering_check because of http://b/177257332 - features = ["-layering_check"], - licenses = ["notice"], -) - -generate_cc_arrays( - name = "generated_magic_wand_model_cc", - src = "magic_wand.tflite", - out = "magic_wand_model_data.cc", -) - -generate_cc_arrays( - name = "generated_magic_wand_model_hdr", - src = "magic_wand.tflite", - out = "magic_wand_model_data.h", -) - -cc_library( - name = "magic_wand_model_data", - srcs = [ - ":generated_magic_wand_model_cc", - ], - hdrs = [ - ":generated_magic_wand_model_hdr", - ], -) - -cc_library( - name = "sample_feature_data", - srcs = [ - "ring_micro_features_data.cc", - "slope_micro_features_data.cc", - ], - hdrs = [ - "ring_micro_features_data.h", - "slope_micro_features_data.h", - ], -) - -cc_test( - name = "magic_wand_test", - srcs = [ - "magic_wand_test.cc", - ], - deps = [ - ":magic_wand_model_data", - ":sample_feature_data", - "//tensorflow/lite/micro:micro_framework", - "//tensorflow/lite/micro:micro_log", - "//tensorflow/lite/micro:op_resolvers", - "//tensorflow/lite/micro/testing:micro_test", - "//tensorflow/lite/schema:schema_fbs", - ], -) - -cc_library( - name = "constants", - hdrs = [ - "constants.h", - ], -) - -cc_library( - name = "accelerometer_handler", - srcs = [ - "accelerometer_handler.cc", - ], - hdrs = [ - "accelerometer_handler.h", - ], - deps = [ - "//tensorflow/lite/c:common", - ], -) - -cc_test( - name = "accelerometer_handler_test", - srcs = [ - "accelerometer_handler_test.cc", - ], - deps = [ - ":accelerometer_handler", - "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", - "//tensorflow/lite/micro:op_resolvers", - "//tensorflow/lite/micro/testing:micro_test", - ], -) - -cc_library( - name = "gesture_predictor", - srcs = [ - "gesture_predictor.cc", - ], - hdrs = [ - "gesture_predictor.h", - ], - deps = [ - ":constants", - ], -) - -cc_test( - name = "gesture_predictor_test", - srcs = [ - "gesture_predictor_test.cc", - ], - deps = [ - ":constants", - ":gesture_predictor", - "//tensorflow/lite/micro:micro_framework", - "//tensorflow/lite/micro/testing:micro_test", - ], -) - -cc_library( - name = "output_handler", - srcs = [ - "output_handler.cc", - ], - hdrs = [ - "output_handler.h", - ], - deps = [ - "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_log", - ], -) - -cc_test( - name = "output_handler_test", - srcs = [ - "output_handler_test.cc", - ], - deps = [ - ":output_handler", - "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", - "//tensorflow/lite/micro/testing:micro_test", - ], -) - -cc_binary( - name = "magic_wand", - srcs = [ - "main.cc", - "main_functions.cc", - "main_functions.h", - ], - copts = [ - "-Werror", - "-Wsign-compare", - ], - deps = [ - ":accelerometer_handler", - ":constants", - ":gesture_predictor", - ":magic_wand_model_data", - ":output_handler", - "//tensorflow/lite/micro:micro_framework", - "//tensorflow/lite/micro:op_resolvers", - "//tensorflow/lite/micro:system_setup", - "//tensorflow/lite/schema:schema_fbs", - ], -) diff --git a/tensorflow/lite/micro/examples/magic_wand/Makefile.inc b/tensorflow/lite/micro/examples/magic_wand/Makefile.inc deleted file mode 100644 index fc19bb4e3bc..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/Makefile.inc +++ /dev/null @@ -1,85 +0,0 @@ -ACCELEROMETER_HANDLER_TEST_SRCS := \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/accelerometer_handler.cc \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/accelerometer_handler_test.cc - -ACCELEROMETER_HANDLER_TEST_HDRS := \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/accelerometer_handler.h - -OUTPUT_HANDLER_TEST_SRCS := \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/output_handler.cc \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/output_handler_test.cc - -OUTPUT_HANDLER_TEST_HDRS := \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/output_handler.h - -GESTURE_PREDICTOR_TEST_SRCS := \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/gesture_predictor.cc \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/gesture_predictor_test.cc - -GESTURE_PREDICTOR_TEST_HDRS := \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/constants.h \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/gesture_predictor.h \ - -magic_wand_TEST_SRCS := \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/magic_wand_test.cc \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/slope_micro_features_data.cc \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/ring_micro_features_data.cc - -magic_wand_TEST_HDRS := \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/slope_micro_features_data.h \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/ring_micro_features_data.h - -magic_wand_SRCS := \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/main.cc \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/main_functions.cc \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/accelerometer_handler.cc \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/gesture_predictor.cc \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/output_handler.cc - -magic_wand_HDRS := \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/main_functions.h \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/constants.h \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/accelerometer_handler.h \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/gesture_predictor.h \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/output_handler.h - -magic_wand_GENERATOR_INPUTS := \ -$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/magic_wand.tflite - -magic_wand_GENERATED_SRCS := \ -$(GENERATED_SRCS_DIR)$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/magic_wand_model_data.cc - -magic_wand_GENERATED_HDRS := \ -$(GENERATED_SRCS_DIR)$(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/magic_wand_model_data.h - -#Find any platform - specific rules for this example. -include $(wildcard $(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/*/Makefile.inc) - -# Tests the accelerometer handler -$(eval $(call microlite_test,gesture_accelerometer_handler_test,\ -$(ACCELEROMETER_HANDLER_TEST_SRCS),$(ACCELEROMETER_HANDLER_TEST_HDRS))) - -# Tests the output handler -$(eval $(call microlite_test,gesture_output_handler_test,\ -$(OUTPUT_HANDLER_TEST_SRCS),$(OUTPUT_HANDLER_TEST_HDRS))) - -# Tests the gesture predictor -$(eval $(call microlite_test,gesture_predictor_test,\ -$(GESTURE_PREDICTOR_TEST_SRCS),$(GESTURE_PREDICTOR_TEST_HDRS))) - -# Tests loading and running the gesture recognition model -$(eval $(call microlite_test,magic_wand_test,\ -$(magic_wand_TEST_SRCS),$(magic_wand_TEST_HDRS),$(magic_wand_GENERATOR_INPUTS))) - -# Builds a standalone binary -$(eval $(call microlite_test,magic_wand,\ -$(magic_wand_SRCS),$(magic_wand_HDRS),$(magic_wand_GENERATOR_INPUTS))) - -magic_wand_SRCS += $(magic_wand_GENERATED_SRCS) -magic_wand_HDRS += $(magic_wand_GENERATED_HDRS) - -list_magic_wand_example_sources: - @echo $(magic_wand_SRCS) - -list_magic_wand_example_headers: - @echo $(magic_wand_HDRS) \ No newline at end of file diff --git a/tensorflow/lite/micro/examples/magic_wand/README.md b/tensorflow/lite/micro/examples/magic_wand/README.md deleted file mode 100644 index e8eb3d8fa41..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# Magic wand example - -This example shows how you can use TensorFlow Lite to run a 20 kilobyte neural -network model to recognize gestures with an accelerometer. - -## Table of contents - -- [Getting started](#getting-started) -- [Run the tests on a development machine](#run-the-tests-on-a-development-machine) -- [Train your own model](#train-your-own-model) - -To stop viewing the debug output with `screen`, hit `Ctrl+A`, immediately -followed by the `K` key, then hit the `Y` key. - -## Run the tests on a development machine - -```bash -make -f tensorflow/lite/micro/tools/make/Makefile test_magic_wand_test -``` - -This will take a few minutes, and downloads frameworks the code uses like -[flatbuffers](https://google.github.io/flatbuffers/). Once that process has -finished, you should see a series of files get compiled, followed by some -logging output from a test, which should conclude with `~~~ALL TESTS PASSED~~~`. - -If you see this, it means that a small program has been built and run that loads -the trained TensorFlow model, runs some example inputs through it, and got the -expected outputs. - -## Train your own model - -To train your own model, or create a new model for a new set of gestures, -follow the instructions in [magic_wand/train/README.md](train/README.md). diff --git a/tensorflow/lite/micro/examples/magic_wand/accelerometer_handler.cc b/tensorflow/lite/micro/examples/magic_wand/accelerometer_handler.cc deleted file mode 100644 index 8cb6045f908..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/accelerometer_handler.cc +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#include "tensorflow/lite/micro/examples/magic_wand/accelerometer_handler.h" - -int begin_index = 0; - -TfLiteStatus SetupAccelerometer() { return kTfLiteOk; } - -bool ReadAccelerometer(float* input, int length) { - begin_index += 3; - // Reset begin_index to simulate behavior of loop buffer - if (begin_index >= 600) begin_index = 0; - // Only return true after the function was called 100 times, simulating the - // desired behavior of a real implementation (which does not return data until - // a sufficient amount is available) - if (begin_index > 300) { - for (int i = 0; i < length; ++i) input[i] = 0; - return true; - } else { - return false; - } -} diff --git a/tensorflow/lite/micro/examples/magic_wand/accelerometer_handler.h b/tensorflow/lite/micro/examples/magic_wand/accelerometer_handler.h deleted file mode 100644 index 726909291ba..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/accelerometer_handler.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#ifndef TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_ACCELEROMETER_HANDLER_H_ -#define TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_ACCELEROMETER_HANDLER_H_ - -#define kChannelNumber 3 - -#include "tensorflow/lite/c/common.h" - -extern int begin_index; -extern TfLiteStatus SetupAccelerometer(); -extern bool ReadAccelerometer(float* input, int length); - -#endif // TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_ACCELEROMETER_HANDLER_H_ diff --git a/tensorflow/lite/micro/examples/magic_wand/accelerometer_handler_test.cc b/tensorflow/lite/micro/examples/magic_wand/accelerometer_handler_test.cc deleted file mode 100644 index 391cb5e5de9..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/accelerometer_handler_test.cc +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2018 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#include "tensorflow/lite/micro/examples/magic_wand/accelerometer_handler.h" - -#include - -#include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/micro/testing/micro_test.h" - -TF_LITE_MICRO_TESTS_BEGIN - -TF_LITE_MICRO_TEST(TestSetup) { - TfLiteStatus setup_status = SetupAccelerometer(); - TF_LITE_MICRO_EXPECT_EQ(kTfLiteOk, setup_status); -} - -TF_LITE_MICRO_TEST(TestAccelerometer) { - float input[384] = {0.0}; - // Test that the function returns false before insufficient data is available - bool inference_flag = ReadAccelerometer(input, 384); - TF_LITE_MICRO_EXPECT_EQ(inference_flag, false); - - // Test that the function returns true once sufficient data is available to - // fill the model's input buffer (128 sets of values) - for (int i = 1; i <= 128; i++) { - inference_flag = ReadAccelerometer(input, 384); - } - TF_LITE_MICRO_EXPECT_EQ(inference_flag, true); -} - -TF_LITE_MICRO_TESTS_END diff --git a/tensorflow/lite/micro/examples/magic_wand/constants.h b/tensorflow/lite/micro/examples/magic_wand/constants.h deleted file mode 100644 index 3f0da6c9a83..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/constants.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#ifndef TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_CONSTANTS_H_ -#define TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_CONSTANTS_H_ - -// The expected accelerometer data sample frequency -const float kTargetHz = 25; - -// What gestures are supported. -constexpr int kGestureCount = 4; -constexpr int kWingGesture = 0; -constexpr int kRingGesture = 1; -constexpr int kSlopeGesture = 2; -constexpr int kNoGesture = 3; - -// These control the sensitivity of the detection algorithm. If you're seeing -// too many false positives or not enough true positives, you can try tweaking -// these thresholds. Often, increasing the size of the training set will give -// more robust results though, so consider retraining if you are seeing poor -// predictions. -constexpr float kDetectionThreshold = 0.8f; -constexpr int kPredictionHistoryLength = 5; -constexpr int kPredictionSuppressionDuration = 25; - -#endif // TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_CONSTANTS_H_ diff --git a/tensorflow/lite/micro/examples/magic_wand/gesture_predictor.cc b/tensorflow/lite/micro/examples/magic_wand/gesture_predictor.cc deleted file mode 100644 index b09499a836d..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/gesture_predictor.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#include "tensorflow/lite/micro/examples/magic_wand/gesture_predictor.h" - -#include "tensorflow/lite/micro/examples/magic_wand/constants.h" - -namespace { -// State for the averaging algorithm we're using. -float prediction_history[kGestureCount][kPredictionHistoryLength] = {}; -int prediction_history_index = 0; -int prediction_suppression_count = 0; -} // namespace - -// Return the result of the last prediction -// 0: wing("W"), 1: ring("O"), 2: slope("angle"), 3: unknown -int PredictGesture(float* output) { - // Record the latest predictions in our rolling history buffer. - for (int i = 0; i < kGestureCount; ++i) { - prediction_history[i][prediction_history_index] = output[i]; - } - // Figure out which slot to put the next predictions into. - ++prediction_history_index; - if (prediction_history_index >= kPredictionHistoryLength) { - prediction_history_index = 0; - } - - // Average the last n predictions for each gesture, and find which has the - // highest score. - int max_predict_index = -1; - float max_predict_score = 0.0f; - for (int i = 0; i < kGestureCount; i++) { - float prediction_sum = 0.0f; - for (int j = 0; j < kPredictionHistoryLength; ++j) { - prediction_sum += prediction_history[i][j]; - } - const float prediction_average = prediction_sum / kPredictionHistoryLength; - if ((max_predict_index == -1) || (prediction_average > max_predict_score)) { - max_predict_index = i; - max_predict_score = prediction_average; - } - } - - // If there's been a recent prediction, don't trigger a new one too soon. - if (prediction_suppression_count > 0) { - --prediction_suppression_count; - } - // If we're predicting no gesture, or the average score is too low, or there's - // been a gesture recognised too recently, return no gesture. - if ((max_predict_index == kNoGesture) || - (max_predict_score < kDetectionThreshold) || - (prediction_suppression_count > 0)) { - return kNoGesture; - } else { - // Reset the suppression counter so we don't come up with another prediction - // too soon. - prediction_suppression_count = kPredictionSuppressionDuration; - return max_predict_index; - } -} diff --git a/tensorflow/lite/micro/examples/magic_wand/gesture_predictor.h b/tensorflow/lite/micro/examples/magic_wand/gesture_predictor.h deleted file mode 100644 index 713cb561035..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/gesture_predictor.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#ifndef TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_GESTURE_PREDICTOR_H_ -#define TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_GESTURE_PREDICTOR_H_ - -extern int PredictGesture(float* output); - -#endif // TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_GESTURE_PREDICTOR_H_ diff --git a/tensorflow/lite/micro/examples/magic_wand/gesture_predictor_test.cc b/tensorflow/lite/micro/examples/magic_wand/gesture_predictor_test.cc deleted file mode 100644 index 7488666df05..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/gesture_predictor_test.cc +++ /dev/null @@ -1,66 +0,0 @@ -/* Copyright 2018 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#include "tensorflow/lite/micro/examples/magic_wand/gesture_predictor.h" - -#include "tensorflow/lite/micro/examples/magic_wand/constants.h" -#include "tensorflow/lite/micro/testing/micro_test.h" - -TF_LITE_MICRO_TESTS_BEGIN - -TF_LITE_MICRO_TEST(SuccessfulPrediction) { - // Use the threshold from the 0th gesture. - float probabilities[kGestureCount] = {kDetectionThreshold, 0.0, 0.0, 0.0}; - int prediction; - // Loop just too few times to trigger a prediction. - for (int i = 0; i < kPredictionHistoryLength - 1; i++) { - prediction = PredictGesture(probabilities); - TF_LITE_MICRO_EXPECT_EQ(prediction, kNoGesture); - } - // Call once more, triggering a prediction - // for category 0. - prediction = PredictGesture(probabilities); - TF_LITE_MICRO_EXPECT_EQ(prediction, 0); -} - -TF_LITE_MICRO_TEST(FailPartWayThere) { - // Use the threshold from the 0th gesture. - float probabilities[kGestureCount] = {kDetectionThreshold, 0.0, 0.0, 0.0}; - int prediction; - // Loop just too few times to trigger a prediction. - for (int i = 0; i <= kPredictionHistoryLength - 1; i++) { - prediction = PredictGesture(probabilities); - TF_LITE_MICRO_EXPECT_EQ(prediction, kNoGesture); - } - // Call with a different prediction, triggering a failure. - probabilities[0] = 0.0; - probabilities[2] = 1.0; - prediction = PredictGesture(probabilities); - TF_LITE_MICRO_EXPECT_EQ(prediction, kNoGesture); -} - -TF_LITE_MICRO_TEST(InsufficientProbability) { - // Just below the detection threshold. - float probabilities[kGestureCount] = {kDetectionThreshold - 0.1f, 0.0, 0.0, - 0.0}; - int prediction; - // Loop the exact right number of times - for (int i = 0; i <= kPredictionHistoryLength; i++) { - prediction = PredictGesture(probabilities); - TF_LITE_MICRO_EXPECT_EQ(prediction, kNoGesture); - } -} - -TF_LITE_MICRO_TESTS_END diff --git a/tensorflow/lite/micro/examples/magic_wand/magic_wand.tflite b/tensorflow/lite/micro/examples/magic_wand/magic_wand.tflite deleted file mode 100755 index 36bf8ce453957ba5ee6fef96134b0d5d2b1f0b9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19616 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 diff --git a/tensorflow/lite/micro/examples/magic_wand/magic_wand_test.cc b/tensorflow/lite/micro/examples/magic_wand/magic_wand_test.cc deleted file mode 100644 index 9db63c8a750..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/magic_wand_test.cc +++ /dev/null @@ -1,145 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#include "tensorflow/lite/micro/examples/magic_wand/magic_wand_model_data.h" -#include "tensorflow/lite/micro/examples/magic_wand/ring_micro_features_data.h" -#include "tensorflow/lite/micro/examples/magic_wand/slope_micro_features_data.h" -#include "tensorflow/lite/micro/micro_interpreter.h" -#include "tensorflow/lite/micro/micro_log.h" -#include "tensorflow/lite/micro/micro_mutable_op_resolver.h" -#include "tensorflow/lite/micro/testing/micro_test.h" -#include "tensorflow/lite/schema/schema_generated.h" - -TF_LITE_MICRO_TESTS_BEGIN - -TF_LITE_MICRO_TEST(LoadModelAndPerformInference) { - // Map the model into a usable data structure. This doesn't involve any - // copying or parsing, it's a very lightweight operation. - const tflite::Model* model = ::tflite::GetModel(g_magic_wand_model_data); - if (model->version() != TFLITE_SCHEMA_VERSION) { - MicroPrintf( - "Model provided is schema version %d not equal " - "to supported version %d.\n", - model->version(), TFLITE_SCHEMA_VERSION); - } - - // Pull in only the operation implementations we need. - // This relies on a complete list of all the ops needed by this graph. - // An easier approach is to just use the AllOpsResolver, but this will - // incur some penalty in code space for op implementations that are not - // needed by this graph. - static tflite::MicroMutableOpResolver<5> micro_op_resolver; // NOLINT - micro_op_resolver.AddConv2D(); - micro_op_resolver.AddDepthwiseConv2D(); - micro_op_resolver.AddFullyConnected(); - micro_op_resolver.AddMaxPool2D(); - micro_op_resolver.AddSoftmax(); - - // Create an area of memory to use for input, output, and intermediate arrays. - // Finding the minimum value for your model may require some trial and error. - const int tensor_arena_size = 60 * 1024; - uint8_t tensor_arena[tensor_arena_size]; - - // Build an interpreter to run the model with - tflite::MicroInterpreter interpreter(model, micro_op_resolver, tensor_arena, - tensor_arena_size); - - // Allocate memory from the tensor_arena for the model's tensors - interpreter.AllocateTensors(); - - // Obtain a pointer to the model's input tensor - TfLiteTensor* input = interpreter.input(0); - - // Make sure the input has the properties we expect - TF_LITE_MICRO_EXPECT(input != nullptr); - TF_LITE_MICRO_EXPECT_EQ(4, input->dims->size); - // The value of each element gives the length of the corresponding tensor. - TF_LITE_MICRO_EXPECT_EQ(1, input->dims->data[0]); - TF_LITE_MICRO_EXPECT_EQ(128, input->dims->data[1]); - TF_LITE_MICRO_EXPECT_EQ(3, input->dims->data[2]); - TF_LITE_MICRO_EXPECT_EQ(1, input->dims->data[3]); - // The input is a 32 bit floating point value - TF_LITE_MICRO_EXPECT_EQ(kTfLiteFloat32, input->type); - - // Provide an input value - const float* ring_features_data = g_ring_micro_f9643d42_nohash_4_data; - MicroPrintf("%d", input->bytes); - for (size_t i = 0; i < (input->bytes / sizeof(float)); ++i) { - input->data.f[i] = ring_features_data[i]; - } - - // Run the model on this input and check that it succeeds - TfLiteStatus invoke_status = interpreter.Invoke(); - if (invoke_status != kTfLiteOk) { - MicroPrintf("Invoke failed\n"); - } - TF_LITE_MICRO_EXPECT_EQ(kTfLiteOk, invoke_status); - - // Obtain a pointer to the output tensor and make sure it has the - // properties we expect. - TfLiteTensor* output = interpreter.output(0); - TF_LITE_MICRO_EXPECT_EQ(2, output->dims->size); - TF_LITE_MICRO_EXPECT_EQ(1, output->dims->data[0]); - TF_LITE_MICRO_EXPECT_EQ(4, output->dims->data[1]); - TF_LITE_MICRO_EXPECT_EQ(kTfLiteFloat32, output->type); - - // There are four possible classes in the output, each with a score. - const int kWingIndex = 0; - const int kRingIndex = 1; - const int kSlopeIndex = 2; - const int kNegativeIndex = 3; - - // Make sure that the expected "Ring" score is higher than the other - // classes. - float wing_score = output->data.f[kWingIndex]; - float ring_score = output->data.f[kRingIndex]; - float slope_score = output->data.f[kSlopeIndex]; - float negative_score = output->data.f[kNegativeIndex]; - TF_LITE_MICRO_EXPECT_GT(ring_score, wing_score); - TF_LITE_MICRO_EXPECT_GT(ring_score, slope_score); - TF_LITE_MICRO_EXPECT_GT(ring_score, negative_score); - - // Now test with a different input, from a recording of "Slope". - const float* slope_features_data = g_slope_micro_f2e59fea_nohash_1_data; - for (size_t i = 0; i < (input->bytes / sizeof(float)); ++i) { - input->data.f[i] = slope_features_data[i]; - } - - // Run the model on this "Slope" input. - invoke_status = interpreter.Invoke(); - if (invoke_status != kTfLiteOk) { - MicroPrintf("Invoke failed\n"); - } - TF_LITE_MICRO_EXPECT_EQ(kTfLiteOk, invoke_status); - - // Get the output from the model, and make sure it's the expected size and - // type. - output = interpreter.output(0); - TF_LITE_MICRO_EXPECT_EQ(2, output->dims->size); - TF_LITE_MICRO_EXPECT_EQ(1, output->dims->data[0]); - TF_LITE_MICRO_EXPECT_EQ(4, output->dims->data[1]); - TF_LITE_MICRO_EXPECT_EQ(kTfLiteFloat32, output->type); - - // Make sure that the expected "Slope" score is higher than the other classes. - wing_score = output->data.f[kWingIndex]; - ring_score = output->data.f[kRingIndex]; - slope_score = output->data.f[kSlopeIndex]; - negative_score = output->data.f[kNegativeIndex]; - TF_LITE_MICRO_EXPECT_GT(slope_score, wing_score); - TF_LITE_MICRO_EXPECT_GT(slope_score, ring_score); - TF_LITE_MICRO_EXPECT_GT(slope_score, negative_score); -} - -TF_LITE_MICRO_TESTS_END diff --git a/tensorflow/lite/micro/examples/magic_wand/main.cc b/tensorflow/lite/micro/examples/magic_wand/main.cc deleted file mode 100644 index 7dab1cd41d3..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/main.cc +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#include "tensorflow/lite/micro/examples/magic_wand/main_functions.h" - -// This is the default main used on systems that have the standard C entry -// point. Other devices (for example FreeRTOS or ESP32) that have different -// requirements for entry code (like an app_main function) should specialize -// this main.cc file in a target-specific subfolder. -int main(int argc, char* argv[]) { - setup(); - while (true) { - loop(); - } -} diff --git a/tensorflow/lite/micro/examples/magic_wand/main_functions.cc b/tensorflow/lite/micro/examples/magic_wand/main_functions.cc deleted file mode 100644 index 7f5775ce4c1..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/main_functions.cc +++ /dev/null @@ -1,113 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#include "tensorflow/lite/micro/examples/magic_wand/main_functions.h" - -#include "tensorflow/lite/micro/examples/magic_wand/accelerometer_handler.h" -#include "tensorflow/lite/micro/examples/magic_wand/constants.h" -#include "tensorflow/lite/micro/examples/magic_wand/gesture_predictor.h" -#include "tensorflow/lite/micro/examples/magic_wand/magic_wand_model_data.h" -#include "tensorflow/lite/micro/examples/magic_wand/output_handler.h" -#include "tensorflow/lite/micro/micro_interpreter.h" -#include "tensorflow/lite/micro/micro_log.h" -#include "tensorflow/lite/micro/micro_mutable_op_resolver.h" -#include "tensorflow/lite/micro/system_setup.h" -#include "tensorflow/lite/schema/schema_generated.h" - -// Globals, used for compatibility with Arduino-style sketches. -namespace { -const tflite::Model* model = nullptr; -tflite::MicroInterpreter* interpreter = nullptr; -TfLiteTensor* model_input = nullptr; -int input_length; - -// Create an area of memory to use for input, output, and intermediate arrays. -// The size of this will depend on the model you're using, and may need to be -// determined by experimentation. -constexpr int kTensorArenaSize = 60 * 1024; -alignas(16) uint8_t tensor_arena[kTensorArenaSize]; -} // namespace - -// The name of this function is important for Arduino compatibility. -void setup() { - tflite::InitializeTarget(); - - // Map the model into a usable data structure. This doesn't involve any - // copying or parsing, it's a very lightweight operation. - model = tflite::GetModel(g_magic_wand_model_data); - if (model->version() != TFLITE_SCHEMA_VERSION) { - MicroPrintf( - "Model provided is schema version %d not equal " - "to supported version %d.", - model->version(), TFLITE_SCHEMA_VERSION); - return; - } - - // Pull in only the operation implementations we need. - // This relies on a complete list of all the ops needed by this graph. - // An easier approach is to just use the AllOpsResolver, but this will - // incur some penalty in code space for op implementations that are not - // needed by this graph. - static tflite::MicroMutableOpResolver<5> micro_op_resolver; // NOLINT - micro_op_resolver.AddConv2D(); - micro_op_resolver.AddDepthwiseConv2D(); - micro_op_resolver.AddFullyConnected(); - micro_op_resolver.AddMaxPool2D(); - micro_op_resolver.AddSoftmax(); - - // Build an interpreter to run the model with. - static tflite::MicroInterpreter static_interpreter( - model, micro_op_resolver, tensor_arena, kTensorArenaSize); - interpreter = &static_interpreter; - - // Allocate memory from the tensor_arena for the model's tensors. - interpreter->AllocateTensors(); - - // Obtain pointer to the model's input tensor. - model_input = interpreter->input(0); - if ((model_input->dims->size != 4) || (model_input->dims->data[0] != 1) || - (model_input->dims->data[1] != 128) || - (model_input->dims->data[2] != kChannelNumber) || - (model_input->type != kTfLiteFloat32)) { - MicroPrintf("Bad input tensor parameters in model"); - return; - } - - input_length = model_input->bytes / sizeof(float); - - TfLiteStatus setup_status = SetupAccelerometer(); - if (setup_status != kTfLiteOk) { - MicroPrintf("Set up failed\n"); - } -} - -void loop() { - // Attempt to read new data from the accelerometer. - bool got_data = ReadAccelerometer(model_input->data.f, input_length); - // If there was no new data, wait until next time. - if (!got_data) return; - - // Run inference, and report any error. - TfLiteStatus invoke_status = interpreter->Invoke(); - if (invoke_status != kTfLiteOk) { - MicroPrintf("Invoke failed on index: %d\n", begin_index); - return; - } - // Analyze the results to obtain a prediction - int gesture_index = PredictGesture(interpreter->output(0)->data.f); - - // Produce an output - HandleOutput(gesture_index); -} diff --git a/tensorflow/lite/micro/examples/magic_wand/main_functions.h b/tensorflow/lite/micro/examples/magic_wand/main_functions.h deleted file mode 100644 index d69755b3a58..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/main_functions.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#ifndef TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_MAIN_FUNCTIONS_H_ -#define TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_MAIN_FUNCTIONS_H_ - -// Expose a C friendly interface for main functions. -#ifdef __cplusplus -extern "C" { -#endif - -// Initializes all data needed for the example. The name is important, and needs -// to be setup() for Arduino compatibility. -void setup(); - -// Runs one iteration of data gathering and inference. This should be called -// repeatedly from the application code. The name needs to be loop() for Arduino -// compatibility. -void loop(); - -#ifdef __cplusplus -} -#endif - -#endif // TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_MAIN_FUNCTIONS_H_ diff --git a/tensorflow/lite/micro/examples/magic_wand/output_handler.cc b/tensorflow/lite/micro/examples/magic_wand/output_handler.cc deleted file mode 100644 index 92436a79b0d..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/output_handler.cc +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#include "tensorflow/lite/micro/examples/magic_wand/output_handler.h" - -#include "tensorflow/lite/micro/micro_log.h" - -void HandleOutput(int kind) { - // light (red: wing, blue: ring, green: slope) - if (kind == 0) { - MicroPrintf( - "WING:\n\r* * *\n\r * * * " - "*\n\r * * * *\n\r * * * *\n\r * * " - "* *\n\r * *\n\r"); - } else if (kind == 1) { - MicroPrintf( - "RING:\n\r *\n\r * *\n\r * *\n\r " - " * *\n\r * *\n\r * *\n\r " - " *\n\r"); - } else if (kind == 2) { - MicroPrintf( - "SLOPE:\n\r *\n\r *\n\r *\n\r *\n\r " - "*\n\r *\n\r *\n\r * * * * * * * *\n\r"); - } -} diff --git a/tensorflow/lite/micro/examples/magic_wand/output_handler.h b/tensorflow/lite/micro/examples/magic_wand/output_handler.h deleted file mode 100644 index 0677b2c863a..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/output_handler.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#ifndef TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_OUTPUT_HANDLER_H_ -#define TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_OUTPUT_HANDLER_H_ - -#include "tensorflow/lite/c/common.h" - -void HandleOutput(int kind); - -#endif // TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_OUTPUT_HANDLER_H_ diff --git a/tensorflow/lite/micro/examples/magic_wand/output_handler_test.cc b/tensorflow/lite/micro/examples/magic_wand/output_handler_test.cc deleted file mode 100644 index bceccd743a3..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/output_handler_test.cc +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#include "tensorflow/lite/micro/examples/magic_wand/output_handler.h" - -#include "tensorflow/lite/micro/testing/micro_test.h" - -TF_LITE_MICRO_TESTS_BEGIN - -TF_LITE_MICRO_TEST(TestCallability) { - HandleOutput(0); - HandleOutput(1); - HandleOutput(2); - HandleOutput(3); -} - -TF_LITE_MICRO_TESTS_END diff --git a/tensorflow/lite/micro/examples/magic_wand/ring_micro_features_data.cc b/tensorflow/lite/micro/examples/magic_wand/ring_micro_features_data.cc deleted file mode 100644 index 49f7d5422f3..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/ring_micro_features_data.cc +++ /dev/null @@ -1,65 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#include "tensorflow/lite/micro/examples/magic_wand/ring_micro_features_data.h" - -const int g_ring_micro_f9643d42_nohash_4_length = 128; -const int g_ring_micro_f9643d42_nohash_4_dim = 3; -// Raw accelerometer data with a sample rate of 25Hz -const float g_ring_micro_f9643d42_nohash_4_data[] = { - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, -665.0, 228.0, 827.0, -680.0, 339.0, 716.0, - -680.0, 564.0, 812.0, -679.0, 552.0, 818.0, -665.0, 528.0, 751.0, - -658.0, 432.0, 618.0, -655.0, 445.0, 592.0, -667.0, 484.0, 556.0, - -684.0, 590.0, 510.0, -674.0, 672.0, 475.0, -660.0, 786.0, 390.0, - -562.0, 1124.0, 128.0, -526.0, 1140.0, 111.0, -486.0, 1044.0, 33.0, - -416.0, 652.0, -134.0, -390.0, 534.0, -143.0, -365.0, 381.0, -117.0, - -314.0, 60.0, 94.0, -322.0, 7.0, 190.0, -338.0, -95.0, 342.0, - -360.0, -106.0, 842.0, -351.0, -41.0, 965.0, -352.0, 12.0, 960.0, - -366.0, 42.0, 1124.0, -322.0, 56.0, 1178.0, -312.0, 15.0, 1338.0, - -254.0, 10.0, 1532.0, -241.0, 5.0, 1590.0, -227.0, 60.0, 1565.0, - -204.0, 282.0, 1560.0, -180.0, 262.0, 1524.0, -138.0, 385.0, 1522.0, - -84.0, 596.0, 1626.0, -55.0, 639.0, 1604.0, -19.0, 771.0, 1511.0, - 16.0, 932.0, 1132.0, 15.0, 924.0, 1013.0, 1.0, 849.0, 812.0, - -88.0, 628.0, 500.0, -114.0, 609.0, 463.0, -155.0, 559.0, 382.0, - -234.0, 420.0, 278.0, -254.0, 390.0, 272.0, -327.0, 200.0, 336.0, - -558.0, -556.0, 630.0, -640.0, -607.0, 740.0, -706.0, -430.0, 868.0, - -778.0, 42.0, 1042.0, -763.0, 84.0, 973.0, -735.0, 185.0, 931.0, - -682.0, 252.0, 766.0, -673.0, 230.0, 757.0, -671.0, 218.0, 757.0, - -656.0, 222.0, 714.0, -659.0, 238.0, 746.0, -640.0, 276.0, 731.0, - -634.0, 214.0, 754.0, -637.0, 207.0, 735.0, -637.0, 194.0, 742.0, - -634.0, 248.0, 716.0, -631.0, 265.0, 697.0, -628.0, 252.0, 797.0, - -592.0, 204.0, 816.0, -618.0, 218.0, 812.0, -633.0, 231.0, 828.0, - -640.0, 222.0, 736.0, -634.0, 221.0, 787.0, -}; diff --git a/tensorflow/lite/micro/examples/magic_wand/ring_micro_features_data.h b/tensorflow/lite/micro/examples/magic_wand/ring_micro_features_data.h deleted file mode 100644 index 9cd02cd53b0..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/ring_micro_features_data.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#ifndef TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_RING_MICRO_FEATURES_DATA_H_ -#define TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_RING_MICRO_FEATURES_DATA_H_ - -extern const int g_ring_micro_f9643d42_nohash_4_length; -extern const int g_ring_micro_f9643d42_nohash_4_dim; -extern const float g_ring_micro_f9643d42_nohash_4_data[]; - -#endif // TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_RING_MICRO_FEATURES_DATA_H_ diff --git a/tensorflow/lite/micro/examples/magic_wand/slope_micro_features_data.cc b/tensorflow/lite/micro/examples/magic_wand/slope_micro_features_data.cc deleted file mode 100644 index 3790b938e9c..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/slope_micro_features_data.cc +++ /dev/null @@ -1,65 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#include "tensorflow/lite/micro/examples/magic_wand/slope_micro_features_data.h" - -const int g_slope_micro_f2e59fea_nohash_1_length = 128; -const int g_slope_micro_f2e59fea_nohash_1_dim = 3; -// Raw accelerometer data with a sample rate of 25Hz -const float g_slope_micro_f2e59fea_nohash_1_data[] = { - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, -766.0, 132.0, 709.0, -751.0, 249.0, 659.0, - -714.0, 314.0, 630.0, -709.0, 244.0, 623.0, -707.0, 230.0, 659.0, - -704.0, 202.0, 748.0, -714.0, 219.0, 728.0, -722.0, 239.0, 710.0, - -744.0, 116.0, 612.0, -753.0, -49.0, 570.0, -748.0, -279.0, 527.0, - -668.0, -664.0, 592.0, -601.0, -635.0, 609.0, -509.0, -559.0, 606.0, - -286.0, -162.0, 536.0, -255.0, -144.0, 495.0, -209.0, -85.0, 495.0, - 6.0, 416.0, 698.0, -33.0, 304.0, 1117.0, -82.0, 405.0, 1480.0, - -198.0, 1008.0, 1908.0, -229.0, 990.0, 1743.0, -234.0, 934.0, 1453.0, - -126.0, 838.0, 896.0, -78.0, 792.0, 911.0, -27.0, 741.0, 918.0, - 114.0, 734.0, 960.0, 135.0, 613.0, 959.0, 152.0, 426.0, 1015.0, - 106.0, -116.0, 1110.0, 63.0, -314.0, 1129.0, -12.0, -486.0, 1179.0, - -118.0, -656.0, 1510.0, -116.0, -558.0, 1553.0, -126.0, -361.0, 1367.0, - -222.0, -76.0, 922.0, -210.0, -26.0, 971.0, -194.0, 50.0, 1053.0, - -178.0, 72.0, 1082.0, -169.0, 100.0, 1073.0, -162.0, 133.0, 1050.0, - -156.0, 226.0, 976.0, -154.0, 323.0, 886.0, -130.0, 240.0, 1154.0, - -116.0, 124.0, 916.0, -132.0, 124.0, 937.0, -153.0, 115.0, 981.0, - -184.0, 94.0, 962.0, -177.0, 85.0, 1017.0, -173.0, 92.0, 1027.0, - -168.0, 158.0, 1110.0, -181.0, 101.0, 1030.0, -180.0, 139.0, 1054.0, - -152.0, 10.0, 1044.0, -169.0, 74.0, 1007.0, -}; diff --git a/tensorflow/lite/micro/examples/magic_wand/slope_micro_features_data.h b/tensorflow/lite/micro/examples/magic_wand/slope_micro_features_data.h deleted file mode 100644 index 6ed0c3c3cdb..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/slope_micro_features_data.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2019 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#ifndef TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_SLOPE_MICRO_FEATURES_DATA_H_ -#define TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_SLOPE_MICRO_FEATURES_DATA_H_ - -extern const int g_slope_micro_f2e59fea_nohash_1_length; -extern const int g_slope_micro_f2e59fea_nohash_1_dim; -extern const float g_slope_micro_f2e59fea_nohash_1_data[]; - -#endif // TENSORFLOW_LITE_MICRO_EXAMPLES_MAGIC_WAND_SLOPE_MICRO_FEATURES_DATA_H_ diff --git a/tensorflow/lite/micro/examples/magic_wand/train/README.md b/tensorflow/lite/micro/examples/magic_wand/train/README.md deleted file mode 100644 index 4ceda344a53..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/train/README.md +++ /dev/null @@ -1,191 +0,0 @@ -# Gesture Recognition Magic Wand Training Scripts - -## Introduction - -The scripts in this directory can be used to train a TensorFlow model that -classifies gestures based on accelerometer data. The code uses Python 3.7 and -TensorFlow 2.0. The resulting model is less than 20KB in size. - -The following document contains instructions on using the scripts to train a -model, and capturing your own training data. - -This project was inspired by the [Gesture Recognition Magic Wand](https://github.com/jewang/gesture-demo) -project by Jennifer Wang. - -## Training - -### Dataset - -Three magic gestures were chosen, and data were collected from 7 -different people. Some random long movement sequences were collected and divided -into shorter pieces, which made up "negative" data along with some other -automatically generated random data. - -The dataset can be downloaded from the following URL: - -[download.tensorflow.org/models/tflite/magic_wand/data.tar.gz](http://download.tensorflow.org/models/tflite/magic_wand/data.tar.gz) - -### Training in Colab - -The following [Google Colaboratory](https://colab.research.google.com) -notebook demonstrates how to train the model. It's the easiest way to get -started: - - - - -
- Run in Google Colab - - View source on GitHub -
- -If you'd prefer to run the scripts locally, use the following instructions. - -### Running the scripts - -Use the following command to install the required dependencies: - -```shell -pip install -r requirements.txt -``` - -There are two ways to train the model: - -- Random data split, which mixes different people's data together and randomly - splits them into training, validation, and test sets -- Person data split, which splits the data by person - -#### Random data split - -Using a random split results in higher training accuracy than a person split, -but inferior performance on new data. - -```shell -$ python data_prepare.py - -$ python data_split.py - -$ python train.py --model CNN --person false -``` - -#### Person data split - -Using a person data split results in lower training accuracy but better -performance on new data. - -```shell -$ python data_prepare.py - -$ python data_split_person.py - -$ python train.py --model CNN --person true -``` - -#### Model type - -In the `--model` argument, you can provide `CNN` or `LSTM`. The CNN model has a -smaller size and lower latency. - -## Collecting new data - -To obtain new training data using the -[SparkFun Edge development board](https://sparkfun.com/products/15170), you can -modify one of the examples in the [SparkFun Edge BSP](https://github.com/sparkfun/SparkFun_Edge_BSP) -and deploy it using the Ambiq SDK. - -### Install the Ambiq SDK and SparkFun Edge BSP - -Follow SparkFun's -[Using SparkFun Edge Board with Ambiq Apollo3 SDK](https://learn.sparkfun.com/tutorials/using-sparkfun-edge-board-with-ambiq-apollo3-sdk/all) -guide to set up the Ambiq SDK and SparkFun Edge BSP. - -#### Modify the example code - -First, `cd` into -`AmbiqSuite-Rel2.2.0/boards/SparkFun_Edge_BSP/examples/example1_edge_test`. - -##### Modify `src/tf_adc/tf_adc.c` - -Add `true` in line 62 as the second parameter of function -`am_hal_adc_samples_read`. - -##### Modify `src/main.c` - -Add the line below in `int main(void)`, just before the line `while(1)`: - -```cc -am_util_stdio_printf("-,-,-\r\n"); -``` - -Change the following lines in `while(1){...}` - -```cc -am_util_stdio_printf("Acc [mg] %04.2f x, %04.2f y, %04.2f z, Temp [deg C] %04.2f, MIC0 [counts / 2^14] %d\r\n", acceleration_mg[0], acceleration_mg[1], acceleration_mg[2], temperature_degC, (audioSample) ); -``` - -to: - -```cc -am_util_stdio_printf("%04.2f,%04.2f,%04.2f\r\n", acceleration_mg[0], acceleration_mg[1], acceleration_mg[2]); -``` - -#### Flash the binary - -Follow the instructions in -[SparkFun's guide](https://learn.sparkfun.com/tutorials/using-sparkfun-edge-board-with-ambiq-apollo3-sdk/all#example-applications) -to flash the binary to the device. - -#### Collect accelerometer data - -First, in a new terminal window, run the following command to begin logging -output to `output.txt`: - -```shell -$ script output.txt -``` - -Next, in the same window, use `screen` to connect to the device: - -```shell -$ screen ${DEVICENAME} 115200 -``` - -Output information collected from accelerometer sensor will be shown on the -screen and saved in `output.txt`, in the format of "x,y,z" per line. - -Press the `RST` button to start capturing a new gesture, then press Button 14 -when it ends. New data will begin with a line "-,-,-". - -To exit `screen`, hit +Ctrl\\+A+, immediately followed by the +K+ key, -then hit the +Y+ key. Then run - -```shell -$ exit -``` - -to stop logging data. Data will be saved in `output.txt`. For compatibility -with the training scripts, change the file name to include person's name and -the gesture name, in the following format: - -``` -output_{gesture_name}_{person_name}.txt -``` - -#### Edit and run the scripts - -Edit the following files to include your new gesture names (replacing -"wing", "ring", and "slope") - -- `data_load.py` -- `data_prepare.py` -- `data_split.py` - -Edit the following files to include your new person names (replacing "hyw", -"shiyun", "tangsy", "dengyl", "jiangyh", "xunkai", "lsj", "pengxl", "liucx", -and "zhangxy"): - -- `data_prepare.py` -- `data_split_person.py` - -Finally, run the commands described earlier to train a new model. diff --git a/tensorflow/lite/micro/examples/magic_wand/train/data_augmentation.py b/tensorflow/lite/micro/examples/magic_wand/train/data_augmentation.py deleted file mode 100644 index 9c90be97f3b..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/train/data_augmentation.py +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2019 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================================================================== -# pylint: disable=g-bad-import-order -"""Data augmentation that will be used in data_load.py.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -import random - -import numpy as np - - -def time_wrapping(molecule, denominator, data): - """Generate (molecule/denominator)x speed data.""" - tmp_data = [[0 for i in range(len(data[0]))] - for j in range((int(len(data) / molecule) - 1) * denominator)] - for i in range(int(len(data) / molecule) - 1): - for j in range(len(data[i])): - for k in range(denominator): - tmp_data[denominator * i + - k][j] = (data[molecule * i + k][j] * (denominator - k) + - data[molecule * i + k + 1][j] * k) / denominator - return tmp_data - - -def augment_data(original_data, original_label): - """Perform data augmentation.""" - new_data = [] - new_label = [] - for idx, (data, label) in enumerate(zip(original_data, original_label)): # pylint: disable=unused-variable - # Original data - new_data.append(data) - new_label.append(label) - # Sequence shift - for num in range(5): # pylint: disable=unused-variable - new_data.append((np.array(data, dtype=np.float32) + - (random.random() - 0.5) * 200).tolist()) - new_label.append(label) - # Random noise - tmp_data = [[0 for i in range(len(data[0]))] for j in range(len(data))] - for num in range(5): - for i in range(len(tmp_data)): - for j in range(len(tmp_data[i])): - tmp_data[i][j] = data[i][j] + 5 * random.random() - new_data.append(tmp_data) - new_label.append(label) - # Time warping - fractions = [(3, 2), (5, 3), (2, 3), (3, 4), (9, 5), (6, 5), (4, 5)] - for molecule, denominator in fractions: - new_data.append(time_wrapping(molecule, denominator, data)) - new_label.append(label) - # Movement amplification - for molecule, denominator in fractions: - new_data.append( - (np.array(data, dtype=np.float32) * molecule / denominator).tolist()) - new_label.append(label) - return new_data, new_label diff --git a/tensorflow/lite/micro/examples/magic_wand/train/data_augmentation_test.py b/tensorflow/lite/micro/examples/magic_wand/train/data_augmentation_test.py deleted file mode 100644 index a439603a706..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/train/data_augmentation_test.py +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2019 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================================================================== -# pylint: disable=g-bad-import-order -"""Test for data_augmentation.py.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -import unittest - -import numpy as np - -from data_augmentation import augment_data -from data_augmentation import time_wrapping - - -class TestAugmentation(unittest.TestCase): - - def test_time_wrapping(self): - original_data = np.random.rand(10, 3).tolist() - wrapped_data = time_wrapping(4, 5, original_data) - self.assertEqual(len(wrapped_data), int(len(original_data) / 4 - 1) * 5) - self.assertEqual(len(wrapped_data[0]), len(original_data[0])) - - def test_augment_data(self): - original_data = [ - np.random.rand(128, 3).tolist(), - np.random.rand(66, 2).tolist(), - np.random.rand(9, 1).tolist() - ] - original_label = ["data", "augmentation", "test"] - augmented_data, augmented_label = augment_data(original_data, - original_label) - self.assertEqual(25 * len(original_data), len(augmented_data)) - self.assertIsInstance(augmented_data, list) - self.assertEqual(25 * len(original_label), len(augmented_label)) - self.assertIsInstance(augmented_label, list) - for i in range(len(original_label)): - self.assertEqual(augmented_label[25 * i], original_label[i]) - - -if __name__ == "__main__": - unittest.main() diff --git a/tensorflow/lite/micro/examples/magic_wand/train/data_load.py b/tensorflow/lite/micro/examples/magic_wand/train/data_load.py deleted file mode 100644 index 0416ae314cb..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/train/data_load.py +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 2019 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================================================================== -# pylint: disable=g-bad-import-order -"""Load data from the specified paths and format them for training.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -import json - -import numpy as np -import tensorflow as tf - -from data_augmentation import augment_data - -LABEL_NAME = "gesture" -DATA_NAME = "accel_ms2_xyz" - - -class DataLoader(object): - """Loads data and prepares for training.""" - - def __init__(self, train_data_path, valid_data_path, test_data_path, - seq_length): - self.dim = 3 - self.seq_length = seq_length - self.label2id = {"wing": 0, "ring": 1, "slope": 2, "negative": 3} - self.train_data, self.train_label, self.train_len = self.get_data_file( - train_data_path, "train") - self.valid_data, self.valid_label, self.valid_len = self.get_data_file( - valid_data_path, "valid") - self.test_data, self.test_label, self.test_len = self.get_data_file( - test_data_path, "test") - - def get_data_file(self, data_path, data_type): - """Get train, valid and test data from files.""" - data = [] - label = [] - with open(data_path, "r") as f: - lines = f.readlines() - for idx, line in enumerate(lines): # pylint: disable=unused-variable - dic = json.loads(line) - data.append(dic[DATA_NAME]) - label.append(dic[LABEL_NAME]) - if data_type == "train": - data, label = augment_data(data, label) - length = len(label) - print(data_type + "_data_length:" + str(length)) - return data, label, length - - def pad(self, data, seq_length, dim): - """Get neighbour padding.""" - noise_level = 20 - padded_data = [] - # Before- Neighbour padding - tmp_data = (np.random.rand(seq_length, dim) - 0.5) * noise_level + data[0] - tmp_data[(seq_length - - min(len(data), seq_length)):] = data[:min(len(data), seq_length)] - padded_data.append(tmp_data) - # After- Neighbour padding - tmp_data = (np.random.rand(seq_length, dim) - 0.5) * noise_level + data[-1] - tmp_data[:min(len(data), seq_length)] = data[:min(len(data), seq_length)] - padded_data.append(tmp_data) - return padded_data - - def format_support_func(self, padded_num, length, data, label): - """Support function for format.(Helps format train, valid and test.)""" - # Add 2 padding, initialize data and label - length *= padded_num - features = np.zeros((length, self.seq_length, self.dim)) - labels = np.zeros(length) - # Get padding for train, valid and test - for idx, (data, label) in enumerate(zip(data, label)): - padded_data = self.pad(data, self.seq_length, self.dim) - for num in range(padded_num): - features[padded_num * idx + num] = padded_data[num] - labels[padded_num * idx + num] = self.label2id[label] - # Turn into tf.data.Dataset - dataset = tf.data.Dataset.from_tensor_slices( - (features, labels.astype("int32"))) - return length, dataset - - def format(self): - """Format data(including padding, etc.) and get the dataset for the model.""" - padded_num = 2 - self.train_len, self.train_data = self.format_support_func( - padded_num, self.train_len, self.train_data, self.train_label) - self.valid_len, self.valid_data = self.format_support_func( - padded_num, self.valid_len, self.valid_data, self.valid_label) - self.test_len, self.test_data = self.format_support_func( - padded_num, self.test_len, self.test_data, self.test_label) diff --git a/tensorflow/lite/micro/examples/magic_wand/train/data_load_test.py b/tensorflow/lite/micro/examples/magic_wand/train/data_load_test.py deleted file mode 100644 index c0b9cf81657..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/train/data_load_test.py +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 2019 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================================================================== -# pylint: disable=g-bad-import-order -"""Test for data_load.py.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -import unittest -from data_load import DataLoader - -import tensorflow as tf - - -class TestLoad(unittest.TestCase): - - def setUp(self): # pylint: disable=g-missing-super-call - self.loader = DataLoader("./data/train", - "./data/valid", - "./data/test", - seq_length=512) - - def test_get_data(self): - self.assertIsInstance(self.loader.train_data, list) - self.assertIsInstance(self.loader.train_label, list) - self.assertIsInstance(self.loader.valid_data, list) - self.assertIsInstance(self.loader.valid_label, list) - self.assertIsInstance(self.loader.test_data, list) - self.assertIsInstance(self.loader.test_label, list) - self.assertEqual(self.loader.train_len, len(self.loader.train_data)) - self.assertEqual(self.loader.train_len, len(self.loader.train_label)) - self.assertEqual(self.loader.valid_len, len(self.loader.valid_data)) - self.assertEqual(self.loader.valid_len, len(self.loader.valid_label)) - self.assertEqual(self.loader.test_len, len(self.loader.test_data)) - self.assertEqual(self.loader.test_len, len(self.loader.test_label)) - - def test_pad(self): - original_data1 = [[2, 3], [1, 1]] - expected_data1_0 = [[2, 3], [2, 3], [2, 3], [2, 3], [1, 1]] - expected_data1_1 = [[2, 3], [1, 1], [1, 1], [1, 1], [1, 1]] - original_data2 = [[-2, 3], [-77, -681], [5, 6], [9, -7], [22, 3333], - [9, 99], [-100, 0]] - expected_data2 = [[-2, 3], [-77, -681], [5, 6], [9, -7], [22, 3333]] - padding_data1 = self.loader.pad(original_data1, seq_length=5, dim=2) - padding_data2 = self.loader.pad(original_data2, seq_length=5, dim=2) - for i in range(len(padding_data1[0])): - for j in range(len(padding_data1[0].tolist()[0])): - self.assertLess( - abs(padding_data1[0].tolist()[i][j] - expected_data1_0[i][j]), - 10.001) - for i in range(len(padding_data1[1])): - for j in range(len(padding_data1[1].tolist()[0])): - self.assertLess( - abs(padding_data1[1].tolist()[i][j] - expected_data1_1[i][j]), - 10.001) - self.assertEqual(padding_data2[0].tolist(), expected_data2) - self.assertEqual(padding_data2[1].tolist(), expected_data2) - - def test_format(self): - self.loader.format() - expected_train_label = int( - self.loader.label2id[self.loader.train_label[0]]) - expected_valid_label = int( - self.loader.label2id[self.loader.valid_label[0]]) - expected_test_label = int(self.loader.label2id[self.loader.test_label[0]]) - for feature, label in self.loader.train_data: # pylint: disable=unused-variable - format_train_label = label.numpy() - break - for feature, label in self.loader.valid_data: - format_valid_label = label.numpy() - break - for feature, label in self.loader.test_data: - format_test_label = label.numpy() - break - self.assertEqual(expected_train_label, format_train_label) - self.assertEqual(expected_valid_label, format_valid_label) - self.assertEqual(expected_test_label, format_test_label) - self.assertIsInstance(self.loader.train_data, tf.data.Dataset) - self.assertIsInstance(self.loader.valid_data, tf.data.Dataset) - self.assertIsInstance(self.loader.test_data, tf.data.Dataset) - - -if __name__ == "__main__": - unittest.main() diff --git a/tensorflow/lite/micro/examples/magic_wand/train/data_prepare.py b/tensorflow/lite/micro/examples/magic_wand/train/data_prepare.py deleted file mode 100644 index c94ac65b96a..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/train/data_prepare.py +++ /dev/null @@ -1,162 +0,0 @@ -# coding=utf-8 -# Copyright 2019 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================================================================== -"""Prepare data for further process. - -Read data from "/slope", "/ring", "/wing", "/negative" and save them -in "/data/complete_data" in python dict format. - -It will generate a new file with the following structure: -├── data -│   └── complete_data -""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -import csv -import json -import os -import random - -LABEL_NAME = "gesture" -DATA_NAME = "accel_ms2_xyz" -folders = ["wing", "ring", "slope"] -names = [ - "hyw", "shiyun", "tangsy", "dengyl", "zhangxy", "pengxl", "liucx", - "jiangyh", "xunkai" -] - - -def prepare_original_data(folder, name, data, file_to_read): # pylint: disable=redefined-outer-name - """Read collected data from files.""" - if folder != "negative": - with open(file_to_read, "r") as f: - lines = csv.reader(f) - data_new = {} - data_new[LABEL_NAME] = folder - data_new[DATA_NAME] = [] - data_new["name"] = name - for idx, line in enumerate(lines): # pylint: disable=unused-variable,redefined-outer-name - if len(line) == 3: - if line[2] == "-" and data_new[DATA_NAME]: - data.append(data_new) - data_new = {} - data_new[LABEL_NAME] = folder - data_new[DATA_NAME] = [] - data_new["name"] = name - elif line[2] != "-": - data_new[DATA_NAME].append([float(i) for i in line[0:3]]) - data.append(data_new) - else: - with open(file_to_read, "r") as f: - lines = csv.reader(f) - data_new = {} - data_new[LABEL_NAME] = folder - data_new[DATA_NAME] = [] - data_new["name"] = name - for idx, line in enumerate(lines): - if len(line) == 3 and line[2] != "-": - if len(data_new[DATA_NAME]) == 120: - data.append(data_new) - data_new = {} - data_new[LABEL_NAME] = folder - data_new[DATA_NAME] = [] - data_new["name"] = name - else: - data_new[DATA_NAME].append([float(i) for i in line[0:3]]) - data.append(data_new) - - -def generate_negative_data(data): # pylint: disable=redefined-outer-name - """Generate negative data labeled as 'negative6~8'.""" - # Big movement -> around straight line - for i in range(100): - if i > 80: - dic = {DATA_NAME: [], LABEL_NAME: "negative", "name": "negative8"} - elif i > 60: - dic = {DATA_NAME: [], LABEL_NAME: "negative", "name": "negative7"} - else: - dic = {DATA_NAME: [], LABEL_NAME: "negative", "name": "negative6"} - start_x = (random.random() - 0.5) * 2000 - start_y = (random.random() - 0.5) * 2000 - start_z = (random.random() - 0.5) * 2000 - x_increase = (random.random() - 0.5) * 10 - y_increase = (random.random() - 0.5) * 10 - z_increase = (random.random() - 0.5) * 10 - for j in range(128): - dic[DATA_NAME].append([ - start_x + j * x_increase + (random.random() - 0.5) * 6, - start_y + j * y_increase + (random.random() - 0.5) * 6, - start_z + j * z_increase + (random.random() - 0.5) * 6 - ]) - data.append(dic) - # Random - for i in range(100): - if i > 80: - dic = {DATA_NAME: [], LABEL_NAME: "negative", "name": "negative8"} - elif i > 60: - dic = {DATA_NAME: [], LABEL_NAME: "negative", "name": "negative7"} - else: - dic = {DATA_NAME: [], LABEL_NAME: "negative", "name": "negative6"} - for j in range(128): - dic[DATA_NAME].append([(random.random() - 0.5) * 1000, - (random.random() - 0.5) * 1000, - (random.random() - 0.5) * 1000]) - data.append(dic) - # Stay still - for i in range(100): - if i > 80: - dic = {DATA_NAME: [], LABEL_NAME: "negative", "name": "negative8"} - elif i > 60: - dic = {DATA_NAME: [], LABEL_NAME: "negative", "name": "negative7"} - else: - dic = {DATA_NAME: [], LABEL_NAME: "negative", "name": "negative6"} - start_x = (random.random() - 0.5) * 2000 - start_y = (random.random() - 0.5) * 2000 - start_z = (random.random() - 0.5) * 2000 - for j in range(128): - dic[DATA_NAME].append([ - start_x + (random.random() - 0.5) * 40, - start_y + (random.random() - 0.5) * 40, - start_z + (random.random() - 0.5) * 40 - ]) - data.append(dic) - - -# Write data to file -def write_data(data_to_write, path): - with open(path, "w") as f: - for idx, item in enumerate(data_to_write): # pylint: disable=unused-variable,redefined-outer-name - dic = json.dumps(item, ensure_ascii=False) - f.write(dic) - f.write("\n") - - -if __name__ == "__main__": - data = [] # pylint: disable=redefined-outer-name - for idx1, folder in enumerate(folders): - for idx2, name in enumerate(names): - prepare_original_data(folder, name, data, - "./%s/output_%s_%s.txt" % (folder, folder, name)) - for idx in range(5): - prepare_original_data("negative", "negative%d" % (idx + 1), data, - "./negative/output_negative_%d.txt" % (idx + 1)) - generate_negative_data(data) - print("data_length: " + str(len(data))) - if not os.path.exists("./data"): - os.makedirs("./data") - write_data(data, "./data/complete_data") diff --git a/tensorflow/lite/micro/examples/magic_wand/train/data_prepare_test.py b/tensorflow/lite/micro/examples/magic_wand/train/data_prepare_test.py deleted file mode 100644 index 638082a1ebf..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/train/data_prepare_test.py +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2019 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================================================================== -"""Test for data_prepare.py.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -import csv -import json -import os -import unittest -from data_prepare import generate_negative_data -from data_prepare import prepare_original_data -from data_prepare import write_data - - -class TestPrepare(unittest.TestCase): - - def setUp(self): # pylint: disable=g-missing-super-call - self.file = "./%s/output_%s_%s.txt" % (folders[0], folders[0], names[0]) # pylint: disable=undefined-variable - self.data = [] - prepare_original_data(folders[0], names[0], self.data, self.file) # pylint: disable=undefined-variable - - def test_prepare_data(self): - num = 0 - with open(self.file, "r") as f: - lines = csv.reader(f) - for idx, line in enumerate(lines): # pylint: disable=unused-variable - if len(line) == 3 and line[2] == "-": - num += 1 - self.assertEqual(len(self.data), num) - self.assertIsInstance(self.data, list) - self.assertIsInstance(self.data[0], dict) - self.assertEqual(list(self.data[-1]), ["gesture", "accel_ms2_xyz", "name"]) - self.assertEqual(self.data[0]["name"], names[0]) # pylint: disable=undefined-variable - - def test_generate_negative(self): - original_len = len(self.data) - generate_negative_data(self.data) - self.assertEqual(original_len + 300, len(self.data)) - generated_num = 0 - for idx, data in enumerate(self.data): # pylint: disable=undefined-variable, unused-variable - if data["name"] == "negative6" or data["name"] == "negative7" or data[ - "name"] == "negative8": - generated_num += 1 - self.assertEqual(generated_num, 300) - - def test_write_data(self): - data_path_test = "./data/data0" - write_data(self.data, data_path_test) - with open(data_path_test, "r") as f: - lines = f.readlines() - self.assertEqual(len(lines), len(self.data)) - self.assertEqual(json.loads(lines[0]), self.data[0]) - self.assertEqual(json.loads(lines[-1]), self.data[-1]) - os.remove(data_path_test) - - -if __name__ == "__main__": - unittest.main() diff --git a/tensorflow/lite/micro/examples/magic_wand/train/data_split.py b/tensorflow/lite/micro/examples/magic_wand/train/data_split.py deleted file mode 100644 index fb9a74c6415..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/train/data_split.py +++ /dev/null @@ -1,89 +0,0 @@ -# coding=utf-8 -# Copyright 2019 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================================================================== -"""Mix and split data. - -Mix different people's data together and randomly split them into train, -validation and test. These data would be saved separately under "/data". -It will generate new files with the following structure: - -├── data -│   ├── complete_data -│   ├── test -│   ├── train -│   └── valid -""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -import json -import random -from data_prepare import write_data - - -# Read data -def read_data(path): - data = [] # pylint: disable=redefined-outer-name - with open(path, "r") as f: - lines = f.readlines() - for idx, line in enumerate(lines): # pylint: disable=unused-variable - dic = json.loads(line) - data.append(dic) - print("data_length:" + str(len(data))) - return data - - -def split_data(data, train_ratio, valid_ratio): # pylint: disable=redefined-outer-name - """Splits data into train, validation and test according to ratio.""" - train_data = [] # pylint: disable=redefined-outer-name - valid_data = [] # pylint: disable=redefined-outer-name - test_data = [] # pylint: disable=redefined-outer-name - num_dic = {"wing": 0, "ring": 0, "slope": 0, "negative": 0} - for idx, item in enumerate(data): # pylint: disable=unused-variable - for i in num_dic: - if item["gesture"] == i: - num_dic[i] += 1 - print(num_dic) - train_num_dic = {} - valid_num_dic = {} - for i in num_dic: - train_num_dic[i] = int(train_ratio * num_dic[i]) - valid_num_dic[i] = int(valid_ratio * num_dic[i]) - random.seed(30) - random.shuffle(data) - for idx, item in enumerate(data): - for i in num_dic: - if item["gesture"] == i: - if train_num_dic[i] > 0: - train_data.append(item) - train_num_dic[i] -= 1 - elif valid_num_dic[i] > 0: - valid_data.append(item) - valid_num_dic[i] -= 1 - else: - test_data.append(item) - print("train_length:" + str(len(train_data))) - print("test_length:" + str(len(test_data))) - return train_data, valid_data, test_data - - -if __name__ == "__main__": - data = read_data("./data/complete_data") - train_data, valid_data, test_data = split_data(data, 0.6, 0.2) - write_data(train_data, "./data/train") - write_data(valid_data, "./data/valid") - write_data(test_data, "./data/test") diff --git a/tensorflow/lite/micro/examples/magic_wand/train/data_split_person.py b/tensorflow/lite/micro/examples/magic_wand/train/data_split_person.py deleted file mode 100644 index 75ac5c53082..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/train/data_split_person.py +++ /dev/null @@ -1,73 +0,0 @@ -# coding=utf-8 -# Copyright 2019 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================================================================== -"""Split data into train, validation and test dataset according to person. - -That is, use some people's data as train, some other people's data as -validation, and the rest ones' data as test. These data would be saved -separately under "/person_split". - -It will generate new files with the following structure: -├──person_split -│   ├── test -│   ├── train -│   └──valid -""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -import os -import random -from data_split import read_data -from data_split import write_data - - -def person_split(whole_data, train_names, valid_names, test_names): # pylint: disable=redefined-outer-name - """Split data by person.""" - random.seed(30) - random.shuffle(whole_data) - train_data = [] # pylint: disable=redefined-outer-name - valid_data = [] # pylint: disable=redefined-outer-name - test_data = [] # pylint: disable=redefined-outer-name - for idx, data in enumerate(whole_data): # pylint: disable=redefined-outer-name,unused-variable - if data["name"] in train_names: - train_data.append(data) - elif data["name"] in valid_names: - valid_data.append(data) - elif data["name"] in test_names: - test_data.append(data) - print("train_length:" + str(len(train_data))) - print("valid_length:" + str(len(valid_data))) - print("test_length:" + str(len(test_data))) - return train_data, valid_data, test_data - - -if __name__ == "__main__": - data = read_data("./data/complete_data") - train_names = [ - "hyw", "shiyun", "tangsy", "dengyl", "jiangyh", "xunkai", "negative3", - "negative4", "negative5", "negative6" - ] - valid_names = ["lsj", "pengxl", "negative2", "negative7"] - test_names = ["liucx", "zhangxy", "negative1", "negative8"] - train_data, valid_data, test_data = person_split(data, train_names, - valid_names, test_names) - if not os.path.exists("./person_split"): - os.makedirs("./person_split") - write_data(train_data, "./person_split/train") - write_data(valid_data, "./person_split/valid") - write_data(test_data, "./person_split/test") diff --git a/tensorflow/lite/micro/examples/magic_wand/train/data_split_person_test.py b/tensorflow/lite/micro/examples/magic_wand/train/data_split_person_test.py deleted file mode 100644 index b4e0e004c1e..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/train/data_split_person_test.py +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2019 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================================================================== -"""Test for data_split_person.py.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -import unittest -from data_split_person import person_split -from data_split_person import read_data - - -class TestSplitPerson(unittest.TestCase): - - def setUp(self): # pylint: disable=g-missing-super-call - self.data = read_data("./data/complete_data") - - def test_person_split(self): - train_names = ["dengyl"] - valid_names = ["liucx"] - test_names = ["tangsy"] - dengyl_num = 63 - liucx_num = 63 - tangsy_num = 30 - train_data, valid_data, test_data = person_split(self.data, train_names, - valid_names, test_names) - self.assertEqual(len(train_data), dengyl_num) - self.assertEqual(len(valid_data), liucx_num) - self.assertEqual(len(test_data), tangsy_num) - self.assertIsInstance(train_data, list) - self.assertIsInstance(valid_data, list) - self.assertIsInstance(test_data, list) - self.assertIsInstance(train_data[0], dict) - self.assertIsInstance(valid_data[0], dict) - self.assertIsInstance(test_data[0], dict) - - -if __name__ == "__main__": - unittest.main() diff --git a/tensorflow/lite/micro/examples/magic_wand/train/data_split_test.py b/tensorflow/lite/micro/examples/magic_wand/train/data_split_test.py deleted file mode 100644 index 692dac3edb4..00000000000 --- a/tensorflow/lite/micro/examples/magic_wand/train/data_split_test.py +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 2019 The TensorFlow Authors. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============================================================================== -"""Test for data_split.py.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -import json -import unittest -from data_split import read_data -from data_split import split_data - - -class TestSplit(unittest.TestCase): - - def setUp(self): # pylint: disable=g-missing-super-call - self.data = read_data("./data/complete_data") - self.num_dic = {"wing": 0, "ring": 0, "slope": 0, "negative": 0} - with open("./data/complete_data", "r") as f: - lines = f.readlines() - self.num = len(lines) - - def test_read_data(self): - self.assertEqual(len(self.data), self.num) - self.assertIsInstance(self.data, list) - self.assertIsInstance(self.data[0], dict) - self.assertEqual(set(list(self.data[-1])), - set(["gesture", "accel_ms2_xyz", "name"])) - - def test_split_data(self): - with open("./data/complete_data", "r") as f: - lines = f.readlines() - for idx, line in enumerate(lines): # pylint: disable=unused-variable - dic = json.loads(line) - for ges in self.num_dic: - if dic["gesture"] == ges: - self.num_dic[ges] += 1 - train_data_0, valid_data_0, test_data_100 = split_data(self.data, 0, 0) - train_data_50, valid_data_50, test_data_0 = split_data(self.data, 0.5, 0.5) - train_data_60, valid_data_20, test_data_20 = split_data( - self.data, 0.6, 0.2) - len_60 = int(self.num_dic["wing"] * 0.6) + int( - self.num_dic["ring"] * 0.6) + int(self.num_dic["slope"] * 0.6) + int( - self.num_dic["negative"] * 0.6) - len_50 = int(self.num_dic["wing"] * 0.5) + int( - self.num_dic["ring"] * 0.5) + int(self.num_dic["slope"] * 0.5) + int( - self.num_dic["negative"] * 0.5) - len_20 = int(self.num_dic["wing"] * 0.2) + int( - self.num_dic["ring"] * 0.2) + int(self.num_dic["slope"] * 0.2) + int( - self.num_dic["negative"] * 0.2) - self.assertEqual(len(train_data_0), 0) - self.assertEqual(len(train_data_50), len_50) - self.assertEqual(len(train_data_60), len_60) - self.assertEqual(len(valid_data_0), 0) - self.assertEqual(len(valid_data_50), len_50) - self.assertEqual(len(valid_data_20), len_20) - self.assertEqual(len(test_data_100), self.num) - self.assertEqual(len(test_data_0), (self.num - 2 * len_50)) - self.assertEqual(len(test_data_20), (self.num - len_60 - len_20)) - - -if __name__ == "__main__": - unittest.main() diff --git a/tensorflow/lite/micro/examples/magic_wand/train/netmodels/CNN/weights.h5 b/tensorflow/lite/micro/examples/magic_wand/train/netmodels/CNN/weights.h5 deleted file mode 100644 index 1d825b3aaf7c391757c4a95f1975498a2e47861c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40512 zcmeFa30#fcw>bVZ&vlyTIuSyWgw(Tk$CMB_wH<^I zG9?KiWJ;)nj2_At6V%#v-3$S{h`Z)Ha9`Mmb_`EqR;sqGcV zj~z0EVPqL;`_izz+8+(@+cOH{+9FPW0Q`#lPsV`zkO7{*%`dlolEU`TYeZW_MzV7M z)pa(ytvt3JUPc1-f5K_EuSfCktusvZ*ml77KwAFux>je(Bt0^cw$vGA$?6WCu`FPb z&-@wl0v7*XQ&-Z7)^Fu9Z411Oz!*jv`Yo6r=HTDn3B$~r5$+SRU_tQg`Llk@^l8{Pp|g$pMZUOwF66w1A}LTh6c=+*7XmVzc@ge_@iYXhqkQWOQkh`%Ti|q z?ekJ*^dvKzIm2&mz|b;{r%l{cQjcu>e#$ROqmcIzi+W_0U{A)+Q za{fnSK+0dd+Gi3+h~B1tnz>E_jmlL)}*an<@R;?ck8^MdmEgveHecS zS7!HTxOQ-6=%CRazt5$8!qRz3`ILl{EMBlEFnGbzwi@l*x`Z>d{T%EZ>>PW921?s2 z_>JlP`u)PdFAV&`z%LB^!oV*K{KCL54E(~tFAV&`z%LB^!oV*K{I|luxKX1A%Pp$xgV?kcGoC%$B2u{U_H<&qlG3*wuH+9pKwCz%M_ZURsx1s} zhZAmZi%8qcYEPH!Xv^of!p?Ys*Ap)d zm^~{f^j{RkKkJF5`W0!|rf=#gQJ>Ba2zIt_PtKe@W3jV++a#r$sy|OzYIl)-NSSs` zm5h8F=Gs3i({6^5g8i`${!zJ{MCbimOWJ(P-{;3Le8y0jF2&CV6H8B%WCd*ExMUN=8!Y#U8)txQ2HM*&HXIEJIkk)vx)!Ix%le5HW8PA3w1awxi9EH-=tRAI%5dq{VT9$c zz%ce8qz`w7;dXn$sK-%sG}(vtMm=cn`P0bssxCBj@B>c8T8$V@-Nv>QSwYNKMQm^w z0gl!#uwm!|GDT$=EzHs&^}e$=dHdppv!dBwnQap$&maG`Hk^`=GcYeDN+ zFM7Y;m+12B3EE61|J|40ZB>ps3Hs3cwIbTIaR4=nYa#nCf1_JE?4;H6Rzm89rNp82 z4Nb_qNw4VU(6OIikQGX*u4eChP&!(h9v#8B*3Udb)W>h7YnkJenV!xvHU&kQ^QKV2 z)<9B!dLlN>&!Qm{lOQlz)pdQ^J37-kiRQQ}kq-_rR6KPwEFW4$RZ5;yyWGpvYuIwU z(sGBE49z4q?w4WEiIX&Bc?0IT9VAuV%t*zj8X8i5k_?Z0NE(i+xe8p?aP@1BqaeGA zdi|)RnIFoiyxRmiBrlI9`pA=g&r<00M|HH;A^~H{BWQ7wAsy^hN|Y}wAp^xquK(S? z&#&?Q!oV*K{KCM$7XyEl8{6bIsUMT{+$0VE{c>QeRofW(e;VpvMvN+wPYm9kf(F^ps}&lc7}K#P8bHkf6Q4fAPE1koesh zF+b~@wE3>>vZjD>RAU@}v@3w5^!?Xi{pfY@wxATvG z#An3)+Ti~*_)8Ax{Kj*MhzNFe;q&1o$~lm~&zZ zt-Y*F!zT}=r3;plRMn9vRvM1{FSVGeork&Z3u(cSBxsP+pq_f0Fmd-tTEpqlbiOyu zy5EZkM@Dcqo16)g<{}CX>PTxd;vjOS7ELG~NALJ8B>vH^#3@OG@)ceoKbRpkkGqoE z_#q@mZz_#_=?Ec9$6>D4d{RHGGY!8qht{7v55iuPIllRMuxDDq+F=}hJI0L`_b)A}jrv3hSNYrSd&DSbGB_!^Ffg3ElGdQ5~i z9UftUSvJ@>6k+u}ZOrO-8N=mHfG5~sqRKN&b$9{xogV|cdpY5&e`6C@jUz(Y6b$h@ zgv=)y6mA_%ZQM>l^Za4N>9q<`zu$|dZX{UqbRwzml?%cRJ6#&$1`%6V7sA{L;#g-t zBJgpewhd~8S2&0W68&h|Tzw2#Falyfccmpv6EHG?tZ-GTi^mE*lGvpO4S9YMqdQ!O zpcCdq@Nf}wxPUO(JCW%*o>nY>jCx+<2rpt6CVp;#SYty>_3=QD*TbpsiWjCXc!!ZE zR+8K@Z%kjiNMg(AP3@oT1mE3{*^rhx)SK0ZmgY^R+^Xf2k&Sgx-n0?wH>(lBf&nyg zi7TyHVnb60nL>RJKNKFd#cE4sS{po*l$cjzxMvWNS71o&7m3ZKr!mbsW=GU_@JT}w z5c|lXn7ZmH3idn#-#TZKtLTV=!>(M}{lln!Q;Vkdvw@)LUL^O_N}4Lujqo+~X#F9E z)XP~yeOVQHjz5IC=}JU>pdraA4x`o6R?x)8)r4QEiOmsAX%h8Jk^`H-03vn{pyJiz2yEJv~;=AY?=eW|9ST7Es zwq5)Q>uN))QH4C!iym^dX_118h#Rm`}I-1 z&XE>axY7!DUy@~3j7+G6U(^M%Ww(sbz5ixpcPt~ht6U*8Z8<5U8^M0JBQW*$DC}%b z@2pfOo(sAmGxi(HTGA=P$|Fnqxi^b8q8+%tse*%KiA&TJB5 z-W6@4LJ41K1Lo%Jf=JCknwyah)%;S~cU!_MZ5EN-rwgE@XFM`X9b8IO#}TKm=P_nPFJk*ug~aw534;9@tk{sFu6!DW+(c-Y{h05Bg$AP0OLJ?)LwZFp7#V0G;^h7 z%^1^!j#Ef-RR`iBCm@Mu8qr-?2Yj=yZ2jb^ShIg3DfyvC`Aaj9&t2w1u31CNC{bT1@QKY>02XC#Gslf?63z>S_26j69dp)Q46yX2TR(W+cFnYl^_wFLW-u>rV^b zd^P<5jYRQ`ez75nRez!jimS2nm?%F$ZmD`*{JOuTHC(&CfWw5)Cn znoV9#PMU<%SOo_n+;zo8J%XV%YbFp!LuDdtsAFx17*cWi7p~=i4z+gcOZ+vgDBors zn|k2_XVj%9HKN^VY3%}<^}vKMD{MKhZ{dWQ(}gI~UQZy=onXm<&eSw-ZS8=OhR^9YKZWR8&&ef`WZ1oNuHjG6@}vyb>e9cildS-Or=B zIuc&}XchI^OfhnY3l$th@N_?cf0Zx)Z1<4Lk<#$rFE8d=wVkm9e>!UYRbKqBwR`-X z9;;$-+pvZ0qyMD`{?ljtmG}t*Kg*X=`9s*gj-=pHxzAIY@lS?QJ(gf#TSLC>{ry+# zfsNYLK*IL<{i2_L@=|{Q!{($iJQ8COf z`e{eRui#(Bz~9ji)BbLdw9^0A^doJz&F=A+2Y&u|;YVs0k;4DEh>mYyWTVb!kd^`#XE+@8kT#7}}Qlvn5nI z!#@xCuX3u*?*KAw*Q}W8c5rF!pVR+-xwUped(%$s;qSp;<<_A8v-m$e{*U-Z>iD)H z{Nfw`;h*BaWd}d=4Zd`g?fZ!|`5$fHtZ#ROkn*L!dv8!Wo?l@b27b10)^7Q~V@68n zxugH@aR1v%bKa%lq)}Ut>(Pj@=*+D>+zdveOIY!YP;|b0A7a(ru&%xULhY3CaV0~P zduT$+D_ugJ-?OlUZHCV$M^v z3u^$CWIjn0E`!tRI`o!aIb@lAXSwdND7 zK95~DC*Y>mIcP=+1m%2XN3Ew2RxC$#8!br9Hw}6qNSP`wxrqr$R?vJ(1NfgDxQoUj zsPDd)JKrQnO14_!?vcv0``H6HbAL3<@;ZbQ`NeQAP=PL1S0}B}-<&f)9u;1Qqr?uc|LJ{1OyG3ulwuY}t-H4~jqoZ@sgG(f@HO3q*I8mix}z^Buj z!Lv%6wM%V$p-qhJIXKi9)5Tq7dtNwyZ^!P8)d) zOX6H52FoNcUtmJYF0O*8ge@?A{#r;J-Hg$9+_3NG2Ix_*Nrh3ZZ1~SPQt(rPl4yqg^kav1>VCXh&gNv!Z00HFry5UR2X_~ z1dn8CY~ehU+&OD7lh{2qX!b50A}bh)+`X=#WAzSvH;#kql6NlmQf0_j)e@M-D3EB2 zq2S;egT?29K&hJvNgZ<)zjkYZflV90CiWbgxPJ=x4seIo%EzFX@fMzPcR|oG9yV6W z5Sb4q#3qtYr!3iyytz-=g1Q(G_6cBH)UA=xUcj;;7PMk~F_*ehnI_CJ1LrSKKv=58 zJ&n|$mPeFHanBx5e(yEhN;v}tj<&e^hyq>q)sh4q{emyJY{J`9uet#^APQu(Z@9@!59x55D(t^rpC|%_Rcg4meC3dNF&M#Mncs;LWWy>qT^P~+o(QhBfX4GI_`Wt-eIRrPnPsGwE3ShV! zao_SIkov=yosg1as2HwqkNKVsavBJ}M2gH7nhVYts5E>>?a zD;zmjG;^F1%~>)HJ_Yee?bKe_O_@SPbP@>SzHr%h_G0AuV{p`+N9WE+N6pm+G&DN` z7M%{oIS-34wlSGoYcc`njL5~WGrmB?Ts@ReHpJ#Gx49md@8Mga0WH;cfo1CQ#BJ6D z33o37vw(vTI_x%je~kd5_7KK5=fd0+b&@+r4s-99V2NfSTQYt>=Qt<;_Ro_ezT?#C zYv*#PUi;0(sIH4-PA^bA*_R_0(b#DKk6a)55^rV9#kCn9CHyZ(G_+2Sm{=YHKUW_0 z3$mbQbFSb~B(IW%-M5(#@tq16!Je_K*=2QfQd*C(`hHwDeFe##O+F+Z z>IemyrEJlAgtGAq*`_Z2Flb8#_vVrj708SQ#d+`Hoq|41b{>Q!Lte3o*)njgNS>~; z{tnvTWr>d2D?E^*L;`KqsqjsebM5^%Y(aD~TsE!2%R}^udf+Wo-CqaFHG!~yj3TLi zIF$=7FTu-U+H{rX3z#XWf?RJ~cBbE3FzabW_vJi=x*diRJ~Njs>v$H;SILutu?yhG z3oB};n*jwSd*PymDz?NtMZV5bZenr;ROom>b>l~o@W2&kqgCbXlg%c?`(zVVk59vT zw_a>sb}1-Mss!Z|?hu`*h~|?de5`w@OY3vV8rg11s~7I!d>_Pdk7hLB#VsGeuThcs zdR^syw91lLk7@AHMv<0HWZ0~``RtU-4>5Xd9ol#|px%hjXsL1=FW)hz>tf7kNFQ@d zQ#GWgeREK8)@STD&yosBxx63Gff(PH?1^i@x^)&97V3~WD^p-?pXZ<$8iod)I$)m_mZUV&6nHJqxv=L! zIA!HCs2!Wjc^>Tpnx8EwcViBY3hRe+zyh7aY~J6)UH` z1M8J)G%drB3iNm)n}XX86};pMAbn*4WG%C#<>i&|;)*7o zobLfQE{c%p#?F2o>pA?@}8?d$+5FGR$%Cx>FD0547{fasOzCfS8VSNXJ)U(E9a{5 zZ6_WG4mFDghuMMifELI#S;7i*TtrhX)Je6%4Gc7X4YKqEEGlqCALFlBY%>l#&8Op- zGiF3Dd^Y5N>xe<`)3_SHQxI=zNgt^j(A*EVG2ioow!nkKISP9=G#Ozb9g#6yu4DPrMm&7PkXR3y2~PW$prUyr zJk`Adt{yrhYS~8MoO;8BwOVxFl5pIV_84*|yhcW>CJLJp2jllPVvB1Y2<};M3)4)9 z!YmoWw-e&PC7&_8cN&*S^PqOZ8+LHtuFx+;n;hMe0^yraz?R5-Wcb_re|`N8&C{b$ zoehAUhi|~!sjcW_uL8;|3}N~Q4(%QVWA)7~P~`gtB9&F)e0N#m_Tn^@>1lxP{z`Un zsv2$bt%sW9o>>1x4>rkn#FPcPWTTlSi76S1?pOOj*uo?zS(yb1xEjQ*3%S&$d~Qy; zI&FAhLO1u6BLkh6qK&^T`X2d#L3JCri`r*F?W+=DS9w75npa$Ymu*m)eH_MkD-*>* zRw(=Q2aX@ag8@sTaDH|<&N+Gy_qy^)S0{B^@W=|_@qQGa>j@`=7h>wO3jDbDGV~2= zf@qT@&fk41L|d$985OxAFBJ(t8~K#=k5;06*55;gW*M^BSykedxkNyEhPGL)D1 zk`wlF=4!i|K~OgpiC^19WU>-reAfwJ`b>k|+VuraKh~t5Cl;XMnFW}fp@>_vui%eD zBYMhMhA@`iEN}5v&ScUiP|hBRah;547B>vkzUUJ1i3~P3-VTRv{tQm<&fwFT&A2%K z6vjl#(i<5W=(yD%kLdHryCoK6L??;wV0ty@J}@6`!k2<)s}~Ia@Cv*oJk@Ho0f||< z9YYT(V5veWzP8wmOvET>uh=C}_6)cd*>or$_zsw)*M(iTYmw@4ouO#rW;m88L(Z8M zgV(A&Hf+i&jNW7mEhfVt)v^yuq}+BIWsA30?De_~_59_Bp1#AB#&5sGi~MDx39 zzr~IiZNHiar8W1zSNThEHDv*F)66yD;OFDb4JB9@ng3NN`I>G}!b6c3wUQcjsD= zvJ^8qG2%3iKcz{N7M6kD?L(+I`aYh0XGV?uwP?nO9VlKb!=|p8hxIZWP$No#BoF9_ z7LEHMq&f+Yo-IXRD{El#jHp7g9ND>hAJoRD1JkiD7p?n}6{=^rOv&huHWxNZt>wFD@@IbiiD2oZJ~&?+iy*mxpL{Xbr|x&4Dt*r)+%VK3K18Kxeu=hiIh?=sWi_ z?DO~pf=2e^z16jzjVT7aKs8Qdf$Q( zTE_In>Af(w;~H#riH7<`!4PV%NpF7CAU*e(Qd-M;ahMyp$ zwSYD0?SW{aLxxW($2#6lTy|ZR#Kq{+o?t)=#IHHwn&&wGWChr|<>S32@u>A(iq{2!HAs|n{2^ERTd-UrOsl#Vlx-i3K%HefbSiSC!sft-;%>ENzLTVuDP z)5{XB+U1~&xJK7ylB*n1J^TjF1*%c`eO5SYnhx#0rU_q9kmwU;Ou^A^CPZYcMA-!@ z)Vi1C%otJ4G8TF?sBt@LN_Zc=+6_nT+<+FlH>15zCm2;%0_B;nFw%A$7l{8Ft>PBvI$ZkJFv z8JUQl7Cu~6p$T}M3C0U91z10>o)hde6-CA}$PHKspI_ZW_kmm4(i6t?F=tN8?H+>t zh(26R=@yJ|Y=-NNmw>4Wg=fy@q@|ZSt*D(1GtB~U@JS2sbk?ILdlMk`S~2@xU_v#= zpT*p79eUI%&zQGsK%&BTLDbk!a-fTo8=LKlAx`}=AkWZ53_;j|y zUKBhzBg*ye#&-7GjlCy}FrlOjoiCh+!|IZAeEdHKr>P&5HLhij9UoW+L=f-h}18 zui(Kv9(}X)K8CGm!BmrMm#KrRQSPt|ZJeu21**AN6KqV=9^8Wt8WV9#jRHwnk%4xD zm!eQT*TrnW3h)k(fTp(+-Qp{K?6b_2)W2BI1;%Dc==lU}iZh|9N6%nL;6+aH(pNaT z<_jENXGT^WnG3?z>zy~oYZHr{6DWLROc|FOE=fz@gSCbU&DGw3wtaL#bINY8lsSS+ zXDCs(jtW%R?*ON8MuVIx;So10K!X)!;LS*MnV-~2Sn_v>?X!g|(Fle^OK*dhhd)-R z?B=}kw{gx|#~_El6(8OHj)JR-T-pa6Dzn&>Y>>!3(IZ+|{d206KXxyB+|Ga`i?X0Z zJRjdGD^Y&vcQ5xjM*5(H%`E@izGAVR)3Zi~_(tYE~L{ zPDw%Lbr+YazMt_)Pi?}J=t~yuUWlq=FF@;?>tJn?3NKpLp|M2&Qg^!%W}mR4`gKvGDknE1_0EKQPKJd4=`Ppnx;8y= zFAD3=HRCG9Ti`ftDZ~V4q0#qxbg<6DXLC)+t){2oP^E<8m_SJAIv%UXz2`zEuH!0J zO7unsrWl#J4a$yL(Ox%F`ma z6MAf?LYRtog_-7WaIEA_uxjIa(G!Ur!C1NBv2n`8tbZ=7_Awxp>)wNj|5-?nIg6eh z4zl@$W|)xG6%&s;TJ$PP((`T(gy=@s#bEh6N$rhM) zQiFCIcm)mKZk3!9H{hI$6hf|8!W8B%_$!V@#quK65NYuK_VKlbR*Yj7mpfS3>C6Y(c48Xb|%R`AVHdCXq!T$dw|>oAY2Ty_`F9q5X| zH#C45ysOAsUY(j4&cN|=hQOwA>pTv`&WD@O-LMu1O3urM zZ(?y&pcp*QJz}@kyo7156-hlej@`0Ng*+K%OrNBw5&kx0nTXp(nX76bcIrF!P<0hv z-%|{`v~(zYZ7VzuRw2pO=kOL^p4z%=!O>U_=(j9Xtvd({BQ*(cJaB6ob*cIr$(oyY z3yPZS;r0E_SlJp2u|p29f|X^QP4IkR-Y$lj3sN9U;W^i+U`TwmEI7|(EpF_19}M{t zg@V~y+=3elr2a!VYN@CbpMBRc#P>Dlls^n)4^iOKdO?lh5@;wsiqE&HlUHk+(alMX zZizaG1ySzMBIt#l{TJdN-Hfh7*%3b)WSpp-!7xNF8Vs)Pz-0QWHy|%)Z<8Npd z{n%_yPlv^z+nA$Zmlu!ARwg4K3q-NIt=KW051`kUj@WWjR-$9!p@kZUqV5}U&oddq z<2FO_10xWwJy7&uP#P}zU`F}c{_y4#Lt@Sw(ojP=8gN#Z zeGZY-X(}4%p9#w^G$6mWH_Xw`2ENV#m$kOnq2+NDJfCGsJ-2IfnLjQ;6W0yy; zs0>VX)CryT9!`o%ur=lq3fIVqx>>!H+;{knT3+R7rj-Y8)h6J+&*!l`#ss znW%f&!*KP_Xxh_~_FG^`66a7hG{+oz251t?8E^30?!9+<1%O_N%cqr3Kc=@`!0&2Hxwt7e^XekqEaW z82j`Nq-Cm8jYw5$pIM0NDZ^mQVgr&mJDSbYr~{$Tb!XdedBAtODpGi$L4x+of#g>Q zQ8~>FPWZ{wTV)3%ccQd#?aY0^j11)#%+(@&_x8sIUCCL#-(vRAlWDkj%Uw+WZVd<1 z@=;}vC7HJQJ>IH61f_e9K;oQjkl)e_`}>#?CglbfUf_nIQ>xLXj~vwCJtR6qu{@&) zk1sYRPOa*6Z@f9twaCPfDf6+uzKP4zkHS<}3syfzLPwqftnZ`J1yMebPdW3kDXVA^>7-SvohOGM` zEYR7`KK3^tV#y7YShW>w<-Tlay_<)-7M{XsHzUz=pa}CjWI=O}6gEpa0WG%ZQ6&pL zeK-0IitjvO%Z`R~%+v!#`E~E1EG&eLR*UEE=u7Uh%pJ&8fA+;({lnmRy&3t8Ebi)O zPK=6kxX?j|VC_Rq+H1oP42j;wiaQ8Ice?w*gAf@y^I;vVyTKt$io{1(_knxt8kpXD zC}zHW0aG#&I{0tH%Aoh?;oXe*&VrQA)}f<9o`KH2`M4nECEBJbQ=x1ETm85RlMY+a zmZ2id-T8!d?=cK^j(!OjZ`^|sg;{uL-)q=CB^_(Rb)k6O2G9v8gRnl2@X)Lp;KiGA zvHK2SNW)Gb=En4G*K`mU_mk{#VlMoeEVZAu9J3T9_eE>PD9m=^WT%OtV$D*JIl?3U z_4^>SSAVeCzlZZM=>)#36uGEVnZOV5;{?$RlL}uIUG7ci0Kbo@ZjQ1+^xD9bC20^MF%fR>`M(G z9x?!!+l0F$qeI-Y3%SWF_h7JbH0bFa#EXw|;biL!OnvQOK4g>Ept3RWjM*3EF0#fQf7@Xl|c~t)md^>K{gGLw6uDw7x>;fA)trMmN=+bew z-{WA-F<7@S2AqaiVzitA1g(0-=0-cR;?=`lBqnUAK6{;IN(Zv%J{|uB>7A0FF>Lx~P)ec+FtsTolB3Xmz*=&T>AsQ~QC{i~#p0(J($kv#(N&^T&d``HcV9BKtkL#sg;XT=KM_2p*t zwxYLsThdK?A3&Yya~wHRla>wJ&b~;0j%#PHm)!4tC0aO0gB+0PJ&d-xfPzGpI`nD| zitW#F^|xNI?!ocwxk)cTZ^vU`g$~t!Q;sD0C>K@Ws!F2Jht2$_F3dPFFSL z4b|hktF&;=Z8_Say9PsV?SM<4AEKs#7M-xlgcQ`uLUg?&WIntOUO5l&V(LZQv0H~s z+%G9V8MJI0stBLwFI=d$va!SV!Gxy-7&60c5yO*mZ-ZOVA>19HBDp)8gyQpV+>0PBtRFv_ z_3U;MmadlEy_?_xMpoCj)B6f>TyJ%9q*$K}8Kg*NhndprH!@_pExmlD{5*>Aapw|TVxBxS;ne}SG#&am?1KJ@G^==|skt;a<5-4k3-UUjGLeYBhC=e{l76qv25gmtm<5P`%WzsA6D?Sam4O{bfL#pj3m!-;z#9b$k zRWD&{9*byB@3`FbvRJn_J+ zTaP*BY!{X*e1#px#9JCGkcrAUA^{IY!-KTahkJZoPpyt2cpfg2ZnhI!YOBaW9K|Sj9k?j#?3G%Vy$9s)hiR4o|FN(i<;O2gUxAoiQJ_$ z&4?TgyntiV<6zV1+gLT>FboJfjT6Rbk+B_|%*VDfg!I7lxLe}2sk zo-qsq8*LQvYFM5-s0h-A{&;NA7wggRHiyebP)ce7D(rv1D7;3KX7$hH7WoashdcCWQ=%MQ_3SOQvJ#&fgSFtsJ%Wa3yK#e;>r%z|DlEBfNR!{SVCBh;P_d~S@E025ZARh)G_XiSBsQ&<>1R=F ze#xa~AA#rtnvnYRs*B)42|9jog}bW9F{?=vuCIuJ(hieR92^fp{#!ABS~UcEJ_lQ7 zIXqu2L(i2QfzcA$`WUeh_yyW*YPUTuM~oQ~v0o2e0xU^FpDS2m@{MDz%8R0Yl);dz zx+LQsLssrlC&m5Dfpx!!v0G$)GZNePFVrJQw=M&4-$n;lw(zY6vIa)d0M;a z8D~3Cg<3iq5u-Z}80%WdIet6=4ZAx+?Ckv@o7Dg_?Mp#@&N}F?qe)8NOorS`0;u9B&yJ_SPY&z+VNye{mO@%%k?idR<4;YY$ zsdpjZvMj02m&mKvsEg^{WBAmy0E{&?N#MzB7(CMvIW`&CM}7$g<)H7;%-Gj?Jad$W}?e3W~mOgR5#UxpUM6|k{q z53|b0P2u?7YP2YtgLh3;N!JP;vTaui=02Urop9ZNNw2^xOdK_v4a@v=h$PU+iF<+M2TE?RHmVI%ON(1!|0{y_$6*T zo~*C~{=n-ZllOkOywr*W`*ep6+Sidc<|5ubWkBOw>*4!Vd766Jf_r3k9!6*J$cck8 zWZjU%=)cH;@d0&p|?|g?wi^E}Fml|xSD#VqVR`f0N8OH?hX;Y9ceb7nrhRWr6 zP+S}XxjJvSExW8}amP$JI$ENmOgoOAce-QYI!khM2#3?%qoCQf8WVFjz{RpAFp5ut zfis?9pVMEF-|$)TZcu4cI}lcYacY z6%Pgg-B$<9SUoyKqPvp6G8R3LFMuz*IUJ(JBb8OM)N}lGu0whboSf>61!@#KESZOO zh7G7aBN1&oSkn6QN^IGzbud|5hp6AP$Mb<-aN43mOiapU-zur%@HLXRTePllpIBA0 zxy6Lknit@Q@jUu=hBjT|V@~_t&cUcn=G6Ie6NG%z!$*D>z$RP;Gl#zc#RuuYlS{z7 zTPx7EJ_(eSSK}een-F&oQDGL(INc==! z?u0()_Mp2}FF0{D5shME*vFl7G4X8!#Md<(fImI13`ya1r$$ z`39TC2cS$_32#wVym!l-CcPGesw2g@eYL2Jx5S=xtpS^&P@;2Zh^$2bt~qE*j%dnI zua<={`5=$T790kruLiWJI3EVT8wW|#6lP?1AL_ z^Xsr``&9VWOO@0wOW{1use;z?Ld@$^1eqThdT3Q8OuDB)cuPuIg`Yh>vWFaqOm%*jgh)gE0>J=6r&4j#nY6S0yIg*#rTl8pP*;9yw%o4p%-& zz?bV(Npi_P%->!OFVa&Ws`DPm6+0kfpIDf>;}TanYdci*Im+Igvk_DJTae}tC&6i0 zGdtpjB=<=XZE?{WY||p-K7vkjZ%sc+n5P7pW@ zg=+_+{lWp5m0HJf#0DZ&R8UxQ%z6IetFUskJo)k}1AX&DIFY&nDN5t8v*I3{dccZQ z=en{_t{PLjO;6$B;xkwxcZ=gUDX^N))8MgzC28951xEeI2SJ9&B`;i#7WFy}CwFB6 zlk(bGm^l%3Zz~bIrt6ScB@e!Zek^myTvQJoq5iNUo0?hX!fvWXPn$>V5SAg#q8yQj zNSmG=t4ln>^x?D7QB2Z#jD-iyN%(|Lh!PoophpX+o1Z|tC0EdX$Wbn6W)f&#u7jAl zEAfy?G&s4{pw%5E+Bip!#?N{U{&TlM_I4f-ys?L;pE5Ciio`yui=yc6r#LkgJ{fDc z3kQyA!BdkC;G?4kRLTE1p1vWm+Z<8?+s(sJdB`U=@Zf2D`?e#P6rBY1*mzuVKm~o1 z`0SNgIncF9iSUZ=ak0h;Z1#RDBEM@m=*?PyatS=rXNf*(QF6pLrwxek*e20%#bfX( zQJFT*Qlfd`Wf(GYE^9Mr5b$j)Mfc`eQBAw8@On-Y_U&2=wTCxyS;k>dTx&p$JhZ|0 zOFRgC=D6HBEBQMytRJO}e5+0htb$xHxQsG}|>9>A(aSa#a&( z&uTb7$O+}wnxwK~OH^?Gwv!JHqD=!gfXvQ>_0`-c(pDI=5{(b3DIy-kpS=gC?VaJu zFabTGG8-lP{D7*;!Qv1P%xg%L&T-}Zu4^%PF43Ze4`Q)3V!-Zql%iSnFQ{;f#q=gA?%HLHtIYZA zz@l<+|KcJ;t(T!=kP(-MAqDr)-|>fs0@_>uXACS%z$|+Kd&X3sj#$ALd2Js_$Imoi zw{tlg1{2MoSbrSy+UqEB7%S4!>4G`;V?e%cE)%)*IF~P@&6+okMrR*gcI?9dIBD=b zF8ipK5r>~;tSy9ej^`3wxR6Ju?3;^%(dCrPBn&51d&Av%LiUom4xY;?#>{bCF0ex# zr5$=1Bd)HOre^5T1Gn7A+5$7yWzT-_uujC&N2}3m#{tAp1(sy}ia8A#a3snG(oVE7 z7oRj>p>_$Z-c-Sam97QPTuXY|nnsX}kwQ|o3CnA$rYx%7VZGaiqNC9;daB`WG(0sM z`8Da3Xx$Dp%%6nX3xpWN<)&0^90UhP=R&AWEDkY>VY&-!(B)PL_{C?UcHv;GXwXH8 z=6BR&xdj`$Di5kkzJ&`ddi0tnmUPYXSWJ;wfL8EbV1$#QJ^mDxJ-rgLj%~)Y2S-JM zPmG~+Un-Mk)hG(8w8ui6q&DnHN}b7z%N{$n?ThaqS8>q@BR zwk~EReG`37CgQFc9;o4MbHa{hA$(>x_!{fN1V0m2uFKWWBsqaqtRGHQjG&_gj!qvhz)lJN7rmuH-70t9Ap+>j%>o@`3EM0xl2e-55B${tC6!&4{IDjY6lK z49Kd}V_V0^!TfEbApYELSTWR`c8e>3%ouZYPjH1rk(Z#&r2;3)&ZB$yA!_-LL+M0m zI-_f!gsqB4AZxydR?}T@hJ7#=b-zRFgcN&;SpMHgV0=&>)Rt6!d{$N#c z8K(G*#AN|8s(0P^%fdHn7b>NDvk7s zbCINEB>V4`E3$vV*Qx>abBNeyv#NhO5l$T+N@eC``ah4ve$@N5{~LUqzhrzaJ`UF% zgy3?h5%R& zgqNsX*j9CJ^mV>8CoB2;&zG0{!QRlvtDi3dm7FfB{X@hi_DX1iX+?~J!~ Date: Mon, 27 Mar 2023 10:16:00 -0700 Subject: [PATCH 2/2] remove magic_wand from project_generation and other places. --- tensorflow/lite/micro/docs/new_platform_support.md | 3 +-- .../lite/micro/tools/ci_build/test_project_generation.sh | 2 +- .../lite/micro/tools/make/targets/arc_custom_makefile.inc | 1 - .../lite/micro/tools/make/targets/bluepill_makefile.inc | 1 - .../lite/micro/tools/make/targets/stm32f4_makefile.inc | 1 - .../lite/micro/tools/make/targets/xtensa_makefile.inc | 1 - tensorflow/lite/micro/tools/project_generation/Makefile | 6 +----- 7 files changed, 3 insertions(+), 12 deletions(-) diff --git a/tensorflow/lite/micro/docs/new_platform_support.md b/tensorflow/lite/micro/docs/new_platform_support.md index 069a38a9e35..692d98ed036 100644 --- a/tensorflow/lite/micro/docs/new_platform_support.md +++ b/tensorflow/lite/micro/docs/new_platform_support.md @@ -45,7 +45,6 @@ only the sources that are necessary to build the code TFLM library. python3 tensorflow/lite/micro/tools/project_generation/create_tflm_tree.py \ -e hello_world \ -e micro_speech \ - -e magic_wand \ -e person_detection \ /tmp/tflm-tree ``` @@ -114,7 +113,7 @@ optimized kernel implementations (and associated third party dependencies). For example: ``` python3 tensorflow/lite/micro/tools/project_generation/create_tflm_tree.py \ - -e hello_world -e magic_wand -e micro_speech -e person_detection \ + -e hello_world -e micro_speech -e person_detection \ --makefile_options="TARGET=cortex_m_generic OPTIMIZED_KERNEL_DIR=cmsis_nn TARGET_ARCH=project_generation" \ /tmp/tflm-cmsis ``` diff --git a/tensorflow/lite/micro/tools/ci_build/test_project_generation.sh b/tensorflow/lite/micro/tools/ci_build/test_project_generation.sh index 5fdd87baea5..8814a60e933 100755 --- a/tensorflow/lite/micro/tools/ci_build/test_project_generation.sh +++ b/tensorflow/lite/micro/tools/ci_build/test_project_generation.sh @@ -52,7 +52,7 @@ source ${TENSORFLOW_ROOT}tensorflow/lite/micro/tools/ci_build/helper_functions.s # Next, we test that create_tflm_tree can be used to build example binaries. We # perform this test with a Makefile (instead of bazel) because make is more # commonly understood and because we use make for cross-compilation. -EXAMPLES="-e hello_world -e magic_wand -e micro_speech -e person_detection" +EXAMPLES="-e hello_world -e micro_speech -e person_detection" TEST_OUTPUT_DIR="$(mktemp -d)" diff --git a/tensorflow/lite/micro/tools/make/targets/arc_custom_makefile.inc b/tensorflow/lite/micro/tools/make/targets/arc_custom_makefile.inc index 1e6287d761c..84e2d030e24 100644 --- a/tensorflow/lite/micro/tools/make/targets/arc_custom_makefile.inc +++ b/tensorflow/lite/micro/tools/make/targets/arc_custom_makefile.inc @@ -62,7 +62,6 @@ MICROLITE_TEST_SRCS := $(filter-out $(EXCLUDED_TESTS), $(MICROLITE_TEST_SRCS)) EXCLUDED_EXAMPLE_TESTS := \ $(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/hello_world/Makefile.inc \ - $(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/Makefile.inc \ $(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/memory_footprint/Makefile.inc \ $(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/micro_speech/Makefile.inc \ $(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/network_tester/Makefile.inc \ diff --git a/tensorflow/lite/micro/tools/make/targets/bluepill_makefile.inc b/tensorflow/lite/micro/tools/make/targets/bluepill_makefile.inc index fb86db7e014..c14bda496e7 100644 --- a/tensorflow/lite/micro/tools/make/targets/bluepill_makefile.inc +++ b/tensorflow/lite/micro/tools/make/targets/bluepill_makefile.inc @@ -73,7 +73,6 @@ EXCLUDED_TESTS += $(TENSORFLOW_ROOT)tensorflow/lite/micro/flatbuffer_utils_test. MICROLITE_TEST_SRCS := $(filter-out $(EXCLUDED_TESTS), $(MICROLITE_TEST_SRCS)) EXCLUDED_EXAMPLE_TESTS := \ - $(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/Makefile.inc \ $(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/micro_speech/Makefile.inc MICRO_LITE_EXAMPLE_TESTS := $(filter-out $(EXCLUDED_EXAMPLE_TESTS), $(MICRO_LITE_EXAMPLE_TESTS)) diff --git a/tensorflow/lite/micro/tools/make/targets/stm32f4_makefile.inc b/tensorflow/lite/micro/tools/make/targets/stm32f4_makefile.inc index 7ffd7ece160..21db90549a5 100644 --- a/tensorflow/lite/micro/tools/make/targets/stm32f4_makefile.inc +++ b/tensorflow/lite/micro/tools/make/targets/stm32f4_makefile.inc @@ -94,7 +94,6 @@ EXCLUDED_TESTS += ${TENSORFLOW_ROOT}tensorflow/lite/micro/flatbuffer_utils_test. MICROLITE_TEST_SRCS := $(filter-out $(EXCLUDED_TESTS), $(MICROLITE_TEST_SRCS)) EXCLUDED_EXAMPLE_TESTS := \ - ${TENSORFLOW_ROOT}tensorflow/lite/micro/examples/magic_wand/Makefile.inc \ ${TENSORFLOW_ROOT}tensorflow/lite/micro/examples/micro_speech/Makefile.inc MICRO_LITE_EXAMPLE_TESTS := $(filter-out $(EXCLUDED_EXAMPLE_TESTS), $(MICRO_LITE_EXAMPLE_TESTS)) diff --git a/tensorflow/lite/micro/tools/make/targets/xtensa_makefile.inc b/tensorflow/lite/micro/tools/make/targets/xtensa_makefile.inc index 62af4b5020f..8d970c72bb9 100644 --- a/tensorflow/lite/micro/tools/make/targets/xtensa_makefile.inc +++ b/tensorflow/lite/micro/tools/make/targets/xtensa_makefile.inc @@ -84,7 +84,6 @@ MICROLITE_TEST_SRCS := $(filter-out $(EXCLUDED_TESTS), $(MICROLITE_TEST_SRCS)) EXCLUDED_EXAMPLE_TESTS := \ $(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/hello_world/Makefile.inc \ $(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/image_recognition_experimental/Makefile.inc \ - $(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/magic_wand/Makefile.inc \ $(TENSORFLOW_ROOT)tensorflow/lite/micro/examples/network_tester/Makefile.inc MICRO_LITE_EXAMPLE_TESTS := $(filter-out $(EXCLUDED_EXAMPLE_TESTS), $(MICRO_LITE_EXAMPLE_TESTS)) MICRO_LITE_EXAMPLE_TESTS += $(shell find $(TENSORFLOW_ROOT)third_party/xtensa/examples/ -name Makefile.inc) diff --git a/tensorflow/lite/micro/tools/project_generation/Makefile b/tensorflow/lite/micro/tools/project_generation/Makefile index 199d57192d7..092ba7e07f4 100644 --- a/tensorflow/lite/micro/tools/project_generation/Makefile +++ b/tensorflow/lite/micro/tools/project_generation/Makefile @@ -117,10 +117,6 @@ hello_world: libtflm @mkdir -p $(BINDIR) $(CXX) $(CXXFLAGS) $(HELLO_WORLD_SRCS) $(HELLO_WORLD_INCLUDES) $(LIB) -o $(BINDIR)/$@ -magic_wand: libtflm - @mkdir -p $(BINDIR) - $(CXX) $(CXXFLAGS) $(wildcard examples/magic_wand/*.cc) $(INCLUDES) $(LIB) -o $(BINDIR)/$@ - MICRO_SPEECH_SRCS := $(wildcard examples/micro_speech/*.cc) MICRO_SPEECH_SRCS += $(wildcard examples/micro_speech/*/*.cc) MICRO_SPEECH_THIRD_PARTY_SRCS := @@ -138,4 +134,4 @@ person_detection: libtflm @mkdir -p $(BINDIR) $(CXX) $(CXXFLAGS) $(PERSON_DETECTION_SRCS) $(PERSON_DETECTION_THIRD_PARTY_SRCS) $(PERSON_DETECTION_INCLUDES) $(LIB) -o $(BINDIR)/$@ -examples: hello_world magic_wand micro_speech person_detection +examples: hello_world micro_speech person_detection