Skip to content

Commit 5dde9b7

Browse files
petewardenpetewarden
committed
Moved targets to examples directory
1 parent 97f5424 commit 5dde9b7

File tree

6 files changed

+118
-221
lines changed

6 files changed

+118
-221
lines changed

‎tensorflow/lite/experimental/micro/examples/micro_speech/Makefile.inc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,6 @@ $(MICRO_SPEECH_BINARY): $(MICRO_SPEECH_OBJS) $(MICROLITE_LIB_PATH)
151151
$(LIBFLAGS) $(MICROLITE_LIB_PATH) $(LDFLAGS) $(MICROLITE_LIBS)
152152
micro_speech: $(MICRO_SPEECH_BINARY)
153153
micro_speech_bin: $(MICRO_SPEECH_BINARY).bin
154+
155+
# Find any platform-specific rules for this example.
156+
include $(wildcard tensorflow/lite/experimental/micro/examples/micro_speech/*/Makefile.inc)

‎tensorflow/lite/experimental/micro/examples/micro_speech/apollo3/Makefile.inc‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
# Settings for apollo3 evb platforms.
2+
ifeq ($(TARGET), apollo3evb)
3+
4+
PUSHBUTTON_MICRO_SPEECH_TEST_SRCS := \
5+
$(AP3_MICRO_DIR)/../preprocessor.cc \
6+
$(AP3_MICRO_DIR)/pushbutton_main.c \
7+
$(AP3_MICRO_DIR)/pushbutton_test.cc \
8+
$(AP3_MICRO_DIR)/../tiny_conv_model_data.cc \
9+
$(APOLLO3_SDK)/devices/am_devices_led.c
10+
ALL_SRCS += $(PUSHBUTTON_MICRO_SPEECH_TEST_SRCS)
11+
PUSHBUTTON_MICRO_SPEECH_TEST_OBJS := $(addprefix $(OBJDIR), \
12+
$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(PUSHBUTTON_MICRO_SPEECH_TEST_SRCS))))
13+
PUSHBUTTON_MICRO_SPEECH_TEST_BINARY := $(BINDIR)pushbutton_micro_speech_test
14+
$(PUSHBUTTON_MICRO_SPEECH_TEST_BINARY): $(PUSHBUTTON_MICRO_SPEECH_TEST_OBJS) $(MICROLITE_LIB_PATH)
15+
@mkdir -p $(dir $@)
16+
$(CXX) $(CXXFLAGS) $(INCLUDES) \
17+
-o $(PUSHBUTTON_MICRO_SPEECH_TEST_BINARY) $(PUSHBUTTON_MICRO_SPEECH_TEST_OBJS) \
18+
$(LIBFLAGS) $(MICROLITE_LIB_PATH) $(LDFLAGS) $(MICROLITE_LIBS)
19+
pushbutton_micro_speech_test: $(PUSHBUTTON_MICRO_SPEECH_TEST_BINARY)
20+
pushbutton_micro_speech_test_bin: $(PUSHBUTTON_MICRO_SPEECH_TEST_BINARY).bin
21+
test_pushbutton_micro_speech: $(PUSHBUTTON_MICRO_SPEECH_TEST_BINARY)
22+
$(TEST_SCRIPT) $(PUSHBUTTON_MICRO_SPEECH_TEST_BINARY) '~~~ALL TESTS PASSED~~~'
23+
24+
PUSHBUTTON_CMSIS_SPEECH_TEST_SRCS := \
25+
$(AP3_MICRO_DIR)/pushbutton_main.c \
26+
$(AP3_MICRO_DIR)/pushbutton_test.cc \
27+
$(AP3_MICRO_DIR)/../tiny_conv_model_data.cc \
28+
$(CMSIS_DIR)/preprocessor.cc \
29+
$(CMSIS_EXT_DIR)/arm_cmplx_mag_squared_q10p6.c \
30+
$(CMSIS_DIR)/hanning.c \
31+
$(APOLLO3_SDK)/devices/am_devices_led.c \
32+
$(CMSIS_SRCS)
33+
ALL_SRCS += $(PUSHBUTTON_CMSIS_SPEECH_TEST_SRCS)
34+
PUSHBUTTON_CMSIS_SPEECH_TEST_OBJS := $(addprefix $(OBJDIR), \
35+
$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(PUSHBUTTON_CMSIS_SPEECH_TEST_SRCS))) \
36+
arm_bitreversal2.o)
37+
PUSHBUTTON_CMSIS_SPEECH_TEST_BINARY := $(BINDIR)pushbutton_cmsis_speech_test
38+
$(PUSHBUTTON_CMSIS_SPEECH_TEST_BINARY): $(PUSHBUTTON_CMSIS_SPEECH_TEST_OBJS) $(MICROLITE_LIB_PATH)
39+
@mkdir -p $(dir $@)
40+
$(CXX) $(CXXFLAGS) $(INCLUDES) \
41+
-o $(PUSHBUTTON_CMSIS_SPEECH_TEST_BINARY) $(PUSHBUTTON_CMSIS_SPEECH_TEST_OBJS) \
42+
$(LIBFLAGS) $(MICROLITE_LIB_PATH) $(LDFLAGS) $(MICROLITE_LIBS)
43+
pushbutton_cmsis_speech_test: $(PUSHBUTTON_CMSIS_SPEECH_TEST_BINARY)
44+
pushbutton_cmsis_speech_test_bin: $(PUSHBUTTON_CMSIS_SPEECH_TEST_BINARY).bin
45+
test_pushbutton_cmsis_speech: $(PUSHBUTTON_CMSIS_SPEECH_TEST_BINARY)
46+
$(TEST_SCRIPT) $(PUSHBUTTON_CMSIS_SPEECH_TEST_BINARY) '~~~ALL TESTS PASSED~~~'
47+
48+
PREPROCESSOR_1K_SRCS := \
49+
tensorflow/lite/experimental/micro/examples/micro_speech/apollo3/preprocessor_1k.cc \
50+
tensorflow/lite/experimental/micro/examples/micro_speech/CMSIS/sin_1k.cc
51+
52+
PREPROCESSOR_1K_MICRO_TEST_SRCS := \
53+
$(PREPROCESSOR_1K_SRCS) \
54+
$(AP3_MICRO_DIR)/../fixed_point/preprocessor.cc \
55+
$(AP3_EXT_MICRO_DIR)/system_apollo3.c \
56+
$(AP3_MICRO_DIR)/_main.c
57+
ALL_SRCS += $(PREPROCESSOR_1K_MICRO_TEST_SRCS)
58+
PREPROCESSOR_1K_MICRO_TEST_OBJS := $(addprefix $(OBJDIR), \
59+
$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(PREPROCESSOR_1K_MICRO_TEST_SRCS))))
60+
PREPROCESSOR_1K_MICRO_TEST_BINARY := $(BINDIR)preprocessor_1k_micro_test
61+
$(PREPROCESSOR_1K_MICRO_TEST_BINARY): $(PREPROCESSOR_1K_MICRO_TEST_OBJS) $(MICROLITE_LIB_PATH)
62+
@mkdir -p $(dir $@)
63+
$(CXX) $(CXXFLAGS) $(INCLUDES) \
64+
-o $(PREPROCESSOR_1K_MICRO_TEST_BINARY) $(PREPROCESSOR_1K_MICRO_TEST_OBJS) \
65+
$(LIBFLAGS) $(MICROLITE_LIB_PATH) $(LDFLAGS) $(MICROLITE_LIBS)
66+
preprocessor_1k_micro_test: $(PREPROCESSOR_1K_MICRO_TEST_BINARY)
67+
preprocessor_1k_micro_test_bin: $(PREPROCESSOR_1K_MICRO_TEST_BINARY).bin
68+
test_preprocessor_1k_micro: $(PREPROCESSOR_1K_MICRO_TEST_BINARY)
69+
$(TEST_SCRIPT) $(PREPROCESSOR_1K_MICRO_TEST_BINARY) '~~~ALL TESTS PASSED~~~'
70+
71+
PREPROCESSOR_1K_CMSIS_TEST_SRCS := \
72+
$(PREPROCESSOR_1K_SRCS) \
73+
$(CMSIS_DIR)/preprocessor.cc \
74+
$(CMSIS_EXT_DIR)/arm_cmplx_mag_squared_q10p6.c \
75+
$(CMSIS_DIR)/hanning.c \
76+
$(AP3_EXT_MICRO_DIR)/system_apollo3.c \
77+
$(AP3_MICRO_DIR)/_main.c \
78+
$(CMSIS_SRCS)
79+
ALL_SRCS += $(PREPROCESSOR_1K_CMSIS_TEST_SRCS)
80+
PREPROCESSOR_1K_CMSIS_TEST_BINARY := $(BINDIR)preprocessor_1k_cmsis_test
81+
PREPROCESSOR_1K_CMSIS_TEST_OBJS := $(addprefix $(OBJDIR), \
82+
$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(PREPROCESSOR_1K_CMSIS_TEST_SRCS)))\
83+
arm_bitreversal2.o)
84+
$(PREPROCESSOR_1K_CMSIS_TEST_BINARY): $(PREPROCESSOR_1K_CMSIS_TEST_OBJS) $(MICROLITE_LIB_PATH)
85+
@mkdir -p $(dir $@)
86+
$(CXX) $(CXXFLAGS) $(INCLUDES) \
87+
-o $(PREPROCESSOR_1K_CMSIS_TEST_BINARY) $(PREPROCESSOR_1K_CMSIS_TEST_OBJS) \
88+
$(LIBFLAGS) $(MICROLITE_LIB_PATH) $(LDFLAGS) $(MICROLITE_LIBS)
89+
preprocessor_1k_cmsis_test: $(PREPROCESSOR_1K_CMSIS_TEST_BINARY)
90+
preprocessor_1k_cmsis_test_bin: $(PREPROCESSOR_1K_CMSIS_TEST_BINARY).bin
91+
test_preprocessor_1k_cmsis: $(PREPROCESSOR_1K_CMSIS_TEST_BINARY)
92+
$(TEST_SCRIPT) $(PREPROCESSOR_1K_CMSIS_TEST_BINARY) '~~~ALL TESTS PASSED~~~'
93+
94+
PREPROCESSOR_TEST_SRCS += \
95+
$(AP3_MICRO_DIR)/_main.c
96+
97+
$(OBJDIR)arm_bitreversal2.o:
98+
$(CXX) $(CXXFLAGS) $(INCLUDES) -c $(CMSIS_SRC_DIR)/TransformFunctions/arm_bitreversal2.S -o $(OBJDIR)arm_bitreversal2.o
99+
100+
endif

‎tensorflow/lite/experimental/micro/examples/micro_speech/apollo3/preprocessor_1k.cc‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,29 @@ See the License for the specific language governing permissions and
1313
limitations under the License.
1414
==============================================================================*/
1515

16-
/* This file is a modification of the Tensorflow Micro Lite file preprocessor.cc */
16+
/* This file is a modification of the Tensorflow Micro Lite file preprocessor.cc
17+
*/
1718

18-
#include "tensorflow/lite/experimental/micro/examples/micro_speech/CMSIS/sin_1k.h"
1919
#include "tensorflow/lite/c/c_api_internal.h"
20+
#include "tensorflow/lite/experimental/micro/examples/micro_speech/CMSIS/sin_1k.h"
2021
#include "tensorflow/lite/experimental/micro/micro_error_reporter.h"
2122
#include "tensorflow/lite/experimental/micro/testing/micro_test.h"
2223

2324
extern "C" {
24-
#include "tensorflow/lite/experimental/micro/examples/micro_speech/apollo3_ext/system_apollo3.h"
25-
#include "tensorflow/lite/experimental/micro/examples/micro_speech/apollo3_ext/apollo3.h"
25+
#include "apollo3.h"
26+
#include "system_apollo3.h"
2627
}
2728

2829
#define output_data_size 43
2930
int count;
3031

3132
extern TfLiteStatus Preprocess(tflite::ErrorReporter* error_reporter,
32-
const int16_t* input, int input_size, int output_size,
33-
uint8_t* output);
33+
const int16_t* input, int input_size,
34+
int output_size, uint8_t* output);
3435

3536
TF_LITE_MICRO_TESTS_BEGIN
3637
CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
37-
//DWT->LAR = 0xC5ACCE55;
38+
// DWT->LAR = 0xC5ACCE55;
3839
DWT->CYCCNT = 0;
3940
DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk;
4041

@@ -43,12 +44,10 @@ TF_LITE_MICRO_TEST(TestPreprocessor) {
4344
tflite::ErrorReporter* error_reporter = &micro_error_reporter;
4445

4546
uint8_t calculated_data[output_data_size];
46-
TfLiteStatus yes_status = Preprocess(
47-
error_reporter, g_sin_1k, g_sin_1k_size,
48-
output_data_size, calculated_data);
47+
TfLiteStatus yes_status = Preprocess(error_reporter, g_sin_1k, g_sin_1k_size,
48+
output_data_size, calculated_data);
4949
count = DWT->CYCCNT;
5050
TF_LITE_MICRO_EXPECT_EQ(kTfLiteOk, yes_status);
51-
5251
}
5352

5453
TF_LITE_MICRO_TESTS_END

‎tensorflow/lite/experimental/micro/tools/make/Makefile‎

Lines changed: 2 additions & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -53,46 +53,6 @@ CC_PREFIX :=
5353
# runtime that can be linked in to other programs.
5454
MICROLITE_LIB_NAME := libtensorflow-microlite.a
5555

56-
# Test binary for the microcontroller speech model.
57-
MICRO_SPEECH_TEST_SRCS := \
58-
tensorflow/lite/experimental/micro/examples/micro_speech/micro_speech_test.cc \
59-
tensorflow/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.cc \
60-
tensorflow/lite/experimental/micro/examples/micro_speech/no_features_data.cc \
61-
tensorflow/lite/experimental/micro/examples/micro_speech/yes_features_data.cc
62-
63-
# Test binary for the streaming microcontroller speech model.
64-
PUSHBUTTON_MICRO_SPEECH_TEST_SRCS := \
65-
tensorflow/lite/experimental/micro/examples/micro_speech/micro_speech_test.cc \
66-
tensorflow/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.cc \
67-
tensorflow/lite/experimental/micro/examples/micro_speech/no_features_data.cc \
68-
tensorflow/lite/experimental/micro/examples/micro_speech/yes_features_data.cc
69-
70-
# Test binary for the streaming microcontroller speech model.
71-
PUSHBUTTON_CMSIS_SPEECH_TEST_SRCS := \
72-
tensorflow/lite/experimental/micro/examples/micro_speech/micro_speech_test.cc \
73-
tensorflow/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.cc
74-
75-
# Test binary for the microcontroller speech model.
76-
PREPROCESSOR_TEST_SRCS := \
77-
tensorflow/lite/experimental/micro/examples/micro_speech/preprocessor_test.cc \
78-
tensorflow/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.cc \
79-
tensorflow/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.cc \
80-
tensorflow/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.cc \
81-
tensorflow/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.cc
82-
83-
PREPROCESSOR_REFERENCE_TEST_SRCS = \
84-
$(PREPROCESSOR_TEST_SRCS) \
85-
tensorflow/lite/experimental/micro/examples/micro_speech/preprocessor.cc
86-
87-
PREPROCESSOR_FIXED_TEST_SRCS += \
88-
$(PREPROCESSOR_TEST_SRCS) \
89-
tensorflow/lite/experimental/micro/examples/micro_speech/fixed_point/preprocessor.cc
90-
91-
PREPROCESSOR_1K_SRCS := \
92-
tensorflow/lite/experimental/micro/examples/micro_speech/apollo3/preprocessor_1k.cc \
93-
tensorflow/lite/experimental/micro/examples/micro_speech/CMSIS/sin_1k.cc
94-
95-
9656
MICROLITE_TEST_SRCS := \
9757
$(wildcard tensorflow/lite/experimental/micro/*test.cc) \
9858
$(wildcard tensorflow/lite/experimental/micro/kernels/*test.cc)
@@ -115,14 +75,7 @@ MICROLITE_CC_SRCS := $(filter-out $(MICROLITE_TEST_SRCS), $(MICROLITE_CC_BASE_SR
11575
include $(wildcard $(MAKEFILE_DIR)/targets/*_makefile.inc)
11676

11777
ALL_SRCS := \
118-
$(MICRO_SPEECH_TEST_SRCS) \
119-
$(PUSHBUTTON_MICRO_SPEECH_TEST_SRCS) \
120-
$(PUSHBUTTON_CMSIS_SPEECH_TEST_SRCS) \
121-
$(PREPROCESSOR_REFERENCE_TEST_SRCS) \
122-
$(PREPROCESSOR_FIXED_TEST_SRCS) \
12378
$(MICROLITE_CC_SRCS) \
124-
$(PREPROCESSOR_1K_MICRO_TEST_SRCS) \
125-
$(PREPROCESSOR_1K_CMSIS_TEST_SRCS) \
12679
$(MICROLITE_TEST_SRCS)
12780

12881
# Where compiled objects are stored.
@@ -133,40 +86,12 @@ LIBDIR := $(GENDIR)lib/
13386

13487
MICROLITE_LIB_PATH := $(LIBDIR)$(MICROLITE_LIB_NAME)
13588

136-
MICRO_SPEECH_TEST_BINARY := $(BINDIR)micro_speech_test
137-
PUSHBUTTON_MICRO_SPEECH_TEST_BINARY := $(BINDIR)pushbutton_micro_speech_test
138-
PUSHBUTTON_CMSIS_SPEECH_TEST_BINARY := $(BINDIR)pushbutton_cmsis_speech_test
139-
PREPROCESSOR_REFERENCE_TEST_BINARY := $(BINDIR)preprocessor_reference_test
140-
PREPROCESSOR_FIXED_TEST_BINARY := $(BINDIR)preprocessor_fixed_test
141-
PREPROCESSOR_1K_MICRO_TEST_BINARY := $(BINDIR)preprocessor_1k_micro_test
142-
PREPROCESSOR_1K_CMSIS_TEST_BINARY := $(BINDIR)preprocessor_1k_cmsis_test
143-
14489
CXX := $(CC_PREFIX)${TARGET_TOOLCHAIN_PREFIX}g++
14590
CC := $(CC_PREFIX)${TARGET_TOOLCHAIN_PREFIX}gcc
14691
AR := $(CC_PREFIX)${TARGET_TOOLCHAIN_PREFIX}ar
14792

148-
MICRO_SPEECH_TEST_OBJS := $(addprefix $(OBJDIR), \
149-
$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(patsubst %.S,%.o,$(MICRO_SPEECH_TEST_SRCS)))))
150-
151-
PUSHBUTTON_MICRO_SPEECH_TEST_OBJS := $(addprefix $(OBJDIR), \
152-
$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(PUSHBUTTON_MICRO_SPEECH_TEST_SRCS))))
153-
154-
PUSHBUTTON_CMSIS_SPEECH_TEST_OBJS := $(addprefix $(OBJDIR), \
155-
$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(PUSHBUTTON_CMSIS_SPEECH_TEST_SRCS))) \
156-
arm_bitreversal2.o)
157-
158-
PREPROCESSOR_REFERENCE_TEST_OBJS := $(addprefix $(OBJDIR), \
159-
$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(PREPROCESSOR_REFERENCE_TEST_SRCS))))
160-
161-
PREPROCESSOR_FIXED_TEST_OBJS := $(addprefix $(OBJDIR), \
162-
$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(PREPROCESSOR_FIXED_TEST_SRCS))))
163-
164-
PREPROCESSOR_1K_MICRO_TEST_OBJS := $(addprefix $(OBJDIR), \
165-
$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(PREPROCESSOR_1K_MICRO_TEST_SRCS))))
166-
167-
PREPROCESSOR_1K_CMSIS_TEST_OBJS := $(addprefix $(OBJDIR), \
168-
$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(PREPROCESSOR_1K_CMSIS_TEST_SRCS))) \
169-
arm_bitreversal2.o)
93+
# Load the examples.
94+
include $(wildcard tensorflow/lite/experimental/micro/examples/*/Makefile.inc)
17095

17196
MICROLITE_LIB_OBJS := $(addprefix $(OBJDIR), \
17297
$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(MICROLITE_CC_SRCS))))
@@ -203,96 +128,6 @@ $(MICROLITE_LIB_PATH): tensorflow/lite/schema/schema_generated.h $(MICROLITE_LIB
203128
@mkdir -p $(dir $@)
204129
$(AR) $(ARFLAGS) $(MICROLITE_LIB_PATH) $(MICROLITE_LIB_OBJS)
205130

206-
$(MICRO_SPEECH_TEST_BINARY): $(MICRO_SPEECH_TEST_OBJS) $(MICROLITE_LIB_PATH)
207-
@mkdir -p $(dir $@)
208-
$(CXX) $(CXXFLAGS) $(INCLUDES) \
209-
-o $(MICRO_SPEECH_TEST_BINARY) $(MICRO_SPEECH_TEST_OBJS) \
210-
$(LIBFLAGS) $(MICROLITE_LIB_PATH) $(LDFLAGS) $(MICROLITE_LIBS)
211-
212-
micro_speech_test: $(MICRO_SPEECH_TEST_BINARY)
213-
micro_speech_test_bin: $(MICRO_SPEECH_TEST_BINARY).bin
214-
215-
test_micro_speech: $(MICRO_SPEECH_TEST_BINARY)
216-
$(TEST_SCRIPT) $(MICRO_SPEECH_TEST_BINARY) '~~~ALL TESTS PASSED~~~'
217-
218-
$(PUSHBUTTON_MICRO_SPEECH_TEST_BINARY): $(PUSHBUTTON_MICRO_SPEECH_TEST_OBJS) $(MICROLITE_LIB_PATH)
219-
@mkdir -p $(dir $@)
220-
$(CXX) $(CXXFLAGS) $(INCLUDES) \
221-
-o $(PUSHBUTTON_MICRO_SPEECH_TEST_BINARY) $(PUSHBUTTON_MICRO_SPEECH_TEST_OBJS) \
222-
$(LIBFLAGS) $(MICROLITE_LIB_PATH) $(LDFLAGS) $(MICROLITE_LIBS)
223-
224-
pushbutton_micro_speech_test: $(PUSHBUTTON_MICRO_SPEECH_TEST_BINARY)
225-
pushbutton_micro_speech_test_bin: $(PUSHBUTTON_MICRO_SPEECH_TEST_BINARY).bin
226-
227-
test_pushbutton_micro_speech: $(PUSHBUTTON_MICRO_SPEECH_TEST_BINARY)
228-
$(TEST_SCRIPT) $(PUSHBUTTON_MICRO_SPEECH_TEST_BINARY) '~~~ALL TESTS PASSED~~~'
229-
230-
231-
$(PUSHBUTTON_CMSIS_SPEECH_TEST_BINARY): $(PUSHBUTTON_CMSIS_SPEECH_TEST_OBJS) $(MICROLITE_LIB_PATH)
232-
@mkdir -p $(dir $@)
233-
$(CXX) $(CXXFLAGS) $(INCLUDES) \
234-
-o $(PUSHBUTTON_CMSIS_SPEECH_TEST_BINARY) $(PUSHBUTTON_CMSIS_SPEECH_TEST_OBJS) \
235-
$(LIBFLAGS) $(MICROLITE_LIB_PATH) $(LDFLAGS) $(MICROLITE_LIBS)
236-
237-
pushbutton_cmsis_speech_test: $(PUSHBUTTON_CMSIS_SPEECH_TEST_BINARY)
238-
pushbutton_cmsis_speech_test_bin: $(PUSHBUTTON_CMSIS_SPEECH_TEST_BINARY).bin
239-
240-
test_pushbutton_cmsis_speech: $(PUSHBUTTON_CMSIS_SPEECH_TEST_BINARY)
241-
$(TEST_SCRIPT) $(PUSHBUTTON_CMSIS_SPEECH_TEST_BINARY) '~~~ALL TESTS PASSED~~~'
242-
243-
$(PREPROCESSOR_REFERENCE_TEST_BINARY): $(PREPROCESSOR_REFERENCE_TEST_OBJS) $(MICROLITE_LIB_PATH)
244-
@mkdir -p $(dir $@)
245-
$(CXX) $(CXXFLAGS) $(INCLUDES) \
246-
-o $(PREPROCESSOR_REFERENCE_TEST_BINARY) $(PREPROCESSOR_REFERENCE_TEST_OBJS) \
247-
$(LIBFLAGS) $(MICROLITE_LIB_PATH) $(LDFLAGS) $(MICROLITE_LIBS)
248-
249-
preprocessor_reference_test: $(PREPROCESSOR_REFERENCE_TEST_BINARY)
250-
preprocessor_reference_test_bin: $(PREPROCESSOR_REFERENCE_TEST_BINARY).bin
251-
252-
test_preprocessor_reference: $(PREPROCESSOR_REFERENCE_TEST_BINARY)
253-
$(TEST_SCRIPT) $(PREPROCESSOR_REFERENCE_TEST_BINARY) '~~~ALL TESTS PASSED~~~'
254-
255-
$(PREPROCESSOR_FIXED_TEST_BINARY): $(PREPROCESSOR_FIXED_TEST_OBJS) $(MICROLITE_LIB_PATH)
256-
@mkdir -p $(dir $@)
257-
$(CXX) $(CXXFLAGS) $(INCLUDES) \
258-
-o $(PREPROCESSOR_FIXED_TEST_BINARY) $(PREPROCESSOR_FIXED_TEST_OBJS) \
259-
$(LIBFLAGS) $(MICROLITE_LIB_PATH) $(LDFLAGS) $(MICROLITE_LIBS)
260-
261-
preprocessor_fixed_test: $(PREPROCESSOR_FIXED_TEST_BINARY)
262-
preprocessor_fixed_test_bin: $(PREPROCESSOR_FIXED_TEST_BINARY).bin
263-
264-
test_preprocessor_fixed: $(PREPROCESSOR_FIXED_TEST_BINARY)
265-
$(TEST_SCRIPT) $(PREPROCESSOR_FIXED_TEST_BINARY) '~~~ALL TESTS PASSED~~~'
266-
267-
$(PREPROCESSOR_1K_MICRO_TEST_BINARY): $(PREPROCESSOR_1K_MICRO_TEST_OBJS) $(MICROLITE_LIB_PATH)
268-
@mkdir -p $(dir $@)
269-
$(CXX) $(CXXFLAGS) $(INCLUDES) \
270-
-o $(PREPROCESSOR_1K_MICRO_TEST_BINARY) $(PREPROCESSOR_1K_MICRO_TEST_OBJS) \
271-
$(LIBFLAGS) $(MICROLITE_LIB_PATH) $(LDFLAGS) $(MICROLITE_LIBS)
272-
273-
preprocessor_1k_micro_test: $(PREPROCESSOR_1K_MICRO_TEST_BINARY)
274-
preprocessor_1k_micro_test_bin: $(PREPROCESSOR_1K_MICRO_TEST_BINARY).bin
275-
276-
test_preprocessor_1k_micro: $(PREPROCESSOR_1K_MICRO_TEST_BINARY)
277-
$(TEST_SCRIPT) $(PREPROCESSOR_1K_MICRO_TEST_BINARY) '~~~ALL TESTS PASSED~~~'
278-
279-
280-
$(PREPROCESSOR_1K_CMSIS_TEST_BINARY): $(PREPROCESSOR_1K_CMSIS_TEST_OBJS) $(MICROLITE_LIB_PATH)
281-
@mkdir -p $(dir $@)
282-
$(CXX) $(CXXFLAGS) $(INCLUDES) \
283-
-o $(PREPROCESSOR_1K_CMSIS_TEST_BINARY) $(PREPROCESSOR_1K_CMSIS_TEST_OBJS) \
284-
$(LIBFLAGS) $(MICROLITE_LIB_PATH) $(LDFLAGS) $(MICROLITE_LIBS)
285-
286-
preprocessor_1k_cmsis_test: $(PREPROCESSOR_1K_CMSIS_TEST_BINARY)
287-
preprocessor_1k_cmsis_test_bin: $(PREPROCESSOR_1K_CMSIS_TEST_BINARY).bin
288-
289-
test_preprocessor_1k_cmsis: $(PREPROCESSOR_1K_CMSIS_TEST_BINARY)
290-
$(TEST_SCRIPT) $(PREPROCESSOR_1K_CMSIS_TEST_BINARY) '~~~ALL TESTS PASSED~~~'
291-
292-
293-
$(OBJDIR)arm_bitreversal2.o:
294-
$(CXX) $(CXXFLAGS) $(INCLUDES) -c $(CMSIS_SRC_DIR)/TransformFunctions/arm_bitreversal2.S -o $(OBJDIR)arm_bitreversal2.o
295-
296131
$(BINDIR)%_test : $(OBJDIR)%_test.o $(MICROLITE_LIB_PATH)
297132
@mkdir -p $(dir $@)
298133
$(CXX) $(CXXFLAGS) $(INCLUDES) \
@@ -310,8 +145,6 @@ $(BINDIR)%.bin: $(BINDIR)%
310145
@mkdir -p $(dir $@)
311146
$(OBJCOPY) $< $@ -O binary
312147

313-
$(info $(MICROLITE_TEST_TARGETS))
314-
315148
test: test_micro_speech $(MICROLITE_TEST_TARGETS)
316149

317150
# Gets rid of all generated files.

‎tensorflow/lite/experimental/micro/tools/make/download_dependencies.sh‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,11 @@ GEMMLOWP_URL="https://github.com/google/gemmlowp/archive/719139ce755a0f31cbf1c37
3333
FLATBUFFERS_URL="https://github.com/google/flatbuffers/archive/1f5eae5d6a135ff6811724f6c57f911d1f46bb15.tar.gz"
3434
CMSIS_URL="https://github.com/ARM-software/CMSIS_5/archive/5.4.0.zip"
3535
STM32_BARE_LIB_URL="https://github.com/google/stm32_bare_lib/archive/c07d611fb0af58450c5a3e0ab4d52b47f99bc82d.zip"
36-
<<<<<<< HEAD
36+
SIFIVE_FE310_LIB_URL="https://github.com/sifive/freedom-e-sdk/archive/baeeb8fd497a99b3c141d7494309ec2e64f19bdf.zip"
37+
RISCV_TOOLCHAIN_URL="https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-20181030-x86_64-linux-ubuntu14.tar.gz"
3738
AP3_URL="https://github.com/AmbiqMicro/TFLiteMicro_Apollo3/archive/dfbcef9a57276c087d95aab7cb234f1d4c9eaaba.zip"
3839
CUST_CMSIS_URL="https://github.com/AmbiqMicro/TFLiteMicro_CustCMSIS/archive/8f63966c5692e6a3a83956efd2e4aed77c4c9949.zip"
3940
GCC_EMBEDDED_URL="https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2"
40-
=======
41-
SIFIVE_FE310_LIB_URL="https://github.com/sifive/freedom-e-sdk/archive/baeeb8fd497a99b3c141d7494309ec2e64f19bdf.zip"
42-
RISCV_TOOLCHAIN_URL="https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-20181030-x86_64-linux-ubuntu14.tar.gz"
43-
>>>>>>> upstream/master
4441

4542
download_and_extract() {
4643
local usage="Usage: download_and_extract URL DIR"

0 commit comments

Comments
 (0)