1304f5388d
This commit makes the toolchain easier to use in two folds: 1. When compiling C/C++ source files, no need to add "-fPIC -pie" flags manually; 2. When running executables generated by the Occlum toolchain on Linux, no need to set the `LD_LIBRARY_PATH` manually.
81 lines
2.7 KiB
Diff
81 lines
2.7 KiB
Diff
diff --git a/tensorflow/lite/tools/make/Makefile b/tensorflow/lite/tools/make/Makefile
|
|
index 73c50d3..4a6445a 100644
|
|
--- a/tensorflow/lite/tools/make/Makefile
|
|
+++ b/tensorflow/lite/tools/make/Makefile
|
|
@@ -80,6 +80,12 @@ BENCHMARK_BINARY_NAME := benchmark_model
|
|
MINIMAL_SRCS := \
|
|
tensorflow/lite/examples/minimal/minimal.cc
|
|
|
|
+# Add label image example.
|
|
+LABEL_IMAGE_SRCS := \
|
|
+tensorflow/lite/tools/evaluation/utils.cc \
|
|
+tensorflow/lite/examples/label_image/label_image.cc \
|
|
+tensorflow/lite/examples/label_image/bitmap_helpers.cc
|
|
+
|
|
# What sources we want to compile, must be kept in sync with the main Bazel
|
|
# build files.
|
|
|
|
@@ -133,7 +139,8 @@ $(wildcard tensorflow/lite/*/*/*test.cc) \
|
|
$(wildcard tensorflow/lite/*/*/*/*test.cc) \
|
|
$(wildcard tensorflow/lite/kernels/*test_main.cc) \
|
|
$(wildcard tensorflow/lite/kernels/*test_util.cc) \
|
|
-$(MINIMAL_SRCS)
|
|
+$(MINIMAL_SRCS) \
|
|
+$(LABEL_IMAGE_SRCS)
|
|
|
|
BUILD_WITH_MMAP ?= true
|
|
ifeq ($(BUILD_TYPE),micro)
|
|
@@ -209,6 +216,7 @@ include $(wildcard $(MAKEFILE_DIR)/targets/*_makefile.inc)
|
|
|
|
ALL_SRCS := \
|
|
$(MINIMAL_SRCS) \
|
|
+ $(LABEL_IMAGE_SRCS) \
|
|
$(PROFILER_SRCS) \
|
|
$(PROFILER_SUMMARIZER_SRCS) \
|
|
$(TF_LITE_CC_SRCS) \
|
|
@@ -225,14 +233,18 @@ LIB_PATH := $(LIBDIR)$(LIB_NAME)
|
|
BENCHMARK_LIB := $(LIBDIR)$(BENCHMARK_LIB_NAME)
|
|
BENCHMARK_BINARY := $(BINDIR)$(BENCHMARK_BINARY_NAME)
|
|
MINIMAL_BINARY := $(BINDIR)minimal
|
|
+LABEL_IMAGE_BINARY := $(BINDIR)label_image
|
|
|
|
-CXX := $(CC_PREFIX)${TARGET_TOOLCHAIN_PREFIX}g++
|
|
-CC := $(CC_PREFIX)${TARGET_TOOLCHAIN_PREFIX}gcc
|
|
+CXX := occlum-g++
|
|
+CC := occlum-gcc
|
|
AR := $(CC_PREFIX)${TARGET_TOOLCHAIN_PREFIX}ar
|
|
|
|
MINIMAL_OBJS := $(addprefix $(OBJDIR), \
|
|
$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(MINIMAL_SRCS))))
|
|
|
|
+LABEL_IMAGE_OBJS := $(addprefix $(OBJDIR), \
|
|
+$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(LABEL_IMAGE_SRCS))))
|
|
+
|
|
LIB_OBJS := $(addprefix $(OBJDIR), \
|
|
$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(TF_LITE_CC_SRCS)))))
|
|
|
|
@@ -252,7 +264,7 @@ $(OBJDIR)%.o: %.cpp
|
|
$(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@
|
|
|
|
# The target that's compiled if there's no command-line arguments.
|
|
-all: $(LIB_PATH) $(MINIMAL_BINARY) $(BENCHMARK_BINARY)
|
|
+all: $(LIB_PATH) $(MINIMAL_BINARY) $(LABEL_IMAGE_BINARY) $(BENCHMARK_BINARY)
|
|
|
|
# The target that's compiled for micro-controllers
|
|
micro: $(LIB_PATH)
|
|
@@ -276,6 +288,14 @@ $(MINIMAL_BINARY): $(MINIMAL_OBJS) $(LIB_PATH)
|
|
|
|
minimal: $(MINIMAL_BINARY)
|
|
|
|
+$(LABEL_IMAGE_BINARY): $(LIB_PATH) $(LABEL_IMAGE_OBJS)
|
|
+ @mkdir -p $(dir $@)
|
|
+ $(CXX) $(CXXFLAGS) $(INCLUDES) \
|
|
+ -o $(LABEL_IMAGE_BINARY) $(LABEL_IMAGE_OBJS) \
|
|
+ $(LIBFLAGS) $(LIB_PATH) $(LDFLAGS) $(LIBS)
|
|
+
|
|
+label_image: $(LABEL_IMAGE_BINARY)
|
|
+
|
|
$(BENCHMARK_LIB) : $(LIB_PATH) $(BENCHMARK_OBJS)
|
|
@mkdir -p $(dir $@)
|
|
$(AR) $(ARFLAGS) $(BENCHMARK_LIB) $(LIB_OBJS) $(BENCHMARK_OBJS)
|