remove cross dependency of context

include/api/lite_context.h

@@ -21,54 +21,48 @@
 #include <map>
 #include <any>
 #include "include/api/types.h"
+#include "include/lite_types.h"
 
 namespace mindspore {
 namespace lite {
-/// \brief CpuBindMode defined for holding bind cpu strategy argument.
-typedef enum : uint32_t {
-  NO_BIND = 0,    /**< no bind */
-  HIGHER_CPU = 1, /**< bind higher cpu first */
-  MID_CPU = 2     /**< bind middle cpu first */
-} CpuBindMode;
-
 class Allocator;
 }  // namespace lite
 
 struct MS_API Context {
  public:
-  static void Clear(const std::shared_ptr<Context> &contxet);
+  static void Clear(const std::shared_ptr<Context> &context);
 
-  static void SetAsDefault(const std::shared_ptr<Context> &contxet);
+  static void SetAsDefault(const std::shared_ptr<Context> &context);
 
-  static void SetVendorName(const std::shared_ptr<Context> &contxet, const std::string &name);
-  static std::string GetVendorName(const std::shared_ptr<Context> &contxet);
+  static void SetVendorName(const std::shared_ptr<Context> &context, const std::string &name);
+  static std::string GetVendorName(const std::shared_ptr<Context> &context);
 
-  static void SetThreadNum(const std::shared_ptr<Context> &contxet, int num);
-  static int GetThreadNum(const std::shared_ptr<Context> &contxet);
+  static void SetThreadNum(const std::shared_ptr<Context> &context, int num);
+  static int GetThreadNum(const std::shared_ptr<Context> &context);
 
-  static void SetAllocator(const std::shared_ptr<Context> &contxet, std::shared_ptr<lite::Allocator> alloc);
-  static std::shared_ptr<lite::Allocator> GetAllocator(const std::shared_ptr<Context> &contxet);
+  static void SetAllocator(const std::shared_ptr<Context> &context, std::shared_ptr<lite::Allocator> alloc);
+  static std::shared_ptr<lite::Allocator> GetAllocator(const std::shared_ptr<Context> &context);
 
-  static void ConfigCPU(const std::shared_ptr<Context> &contxet, bool config);
-  static bool IfCPUEnabled(const std::shared_ptr<Context> &contxet);
+  static void ConfigCPU(const std::shared_ptr<Context> &context, bool config);
+  static bool IfCPUEnabled(const std::shared_ptr<Context> &context);
 
-  static void ConfigCPUFp16(const std::shared_ptr<Context> &contxet, bool config);
-  static bool IfCPUFp16Enabled(const std::shared_ptr<Context> &contxet);
+  static void ConfigCPUFp16(const std::shared_ptr<Context> &context, bool config);
+  static bool IfCPUFp16Enabled(const std::shared_ptr<Context> &context);
 
-  static void SetCPUBindMode(const std::shared_ptr<Context> &contxet, lite::CpuBindMode mode);
-  static lite::CpuBindMode GetCPUBindMode(const std::shared_ptr<Context> &contxet);
+  static void SetCPUBindMode(const std::shared_ptr<Context> &context, lite::CpuBindMode mode);
+  static lite::CpuBindMode GetCPUBindMode(const std::shared_ptr<Context> &context);
 
-  static void ConfigGPU(const std::shared_ptr<Context> &contxet, bool config);
-  static bool IfGPUEnabled(const std::shared_ptr<Context> &contxet);
+  static void ConfigGPU(const std::shared_ptr<Context> &context, bool config);
+  static bool IfGPUEnabled(const std::shared_ptr<Context> &context);
 
-  static void ConfigGPUFp16(const std::shared_ptr<Context> &contxet, bool config);
-  static bool IfGPUFp16Enabled(const std::shared_ptr<Context> &contxet);
+  static void ConfigGPUFp16(const std::shared_ptr<Context> &context, bool config);
+  static bool IfGPUFp16Enabled(const std::shared_ptr<Context> &context);
 
-  static void ConfigNPU(const std::shared_ptr<Context> &contxet, bool config);
-  static bool IfNPUEnabled(const std::shared_ptr<Context> &contxet);
+  static void ConfigNPU(const std::shared_ptr<Context> &context, bool config);
+  static bool IfNPUEnabled(const std::shared_ptr<Context> &context);
 
-  static void SetNPUFrequency(const std::shared_ptr<Context> &contxet, int freq);
-  static int GetNPUFrequency(const std::shared_ptr<Context> &contxet);
+  static void SetNPUFrequency(const std::shared_ptr<Context> &context, int freq);
+  static int GetNPUFrequency(const std::shared_ptr<Context> &context);
 
  private:
   std::map<std::string, std::any> context_;

mindspore/lite/include/context.h

@@ -19,18 +19,11 @@
 
 #include <string>
 #include <memory>
-#include "include/api/lite_context.h"
 #include "include/ms_tensor.h"
 #include "include/lite_utils.h"
+#include "include/lite_types.h"
 
 namespace mindspore::lite {
-/// \brief DeviceType defined for holding user's preferred backend.
-typedef enum {
-  DT_CPU, /**< CPU device type */
-  DT_GPU, /**< GPU device type */
-  DT_NPU  /**< NPU device type */
-} DeviceType;
-
 /// \brief CpuDeviceInfo defined for CPU's configuration information.
 typedef struct {
   bool enable_float16_ = false; /**< prior enable float16 inference */

mindspore/lite/include/errorcode.h

@@ -19,7 +19,6 @@
 
 #include <string>
 #include <map>
-#include "include/api/status.h"
 
 namespace mindspore {
 namespace lite {

mindspore/lite/include/lite_types.h

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2020 Huawei Technologies Co., Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef MINDSPORE_LITE_INCLUDE_LITE_TYPES_H_
+#define MINDSPORE_LITE_INCLUDE_LITE_TYPES_H_
+
+namespace mindspore::lite {
+/// \brief CpuBindMode defined for holding bind cpu strategy argument.
+typedef enum {
+  NO_BIND,    /**< no bind */
+  HIGHER_CPU, /**< bind higher cpu first */
+  MID_CPU     /**< bind middle cpu first */
+} CpuBindMode;
+
+/// \brief DeviceType defined for holding user's preferred backend.
+typedef enum {
+  DT_CPU, /**< CPU device type */
+  DT_GPU, /**< GPU device type */
+  DT_NPU  /**< NPU device type */
+} DeviceType;
+
+}  // namespace mindspore::lite
+#endif  // MINDSPORE_LITE_INCLUDE_LITE_TYPES_H_