Adjust release package structure and remove unused header. Besides, fix the early release problem of pass plugin.
This commit is contained in:
parent
1f9cebc626
commit
0fa1e0d69d
|
@ -213,7 +213,7 @@ function(__install_white_list_ops)
|
|||
${TOP_DIR}/mindspore/core/ops/base_operator.h
|
||||
${TOP_DIR}/mindspore/core/ops/return.h
|
||||
${TOP_DIR}/mindspore/core/ops/pad.h
|
||||
DESTINATION ${CONVERTER_ROOT_DIR}/include/core/ops
|
||||
DESTINATION ${CONVERTER_ROOT_DIR}/include/ops
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME}
|
||||
)
|
||||
install(FILES
|
||||
|
@ -246,7 +246,7 @@ function(__install_white_list_ops)
|
|||
${TOP_DIR}/mindspore/core/ops/fusion/sub_fusion.h
|
||||
${TOP_DIR}/mindspore/core/ops/fusion/tile_fusion.h
|
||||
${TOP_DIR}/mindspore/core/ops/fusion/topk_fusion.h
|
||||
DESTINATION ${CONVERTER_ROOT_DIR}/include/core/ops/fusion
|
||||
DESTINATION ${CONVERTER_ROOT_DIR}/include/ops/fusion
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME}
|
||||
)
|
||||
endfunction()
|
||||
|
@ -504,27 +504,15 @@ if(PLATFORM_ARM64)
|
|||
${RUNTIME_COMPONENT_NAME})
|
||||
endif()
|
||||
if(MSLITE_ENABLE_CONVERTER)
|
||||
install(FILES ${TOP_DIR}/mindspore/lite/include/converter.h DESTINATION ${CONVERTER_ROOT_DIR}/include
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(DIRECTORY ${TOP_DIR}/mindspore/lite/include/registry/ DESTINATION
|
||||
${CONVERTER_ROOT_DIR}/include/registry COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${API_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/api
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${MINDAPI_BASE_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/core/mindapi/base
|
||||
install(FILES ${MINDAPI_BASE_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/mindapi/base
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${MINDAPI_IR_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/core/mindapi/ir
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${ABSTRACT_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/core/abstract
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${BASE_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/core/base
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${IR_DTYPE_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/core/ir/dtype
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${IR_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/core/ir
|
||||
install(FILES ${MINDAPI_IR_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/mindapi/ir
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
__install_white_list_ops()
|
||||
install(FILES ${UTILS_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/core/utils
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(DIRECTORY ${TOP_DIR}/mindspore/lite/build/schema/
|
||||
DESTINATION ${CONVERTER_ROOT_DIR}/include/schema
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME}
|
||||
|
@ -543,6 +531,8 @@ if(PLATFORM_ARM64)
|
|||
DESTINATION ${CONVERTER_ROOT_DIR}/lib COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${TOP_DIR}/mindspore/lite/build/tools/converter/registry/libmslite_converter_plugin.so
|
||||
DESTINATION ${CONVERTER_ROOT_DIR}/lib COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(DIRECTORY ${TOP_DIR}/third_party/proto/ DESTINATION ${CONVERTER_ROOT_DIR}/third_party/proto
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${glog_LIBPATH}/libmindspore_glog.so.0.4.0 DESTINATION ${CONVERTER_ROOT_DIR}/lib
|
||||
RENAME libmindspore_glog.so.0 COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(TARGETS mindspore_core DESTINATION ${CONVERTER_ROOT_DIR}/lib COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
|
@ -734,8 +724,6 @@ elseif(WIN32)
|
|||
file(GLOB LIB_LIST ${CXX_DIR}/libstdc++-6.dll ${CXX_DIR}/libwinpthread-1.dll
|
||||
${CXX_DIR}/libssp-0.dll ${CXX_DIR}/libgcc_s_*-1.dll)
|
||||
if(MSLITE_ENABLE_CONVERTER)
|
||||
install(FILES ${TOP_DIR}/mindspore/lite/include/converter.h DESTINATION ${CONVERTER_ROOT_DIR}/include
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${TOP_DIR}/build/mindspore/tools/converter/converter_lite/converter_lite.exe
|
||||
DESTINATION ${CONVERTER_ROOT_DIR}/converter COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${TOP_DIR}/build/mindspore/tools/converter/libmindspore_converter.dll
|
||||
|
@ -899,31 +887,21 @@ else()
|
|||
if(MSLITE_ENABLE_CONVERTER)
|
||||
install(FILES ${TOP_DIR}/mindspore/lite/include/kernel_interface.h DESTINATION ${CONVERTER_ROOT_DIR}/include
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${TOP_DIR}/mindspore/lite/include/converter.h DESTINATION ${CONVERTER_ROOT_DIR}/include
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(DIRECTORY ${TOP_DIR}/mindspore/lite/include/registry/ DESTINATION ${CONVERTER_ROOT_DIR}/include/registry
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${API_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/api
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${MINDAPI_BASE_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/core/mindapi/base
|
||||
install(FILES ${MINDAPI_BASE_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/mindapi/base
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${MINDAPI_IR_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/core/mindapi/ir
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${ABSTRACT_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/core/abstract
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${BASE_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/core/base
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${IR_DTYPE_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/core/ir/dtype
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(FILES ${IR_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/core/ir
|
||||
install(FILES ${MINDAPI_IR_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/mindapi/ir
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
__install_white_list_ops()
|
||||
install(FILES ${UTILS_HEADER} DESTINATION ${CONVERTER_ROOT_DIR}/include/core/utils
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(DIRECTORY ${TOP_DIR}/mindspore/lite/build/schema/ DESTINATION ${CONVERTER_ROOT_DIR}/include/schema
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME} FILES_MATCHING PATTERN "*.h" PATTERN "schema_generated.h" EXCLUDE)
|
||||
install(DIRECTORY ${flatbuffers_INC}/ DESTINATION ${CONVERTER_ROOT_DIR}/include/third_party
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(DIRECTORY ${TOP_DIR}/third_party/proto/ DESTINATION ${CONVERTER_ROOT_DIR}/third_party/proto
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME})
|
||||
install(DIRECTORY ${glog_LIBPATH}/../include/glog/ DESTINATION ${CONVERTER_ROOT_DIR}/include/third_party/glog
|
||||
COMPONENT ${RUNTIME_COMPONENT_NAME} FILES_MATCHING PATTERN "*.h")
|
||||
install(DIRECTORY ${TOP_DIR}/third_party/securec/include/
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
approvers:
|
||||
- zhoufeng54
|
||||
- sunsuodong
|
||||
- zhang_xue_tong
|
||||
- jpc_chenjianping
|
||||
reviewers:
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <utility>
|
||||
#include <unordered_map>
|
||||
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
#include "utils/hashing.h"
|
||||
#include "ir/func_graph.h"
|
||||
#include "abstract/abstract_value.h"
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include "abstract/utils.h"
|
||||
#include "utils/any.h"
|
||||
#include "ir/primitive.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
|
||||
namespace mindspore {
|
||||
namespace abstract {
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include "utils/any.h"
|
||||
#include "utils/misc.h"
|
||||
#include "utils/shape_utils.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
|
||||
namespace mindspore {
|
||||
namespace abstract {
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include <utility>
|
||||
#include <algorithm>
|
||||
#include "utils/hashing.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
#include "utils/log_adapter.h"
|
||||
#include "utils/ordered_set.h"
|
||||
#include "utils/ordered_map.h"
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include "utils/hash_set.h"
|
||||
#include "utils/ordered_set.h"
|
||||
#include "utils/ordered_map.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
#include "base/base_ref.h"
|
||||
#include "base/effect_info.h"
|
||||
#include "ir/anf.h"
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include "ir/func_graph.h"
|
||||
#include "ir/manager.h"
|
||||
#include "utils/hashing.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
|
||||
namespace mindspore {
|
||||
class Cloner;
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include "ir/scalar.h"
|
||||
#include "ir/tensor.h"
|
||||
#include "utils/label.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
|
||||
namespace mindspore {
|
||||
enum IncludeType { FOLLOW, NOFOLLOW, EXCLUDE };
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include "ir/tensor.h"
|
||||
#include "ir/param_info.h"
|
||||
#include "ir/scalar.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
#include "utils/shape_utils.h"
|
||||
|
||||
namespace mindspore {
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <memory>
|
||||
#include <stack>
|
||||
#include "utils/hash_map.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
|
||||
namespace mindspore {
|
||||
class Value;
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <set>
|
||||
#include "utils/hash_map.h"
|
||||
#include "utils/info.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
|
||||
namespace mindspore {
|
||||
class MS_CORE_API PrimalDebugInfoManager {
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include <string>
|
||||
#include <memory>
|
||||
#include <stack>
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
|
||||
namespace mindspore {
|
||||
class Scope;
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#include <sstream>
|
||||
#include <utility>
|
||||
#include "mindapi/base/macros.h"
|
||||
#include "utils/macros.h"
|
||||
|
||||
namespace mindspore::api {
|
||||
enum class LogLevel : uint8_t { kDebug = 0, kInfo, kWarning, kError, kException };
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright 2021 Huawei Technologies Co., Ltd
|
||||
* Copyright 2021-2022 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.
|
||||
|
@ -20,11 +20,28 @@
|
|||
#if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__CYGWIN__))
|
||||
#ifdef BUILDING_CORE_DLL
|
||||
#define MIND_API __declspec(dllexport)
|
||||
#define MS_EXPORT __declspec(dllexport)
|
||||
#define MS_CORE_API __declspec(dllexport)
|
||||
#define GVAR_DEF(type, name, value) MS_CORE_API inline const type name = value;
|
||||
#else
|
||||
#define MIND_API __declspec(dllimport)
|
||||
#define MS_EXPORT __declspec(dllimport)
|
||||
#define MS_CORE_API __declspec(dllimport)
|
||||
#define GVAR_DEF(type, name, value) MS_CORE_API extern const type name;
|
||||
#endif
|
||||
#else
|
||||
#define MIND_API __attribute__((visibility("default")))
|
||||
#define MS_CORE_API __attribute__((visibility("default")))
|
||||
#define MS_EXPORT __attribute__((visibility("default")))
|
||||
#define GVAR_DEF(type, name, value) MS_CORE_API inline const type name = value;
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#define NO_RETURN
|
||||
#define ALWAYS_INLINE
|
||||
#else
|
||||
#define NO_RETURN __attribute__((noreturn))
|
||||
#define ALWAYS_INLINE __attribute__((__always_inline__))
|
||||
#endif
|
||||
|
||||
#endif // MINDSPORE_CORE_MINDAPI_BASE_MACROS_H_
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#define MIND_LOG_NO_MS_LOG
|
||||
#include "mindapi/base/logging.h"
|
||||
#include "utils/log_adapter.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
|
||||
namespace mindspore::api {
|
||||
static MsLogLevel ToMsLogLevel(LogLevel level) {
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <string>
|
||||
|
||||
#include "actor/log.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
|
||||
namespace mindspore {
|
||||
constexpr auto MINDRT_TCP = "tcp";
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include <memory>
|
||||
#include <string>
|
||||
#include "utils/hash_map.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
#include "actor/actor.h"
|
||||
#include "async/uuid_base.h"
|
||||
#include "async/future.h"
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include <pmmintrin.h>
|
||||
#endif
|
||||
#endif
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
#include "thread/hqueue.h"
|
||||
|
||||
#define USE_HQUEUE
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include <string>
|
||||
#include <memory>
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
|
||||
typedef unsigned char Byte;
|
||||
namespace mindspore {
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <string>
|
||||
#include <optional>
|
||||
#include "mindspore/core/utils/ms_utils.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
#include "utils/log_adapter.h"
|
||||
#include "utils/os.h"
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <vector>
|
||||
|
||||
#include "base/base.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
#include "ir/scope.h"
|
||||
#include "utils/trace_info.h"
|
||||
namespace mindspore {
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include <string>
|
||||
#include "utils/hash_set.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
|
||||
namespace mindspore {
|
||||
class MS_CORE_API InterpretNodeRecorder {
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include <vector>
|
||||
#include <thread>
|
||||
#include <functional>
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
#ifndef BUILD_LITE
|
||||
#include "utils/os.h"
|
||||
#endif
|
||||
|
|
|
@ -1,52 +0,0 @@
|
|||
/**
|
||||
* Copyright 2019-2022 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 to 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.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @brief This file used to define uniform macros on different platforms
|
||||
*
|
||||
*/
|
||||
#ifndef MINDSPORE_CORE_UTILS_MACORS_H_
|
||||
#define MINDSPORE_CORE_UTILS_MACORS_H_
|
||||
|
||||
#if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__CYGWIN__))
|
||||
#ifdef BUILDING_CORE_DLL
|
||||
#define MS_CORE_API __declspec(dllexport)
|
||||
#define MS_EXPORT __declspec(dllexport)
|
||||
#define GVAR_DEF(type, name, value) MS_CORE_API inline const type name = value;
|
||||
#else
|
||||
#define MS_CORE_API __declspec(dllimport)
|
||||
#define MS_EXPORT __declspec(dllimport)
|
||||
#define GVAR_DEF(type, name, value) MS_CORE_API extern const type name;
|
||||
#endif
|
||||
#else
|
||||
#define MS_CORE_API __attribute__((visibility("default")))
|
||||
#define MS_EXPORT __attribute__((visibility("default")))
|
||||
#define GVAR_DEF(type, name, value) MS_CORE_API inline const type name = value;
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#define NO_RETURN
|
||||
#else
|
||||
#define NO_RETURN __attribute__((noreturn))
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#define ALWAYS_INLINE
|
||||
#else
|
||||
#define ALWAYS_INLINE __attribute__((__always_inline__))
|
||||
#endif
|
||||
|
||||
#endif // MINDSPORE_CORE_UTILS_MACORS_H_
|
|
@ -20,7 +20,7 @@
|
|||
#include <set>
|
||||
#include <mutex>
|
||||
#include "utils/ms_utils.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
namespace mindspore {
|
||||
class ExceptionListener {
|
||||
public:
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <limits>
|
||||
#include <cmath>
|
||||
#include <chrono>
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
namespace mindspore {
|
||||
class MSLogTime {
|
||||
public:
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include <memory>
|
||||
#include "include/api/status.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
|
||||
namespace mindspore {
|
||||
// Now we separate the link from mindspore binary with numa,
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include <string>
|
||||
#include <memory>
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
|
||||
namespace mindspore {
|
||||
class MS_CORE_API PhaseManager {
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#define MINDSPORE_CORE_UTILS_SYSTEM_SHA256_H_
|
||||
|
||||
#include <string>
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
|
||||
namespace mindspore {
|
||||
namespace system {
|
||||
|
|
|
@ -66,5 +66,4 @@ set(UTILS_HEADER
|
|||
${CORE_DIR}/utils/shape_utils.h
|
||||
${CORE_DIR}/utils/signal.h
|
||||
${CORE_DIR}/utils/trace_info.h
|
||||
${CORE_DIR}/utils/macros.h
|
||||
)
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include <memory>
|
||||
#include "include/registry/node_parser_registry.h"
|
||||
#include "ops/fusion/add_fusion.h"
|
||||
#include "schema/schema_generated.h"
|
||||
|
||||
namespace mindspore {
|
||||
namespace converter {
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
approvers:
|
||||
- zhang_xue_tong
|
||||
- jpc_chenjianping
|
||||
- sunsuodong
|
||||
|
||||
|
|
|
@ -3,5 +3,4 @@ approvers:
|
|||
- zhanghaibo5
|
||||
- zhang_xue_tong
|
||||
- jpc_chenjianping
|
||||
- sunsuodong
|
||||
- wang_shaocong
|
||||
|
|
|
@ -2,5 +2,4 @@ approvers:
|
|||
- zhang_xue_tong
|
||||
- jpc_chenjianping
|
||||
- hangangqiang
|
||||
- sunsuodong
|
||||
- wang_shaocong
|
|
@ -17,7 +17,7 @@
|
|||
#define MINDSPORE_LITE_SRC_EXTENDRT_TENSORRT_EXECUTOR_PLUGIN_H_
|
||||
#include "include/api/status.h"
|
||||
#include "utils/log_adapter.h"
|
||||
#include "utils/macros.h"
|
||||
#include "mindapi/base/macros.h"
|
||||
|
||||
namespace mindspore::lite {
|
||||
class MS_API TensorRTExecutorPlugin {
|
||||
|
|
|
@ -5,7 +5,7 @@ approvers:
|
|||
- wang_shaocong
|
||||
- yeyunpeng2020
|
||||
- xu_anyue
|
||||
- sunsuodong
|
||||
- liuchongming74
|
||||
reviewers:
|
||||
- mengyuanli
|
||||
- cjh9368
|
||||
|
|
|
@ -84,6 +84,9 @@ FuncGraphPtr ConvertGraph(const api::FuncGraphPtr &func_graph) {
|
|||
auto impl = func_graph->impl();
|
||||
return std::dynamic_pointer_cast<FuncGraph>(impl);
|
||||
}
|
||||
|
||||
// Deal with early release of 3rd-party plugin library.
|
||||
static std::vector<std::shared_ptr<DynamicLibraryLoader>> dl_loaders;
|
||||
} // namespace
|
||||
|
||||
STATUS StoreConverterParameters(const std::shared_ptr<ConverterPara> ¶m) {
|
||||
|
@ -202,7 +205,6 @@ int ConverterImpl::Convert(const std::shared_ptr<ConverterPara> ¶m, schema::
|
|||
return RET_ERROR;
|
||||
}
|
||||
// load plugin
|
||||
static std::vector<std::shared_ptr<DynamicLibraryLoader>> dl_loaders;
|
||||
if (!param->plugins_path.empty()) {
|
||||
for (auto &path : param->plugins_path) {
|
||||
auto dl_loader = std::make_shared<DynamicLibraryLoader>();
|
||||
|
|
|
@ -37,7 +37,7 @@ int EliminateRedundantCastPass::RemoveCastOp(const AnfNodePtr &anf_node, const F
|
|||
second_type = static_cast<TypeId>(static_cast<int *>(tensor_info->data_c())[0]);
|
||||
if (first_type == second_type) {
|
||||
MS_LOG(DEBUG) << "Cast node " << anf_node->fullname_with_scope() << " is eliminated.";
|
||||
this->remove_cnode_.insert(anf_node);
|
||||
(void)this->remove_cnode_.insert(anf_node);
|
||||
return manager->Replace(anf_node, cast_cnode->input(1)) ? RET_OK : RET_ERROR;
|
||||
}
|
||||
return lite::RET_NO_CHANGE;
|
||||
|
|
Loading…
Reference in New Issue