ml:ml-models-public: Clean-ups The clean-ups are mainly on removing unnecessary library and header dpendencies. Change-Id: I6cd620a28e77d52f974e050116eed52ca180cdaa
diff --git a/float_models/CMakeLists.txt b/float_models/CMakeLists.txt index 931609e..21253fd 100644 --- a/float_models/CMakeLists.txt +++ b/float_models/CMakeLists.txt
@@ -21,7 +21,6 @@ "-riscv-v-vector-bits-min=512" "-riscv-v-fixed-length-vector-lmul-max=8" RVV_OFF - PUBLIC ) springbok_modules( @@ -36,7 +35,6 @@ "-riscv-v-vector-bits-min=512" "-riscv-v-fixed-length-vector-lmul-max=8" RVV_OFF - PUBLIC ) #------------------------------------------------------------------------------- @@ -83,9 +81,9 @@ SRCS "iree_exec/mobilenet_v1.c" DEPS + ::mobilenet_input_c ::mobilenet_v1_bytecode_module_static_c ::mobilenet_v1_bytecode_module_static_lib - ::mobilenet_input_c iree::vm::bytecode_module model_util::util_static LINKOPTS @@ -98,9 +96,9 @@ SRCS "iree_exec/mobilenet_v1.c" DEPS + ::mobilenet_input_c ::mobilenet_v1_c_module_static_emitc ::mobilenet_v1_c_module_static_lib - ::mobilenet_input_c model_util::util_static LINKOPTS "LINKER:--defsym=__stack_size__=200k"
diff --git a/float_models/iree_exec/mnist.c b/float_models/iree_exec/mnist.c index bab3cf4..77a1be8 100644 --- a/float_models/iree_exec/mnist.c +++ b/float_models/iree_exec/mnist.c
@@ -22,9 +22,6 @@ #include <springbok.h> -#include "iree/base/api.h" -#include "iree/hal/api.h" - // Compiled module embedded here to avoid file IO: #if !defined(BUILD_EMITC) #include "mnist_bytecode_module_static.h"
diff --git a/float_models/iree_exec/mnist.h b/float_models/iree_exec/mnist.h index 08a3515..1db03b9 100644 --- a/float_models/iree_exec/mnist.h +++ b/float_models/iree_exec/mnist.h
@@ -17,8 +17,6 @@ #ifndef FLOAT_MODELS_IREE_EXEC_MNIST_H_ #define FLOAT_MODELS_IREE_EXEC_MNIST_H_ -#include <stdint.h> - #include "model_util/util.h" typedef struct {
diff --git a/float_models/iree_exec/mobilenet_v1.c b/float_models/iree_exec/mobilenet_v1.c index 04643f4..04329ee 100644 --- a/float_models/iree_exec/mobilenet_v1.c +++ b/float_models/iree_exec/mobilenet_v1.c
@@ -22,9 +22,6 @@ #include <springbok.h> -#include "iree/base/api.h" -#include "iree/hal/api.h" - // Compiled module embedded here to avoid file IO: #include "mobilenet_input_c.h" #if !defined(BUILD_EMITC)
diff --git a/float_models/iree_exec/mobilenet_v1.h b/float_models/iree_exec/mobilenet_v1.h index b058572..be14097 100644 --- a/float_models/iree_exec/mobilenet_v1.h +++ b/float_models/iree_exec/mobilenet_v1.h
@@ -17,8 +17,6 @@ #ifndef FLOAT_MODELS_IREE_EXEC_MOBILENET_V1_H_ #define FLOAT_MODELS_IREE_EXEC_MOBILENET_V1_H_ -#include <stdint.h> - #include "model_util/util.h" typedef struct {
diff --git a/quant_models/CMakeLists.txt b/quant_models/CMakeLists.txt index 6dba090..aacbdf5 100644 --- a/quant_models/CMakeLists.txt +++ b/quant_models/CMakeLists.txt
@@ -19,7 +19,6 @@ FLAGS "-iree-input-type=tosa" RVV_OFF - PUBLIC ) springbok_modules( @@ -33,7 +32,6 @@ "-iree-input-type=tosa" "-riscv-v-vector-bits-min=512" "-riscv-v-fixed-length-vector-lmul-max=8" - PUBLIC ) springbok_modules( @@ -47,7 +45,6 @@ "-iree-input-type=tosa" "-riscv-v-vector-bits-min=512" "-riscv-v-fixed-length-vector-lmul-max=8" - PUBLIC ) springbok_modules( @@ -62,7 +59,6 @@ "-riscv-v-vector-bits-min=512" "-riscv-v-fixed-length-vector-lmul-max=8" VMVX - PUBLIC ) # ------------------------------------------------------------------------------ @@ -241,7 +237,6 @@ DEPS ::person_detection_bytecode_module_vmvx_c ::person_detection_quant_input_c - iree::vm::bytecode_module model_util::util_vmvx LINKOPTS "LINKER:--defsym=__stack_size__=128k"
diff --git a/quant_models/iree_exec/hps.c b/quant_models/iree_exec/hps.c index b55d848..0ebb91c 100644 --- a/quant_models/iree_exec/hps.c +++ b/quant_models/iree_exec/hps.c
@@ -20,10 +20,6 @@ #include <springbok.h> -#include "iree/base/api.h" -#include "iree/hal/api.h" -#include "model_util/util.h" - #if !defined(NO_STATIC_INPUT) #if HPS_IDX == 0 #include "hps_0_quant_input_c.h"
diff --git a/quant_models/iree_exec/hps.h b/quant_models/iree_exec/hps.h index 0a9d0b7..75e14ef 100644 --- a/quant_models/iree_exec/hps.h +++ b/quant_models/iree_exec/hps.h
@@ -17,8 +17,6 @@ #ifndef QUANT_MODELS_IREE_EXEC_HPS_H_ #define QUANT_MODELS_IREE_EXEC_HPS_H_ -#include <stdint.h> - #include "model_util/util.h" typedef struct {
diff --git a/quant_models/iree_exec/mobilenet_v1.c b/quant_models/iree_exec/mobilenet_v1.c index 4da350d..badf53d 100644 --- a/quant_models/iree_exec/mobilenet_v1.c +++ b/quant_models/iree_exec/mobilenet_v1.c
@@ -22,9 +22,6 @@ #include <springbok.h> -#include "iree/base/api.h" -#include "iree/hal/api.h" - // Compiled module embedded here to avoid file IO: #include "mobilenet_quant_input_c.h" #if !defined(BUILD_EMITC)
diff --git a/quant_models/iree_exec/mobilenet_v1.h b/quant_models/iree_exec/mobilenet_v1.h index 4e6987f..1891846 100644 --- a/quant_models/iree_exec/mobilenet_v1.h +++ b/quant_models/iree_exec/mobilenet_v1.h
@@ -17,8 +17,6 @@ #ifndef QUANT_MODELS_IREE_EXEC_MOBILENET_V1_H_ #define QUANT_MODELS_IREE_EXEC_MOBILENET_V1_H_ -#include <stdint.h> - #include "model_util/util.h" typedef struct {
diff --git a/quant_models/iree_exec/mobilenet_v2.c b/quant_models/iree_exec/mobilenet_v2.c index 64fb20c..e6c09b7 100644 --- a/quant_models/iree_exec/mobilenet_v2.c +++ b/quant_models/iree_exec/mobilenet_v2.c
@@ -22,9 +22,6 @@ #include <springbok.h> -#include "iree/base/api.h" -#include "iree/hal/api.h" - // Compiled module embedded here to avoid file IO: #include "mobilenet_quant_input_c.h" #if !defined(BUILD_EMITC)
diff --git a/quant_models/iree_exec/mobilenet_v2.h b/quant_models/iree_exec/mobilenet_v2.h index c111229..8632aff 100644 --- a/quant_models/iree_exec/mobilenet_v2.h +++ b/quant_models/iree_exec/mobilenet_v2.h
@@ -17,8 +17,6 @@ #ifndef QUANT_MODELS_IREE_EXEC_MOBILENET_V2_H_ #define QUANT_MODELS_IREE_EXEC_MOBILENET_V2_H_ -#include <stdint.h> - #include "model_util/util.h" typedef struct {
diff --git a/quant_models/iree_exec/person_detection.c b/quant_models/iree_exec/person_detection.c index 93e324a..0edcdcc 100644 --- a/quant_models/iree_exec/person_detection.c +++ b/quant_models/iree_exec/person_detection.c
@@ -22,9 +22,6 @@ #include <springbok.h> -#include "iree/base/api.h" -#include "iree/hal/api.h" - // Compiled module embedded here to avoid file IO: #if defined(BUILD_VMVX) #if !defined(BUILD_EMITC)
diff --git a/quant_models/iree_exec/person_detection.h b/quant_models/iree_exec/person_detection.h index 8924f68..e1cb3bd 100644 --- a/quant_models/iree_exec/person_detection.h +++ b/quant_models/iree_exec/person_detection.h
@@ -17,8 +17,6 @@ #ifndef QUANT_MODELS_IREE_EXEC_PERSON_DETECTION_H_ #define QUANT_MODELS_IREE_EXEC_PERSON_DETECTION_H_ -#include <stdint.h> - #include "model_util/util.h" typedef struct {