Huawei_Technology
/
mindspore
Not watched
1
0
Fork 0
Code
Releases 13 Wiki evaluate Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain HPC
Browse Source

!15478 [MS][RDR] make GetSubModuleName() as a common function 

From: @luopengting
Reviewed-by: @ouwenchang,@yelihua
Signed-off-by: @yelihua
pull/15478/MERGE
mindspore-ci-bot Gitee 4 years ago
parent
8b9f84447d 61f2f19d9a
commit
2955f9e84a
4 changed files with 43 additions and 68 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -34
      mindspore/ccsrc/debug/rdr/running_data_recorder.cc
  2. +4
    -0
      mindspore/core/gvar/log_adapter_common.cc
  3. +0
    -34
      mindspore/core/utils/log_adapter.cc
  4. +39
    -0
      mindspore/core/utils/log_adapter.h

+ 0
- 34
mindspore/ccsrc/debug/rdr/running_data_recorder.cc View File

@@ -29,40 +29,6 @@
#include "debug/rdr/task_debug_info_recorder.h" #include "debug/rdr/task_debug_info_recorder.h"
#endif // ENABLE_D #endif // ENABLE_D
namespace mindspore { namespace mindspore {
namespace {
static const char *GetSubModuleName(SubModuleId module_id) {
static const char *sub_module_names[NUM_SUBMODUES] = {
"UNKNOWN", // SM_UNKNOWN
"CORE", // SM_CORE
"ANALYZER", // SM_ANALYZER
"COMMON", // SM_COMMON
"DEBUG", // SM_DEBUG
"DEVICE", // SM_DEVICE
"GE_ADPT", // SM_GE_ADPT
"IR", // SM_IR
"KERNEL", // SM_KERNEL
"MD", // SM_MD
"ME", // SM_ME
"EXPRESS", // SM_EXPRESS
"OPTIMIZER", // SM_OPTIMIZER
"PARALLEL", // SM_PARALLEL
"PARSER", // SM_PARSER
"PIPELINE", // SM_PIPELINE
"PRE_ACT", // SM_PRE_ACT
"PYNATIVE", // SM_PYNATIVE
"SESSION", // SM_SESSION
"UTILS", // SM_UTILS
"VM", // SM_VM
"PROFILER", // SM_PROFILER
"PS", // SM_PS
"LITE", // SM_LITE
"HCCL_ADPT", // SM_HCCL_ADPT
"MINDQUANTUM" // SM_MINDQUANTUM
};

return sub_module_names[module_id % NUM_SUBMODUES];
}
} // namespace
namespace RDR { namespace RDR {
#ifdef ENABLE_D #ifdef ENABLE_D
bool RecordTaskDebugInfo(SubModuleId module, const std::string &name, bool RecordTaskDebugInfo(SubModuleId module, const std::string &name,


mindspore/core/gvar/get_time.cc → mindspore/core/gvar/log_adapter_common.cc View File

@@ -19,6 +19,10 @@
#include "utils/log_adapter.h" #include "utils/log_adapter.h"


namespace mindspore { namespace mindspore {
const char *GetSubModuleName(SubModuleId module_id, const char **sub_module_names) {
return sub_module_names[module_id % NUM_SUBMODUES];
}

// export GetTimeString for all sub modules // export GetTimeString for all sub modules
std::string GetTimeString() { std::string GetTimeString() {
#define BUFLEN 80 #define BUFLEN 80

+ 0
- 34
mindspore/core/utils/log_adapter.cc View File

@@ -112,40 +112,6 @@ static int GetSlogLevel(MsLogLevel level) {
} }
#endif #endif


static const char *GetSubModuleName(SubModuleId module_id) {
static const char *sub_module_names[NUM_SUBMODUES] = {
"UNKNOWN", // SM_UNKNOWN
"CORE", // SM_CORE
"ANALYZER", // SM_ANALYZER
"COMMON", // SM_COMMON
"DEBUG", // SM_DEBUG
"OFFLINE_DEBUG", // SM_OFFLINE_DEBUG
"DEVICE", // SM_DEVICE
"GE_ADPT", // SM_GE_ADPT
"IR", // SM_IR
"KERNEL", // SM_KERNEL
"MD", // SM_MD
"ME", // SM_ME
"EXPRESS", // SM_EXPRESS
"OPTIMIZER", // SM_OPTIMIZER
"PARALLEL", // SM_PARALLEL
"PARSER", // SM_PARSER
"PIPELINE", // SM_PIPELINE
"PRE_ACT", // SM_PRE_ACT
"PYNATIVE", // SM_PYNATIVE
"SESSION", // SM_SESSION
"UTILS", // SM_UTILS
"VM", // SM_VM
"PROFILER", // SM_PROFILER
"PS", // SM_PS
"LITE", // SM_LITE
"HCCL_ADPT", // SM_HCCL_ADPT
"MINDQUANTUM", // SM_MINDQUANTUM
"RUNTIME_FRAMEWORK" // SM_RUNTIME_FRAMEWORK
};

return sub_module_names[module_id % NUM_SUBMODUES];
}
void LogWriter::OutputLog(const std::ostringstream &msg) const { void LogWriter::OutputLog(const std::ostringstream &msg) const {
#ifdef USE_GLOG #ifdef USE_GLOG
#define google mindspore_private #define google mindspore_private


+ 39
- 0
mindspore/core/utils/log_adapter.h View File

@@ -141,6 +141,45 @@ enum SubModuleId : int {
#define SUBMODULE_ID mindspore::SubModuleId::SM_ME #define SUBMODULE_ID mindspore::SubModuleId::SM_ME
#endif #endif


static const char *SUB_MODULE_NAMES[NUM_SUBMODUES] = {
"UNKNOWN", // SM_UNKNOWN
"CORE", // SM_CORE
"ANALYZER", // SM_ANALYZER
"COMMON", // SM_COMMON
"DEBUG", // SM_DEBUG
"OFFLINE_DEBUG", // SM_OFFLINE_DEBUG
"DEVICE", // SM_DEVICE
"GE_ADPT", // SM_GE_ADPT
"IR", // SM_IR
"KERNEL", // SM_KERNEL
"MD", // SM_MD
"ME", // SM_ME
"EXPRESS", // SM_EXPRESS
"OPTIMIZER", // SM_OPTIMIZER
"PARALLEL", // SM_PARALLEL
"PARSER", // SM_PARSER
"PIPELINE", // SM_PIPELINE
"PRE_ACT", // SM_PRE_ACT
"PYNATIVE", // SM_PYNATIVE
"SESSION", // SM_SESSION
"UTILS", // SM_UTILS
"VM", // SM_VM
"PROFILER", // SM_PROFILER
"PS", // SM_PS
"LITE", // SM_LITE
"HCCL_ADPT", // SM_HCCL_ADPT
"MINDQUANTUM", // SM_MINDQUANTUM
"RUNTIME_FRAMEWORK" // SM_RUNTIME_FRAMEWORK
};

#if defined(_WIN32) || defined(_WIN64)
extern const char *GetSubModuleName(SubModuleId module_id, const char **sub_module_names = SUB_MODULE_NAMES)
__attribute__((dllexport));
#else
extern const char *GetSubModuleName(SubModuleId module_id, const char **sub_module_names = SUB_MODULE_NAMES)
__attribute__((visibility("default")));
#endif

const char *EnumStrForMsLogLevel(MsLogLevel level); const char *EnumStrForMsLogLevel(MsLogLevel level);


#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)


Write Preview
Loading…
Cancel
Save