experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Isolate TFLM project file dependencies.

Browse Source 
TFLM projects-specific file dependencies leaked between projects, causing build errors.

PiperOrigin-RevId: 309017319
Change-Id: Icdbc8c0ae0b2c9d95df065f6ad226f275e993890
This commit is contained in:
Frederic Rechtenstein 2020-04-29 07:19:48 -07:00 committed by TensorFlower Gardener
parent bb68770fe5
commit 2756921b7a
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tensorflow/lite/micro/examples/hello_world/disco_f746ng/Makefile.inc
View File

@ -1,6 +1,6 @@
# Settings for the Discovery STM32F746NG board. # Settings for the Discovery STM32F746NG board.
ifneq ($(filter disco_f746ng,$(ALL_TAGS)),) ifneq ($(filter disco_f746ng,$(ALL_TAGS)),)
MBED_PROJECT_FILES += \ hello_world_MBED_PROJECT_FILES += \
BSP_DISCO_F746NG.lib \ BSP_DISCO_F746NG.lib \
LCD_DISCO_F746NG.lib LCD_DISCO_F746NG.lib
endif endif

2
tensorflow/lite/micro/examples/micro_speech/disco_f746ng/Makefile.inc
View File

@ -1,6 +1,6 @@
# Settings for the Discovery STM32F746NG board. # Settings for the Discovery STM32F746NG board.
ifneq ($(filter disco_f746ng,$(ALL_TAGS)),) ifneq ($(filter disco_f746ng,$(ALL_TAGS)),)
MBED_PROJECT_FILES += \ micro_speech_MBED_PROJECT_FILES += \
AUDIO_DISCO_F746NG.lib \ AUDIO_DISCO_F746NG.lib \
BSP_DISCO_F746NG.lib \ BSP_DISCO_F746NG.lib \
SDRAM_DISCO_F746NG.lib \ SDRAM_DISCO_F746NG.lib \

2
tensorflow/lite/micro/examples/micro_speech/esp/Makefile.inc
View File

@ -27,7 +27,7 @@ MICRO_SPEECH_SRCS += $(ESP_MICRO_SPEECH_SRCS)
MICRO_SPEECH_HDRS += $(ESP_MICRO_SPEECH_HDRS) MICRO_SPEECH_HDRS += $(ESP_MICRO_SPEECH_HDRS)
MAIN_SRCS += $(ESP_MICRO_SPEECH_SRCS) MAIN_SRCS += $(ESP_MICRO_SPEECH_SRCS)
ESP_PROJECT_FILES += \ micro_speech_ESP_PROJECT_FILES := \
sdkconfig.defaults sdkconfig.defaults
endif endif

2
tensorflow/lite/micro/examples/person_detection/esp/Makefile.inc
View File

@ -28,7 +28,7 @@ MAIN_SRCS += $(ESP_PERSON_DETECTION_SRCS)
# ESP specific flags and files # ESP specific flags and files
CCFLAGS += -Wno-nonnull CCFLAGS += -Wno-nonnull
CXXFLAGS += -Wno-return-type -Wno-strict-aliasing CXXFLAGS += -Wno-return-type -Wno-strict-aliasing
ESP_PROJECT_FILES += \ person_detection_ESP_PROJECT_FILES := \
sdkconfig.defaults \ sdkconfig.defaults \
main/Kconfig.projbuild main/Kconfig.projbuild

12
tensorflow/lite/micro/tools/make/helper_functions.inc
View File

@ -380,14 +380,14 @@ endef
# Calling eval on the output will create targets that you can invoke to # Calling eval on the output will create targets that you can invoke to
# generate the standalone project. # generate the standalone project.
define generate_microlite_projects define generate_microlite_projects
$(call generate_project,make,$(MAKE_PROJECT_FILES),$(1),$(MICROLITE_CC_SRCS) $(THIRD_PARTY_CC_SRCS) $(2),$(MICROLITE_CC_HDRS) $(THIRD_PARTY_CC_HDRS) $(MICROLITE_TEST_HDRS) $(3),$(LDFLAGS) $(MICROLITE_LIBS),$(CXXFLAGS) $(GENERATED_PROJECT_INCLUDES), $(CCFLAGS) $(GENERATED_PROJECT_INCLUDES),$(TARGET_TOOLCHAIN_ROOT),$(TARGET_TOOLCHAIN_PREFIX)) $(call generate_project,make,$(MAKE_PROJECT_FILES) $($(1)_MAKE_PROJECT_FILES),$(1),$(MICROLITE_CC_SRCS) $(THIRD_PARTY_CC_SRCS) $(2),$(MICROLITE_CC_HDRS) $(THIRD_PARTY_CC_HDRS) $(MICROLITE_TEST_HDRS) $(3),$(LDFLAGS) $(MICROLITE_LIBS),$(CXXFLAGS) $(GENERATED_PROJECT_INCLUDES), $(CCFLAGS) $(GENERATED_PROJECT_INCLUDES),$(TARGET_TOOLCHAIN_ROOT),$(TARGET_TOOLCHAIN_PREFIX))
$(call generate_arc_project,make,$(MAKE_PROJECT_FILES),$(1),$(MICROLITE_CC_SRCS) $(THIRD_PARTY_CC_SRCS) $(2),$(MICROLITE_CC_HDRS) $(THIRD_PARTY_CC_HDRS) $(MICROLITE_TEST_HDRS) $(3),$(LDFLAGS) $(GENERATED_PROJECT_LIBS),$(CXXFLAGS) $(GENERATED_PROJECT_INCLUDES), $(CCFLAGS) $(GENERATED_PROJECT_INCLUDES)) $(call generate_arc_project,make,$(MAKE_PROJECT_FILES) $($(1)_MAKE_PROJECT_FILES),$(1),$(MICROLITE_CC_SRCS) $(THIRD_PARTY_CC_SRCS) $(2),$(MICROLITE_CC_HDRS) $(THIRD_PARTY_CC_HDRS) $(MICROLITE_TEST_HDRS) $(3),$(LDFLAGS) $(GENERATED_PROJECT_LIBS),$(CXXFLAGS) $(GENERATED_PROJECT_INCLUDES), $(CCFLAGS) $(GENERATED_PROJECT_INCLUDES))
$(call generate_project,mbed,$(MBED_PROJECT_FILES),$(1),$(MICROLITE_CC_SRCS) $(THIRD_PARTY_CC_SRCS) $(2),$(MICROLITE_CC_HDRS) $(THIRD_PARTY_CC_HDRS) $(MICROLITE_TEST_HDRS) $(3),$(MICROLITE_LIBS),$(CXXFLAGS),$(CCFLAGS),$(TARGET_TOOLCHAIN_ROOT),$(TARGET_TOOLCHAIN_PREFIX)) $(call generate_project,mbed,$(MBED_PROJECT_FILES) $($(1)_MBED_PROJECT_FILES),$(1),$(MICROLITE_CC_SRCS) $(THIRD_PARTY_CC_SRCS) $(2),$(MICROLITE_CC_HDRS) $(THIRD_PARTY_CC_HDRS) $(MICROLITE_TEST_HDRS) $(3),$(MICROLITE_LIBS),$(CXXFLAGS),$(CCFLAGS),$(TARGET_TOOLCHAIN_ROOT),$(TARGET_TOOLCHAIN_PREFIX))
$(call generate_project,keil,$(KEIL_PROJECT_FILES),$(1),$(MICROLITE_CC_SRCS) $(THIRD_PARTY_CC_SRCS) $(2),$(MICROLITE_CC_HDRS) $(THIRD_PARTY_CC_HDRS) $(MICROLITE_TEST_HDRS) $(3),$(MICROLITE_LIBS),$(CXXFLAGS),$(CCFLAGS),$(TARGET_TOOLCHAIN_ROOT),$(TARGET_TOOLCHAIN_PREFIX)) $(call generate_project,keil,$(KEIL_PROJECT_FILES) $($(1)_KEIL_PROJECT_FILES),$(1),$(MICROLITE_CC_SRCS) $(THIRD_PARTY_CC_SRCS) $(2),$(MICROLITE_CC_HDRS) $(THIRD_PARTY_CC_HDRS) $(MICROLITE_TEST_HDRS) $(3),$(MICROLITE_LIBS),$(CXXFLAGS),$(CCFLAGS),$(TARGET_TOOLCHAIN_ROOT),$(TARGET_TOOLCHAIN_PREFIX))
ifeq (,$(findstring _benchmark,$(1))) ifeq (,$(findstring _benchmark,$(1)))
$(call generate_arduino_project,$(ARDUINO_PROJECT_FILES),$(1),$(MICROLITE_CC_SRCS) $(THIRD_PARTY_CC_SRCS) $(2),$(MICROLITE_CC_HDRS) $(THIRD_PARTY_CC_HDRS) $(MICROLITE_TEST_HDRS) $(3),$(MICROLITE_LIBS),$(CXXFLAGS),$(CCFLAGS)) $(call generate_arduino_project,$(ARDUINO_PROJECT_FILES) $($(1)_ARDUINO_PROJECT_FILES),$(1),$(MICROLITE_CC_SRCS) $(THIRD_PARTY_CC_SRCS) $(2),$(MICROLITE_CC_HDRS) $(THIRD_PARTY_CC_HDRS) $(MICROLITE_TEST_HDRS) $(3),$(MICROLITE_LIBS),$(CXXFLAGS),$(CCFLAGS))
endif endif
$(call generate_esp_project,$(ESP_PROJECT_FILES),$(1),$(MICROLITE_CC_SRCS) $(THIRD_PARTY_CC_SRCS),$(MICROLITE_CC_HDRS) $(THIRD_PARTY_CC_HDRS) $(MICROLITE_TEST_HDRS),$(2),$(3),$(MICROLITE_LIBS),$(CXXFLAGS),$(CCFLAGS),$(PROJECT_INCLUDES)) $(call generate_esp_project,$(ESP_PROJECT_FILES) $($(1)_ESP_PROJECT_FILES),$(1),$(MICROLITE_CC_SRCS) $(THIRD_PARTY_CC_SRCS),$(MICROLITE_CC_HDRS) $(THIRD_PARTY_CC_HDRS) $(MICROLITE_TEST_HDRS),$(2),$(3),$(MICROLITE_LIBS),$(CXXFLAGS),$(CCFLAGS),$(PROJECT_INCLUDES))
endef endef
# Handles the details of generating a binary target, including specializing # Handles the details of generating a binary target, including specializing