From feecc43d122b2b7cea44644010b6f7106a718a42 Mon Sep 17 00:00:00 2001 From: zhaodezan Date: Tue, 20 Jul 2021 14:57:09 +0800 Subject: [PATCH] rm ENABLE_MSLITE --- include/api/kernel.h | 8 -------- mindspore/lite/CMakeLists.txt | 1 - 2 files changed, 9 deletions(-) diff --git a/include/api/kernel.h b/include/api/kernel.h index e89d7c9ee1a..1e1a6dfb040 100644 --- a/include/api/kernel.h +++ b/include/api/kernel.h @@ -19,9 +19,7 @@ #include #include #include -#ifdef ENABLE_MSLITE #include "schema/model_generated.h" -#endif #include "include/api/types.h" #include "include/api/context.h" @@ -29,7 +27,6 @@ namespace mindspore::kernel { class Kernel { public: Kernel() = default; -#ifdef ENABLE_MSLITE Kernel(const std::vector &inputs, const std::vector &outputs, const schema::Primitive *primitive, const mindspore::Context *ctx) : context_(ctx), inputs_(std::move(inputs)), outputs_(std::move(outputs)), primitive_(primitive) { @@ -37,7 +34,6 @@ class Kernel { type_ = primitive->value_type(); } } -#endif virtual ~Kernel() = default; virtual int Prepare() = 0; @@ -63,20 +59,16 @@ class Kernel { void set_name(const std::string &name) { this->name_ = name; } const mindspore::Context *context() const { return this->context_; } -#ifdef ENABLE_MSLITE virtual schema::PrimitiveType type() const { return type_; } const schema::Primitive *primitive() const { return this->primitive_; } -#endif protected: std::string name_; const mindspore::Context *context_ = nullptr; std::vector inputs_; std::vector outputs_; -#ifdef ENABLE_MSLITE schema::PrimitiveType type_ = schema::PrimitiveType_NONE; const schema::Primitive *primitive_ = nullptr; -#endif }; } // namespace mindspore::kernel diff --git a/mindspore/lite/CMakeLists.txt b/mindspore/lite/CMakeLists.txt index 5b24be5ad87..428103f4aa5 100644 --- a/mindspore/lite/CMakeLists.txt +++ b/mindspore/lite/CMakeLists.txt @@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.14) project(Lite) set(BUILD_LITE "on") -add_compile_definitions(ENABLE_MSLITE) if(TOOLCHAIN_NAME STREQUAL "himix200") set(TARGET_HIMIX200 on) add_compile_definitions(SUPPORT_NNIE)