mindspore 2.5.0__cp310-cp310-win_amd64.whl → 2.6.0rc1__cp310-cp310-win_amd64.whl

mindspore/profiler/mstx.py

@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Huawei Technologies Co., Ltd
+# Copyright 2020-2025 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.
@@ -13,12 +13,16 @@
 # limitations under the License.
 # ============================================================================
 """ Mstx class for NPU profiling """
+import os
+from os.path import basename
 import mindspore
 import mindspore._c_expression as c_expression
 
+from mindspore import context
 from mindspore import log as logging
 from mindspore.runtime import Stream
-from mindspore.profiler.common.constant import DeviceTarget
+from mindspore.profiler.common.constant import DeviceTarget, CannLibName
+from mindspore.profiler.common.path_manager import PathManager
 
 
 class Mstx:
@@ -28,6 +32,11 @@ class Mstx:
     """
 
     NPU_PROFILER = c_expression.Profiler.get_instance(DeviceTarget.NPU.value)
+    enable = any(
+        basename(path) == CannLibName.CANN_MSPTI and PathManager.check_cann_lib_valid(path)
+        for path in os.environ.get("LD_PRELOAD", "").split(":")
+        if path.strip()
+    )
 
     @staticmethod
     def mark(message: str, stream: mindspore.runtime.Stream = None) -> None:
@@ -42,10 +51,11 @@ class Mstx:
         Examples:
             >>> import numpy as np
             >>> import mindspore as ms
+            >>> import mindspore
             >>> from mindspore import nn
             >>> import mindspore.dataset as ds
             >>> from mindspore import Profiler
-            >>> from mindspore.profiler import ProfilerLevel, ProfilerActivity, schedule, tensor_board_trace_handler
+            >>> from mindspore.profiler import ProfilerLevel, ProfilerActivity, schedule, tensorboard_trace_handler
             >>> from mindspore.profiler import mstx
             >>>
             >>> class Net(nn.Cell):
@@ -77,16 +87,28 @@ class Mstx:
             ...     ms.set_context(mode=ms.PYNATIVE_MODE)
             ...     ms.set_device(device_target="Ascend", device_id=0)
             ...     # Init Profiler
-            ...     with Profiler(profiler_level=ProfilerLevel.LevelNone,
-            ...                   on_trace_ready=tensor_board_trace_handler,
-            ...                   activities=[ProfilerActivity.CPU, ProfilerActivity.NPU],
-            ...                   schedule=schedule(wait=0, warmup=0, active=3, repeat=1, skip_first=0),
-            ...                   mstx=True) as profiler:
+            ...     experimental_config = mindspore.profiler._ExperimentalConfig(
+            ...                                 profiler_level=ProfilerLevel.LevelNone,
+            ...                                 mstx=True)
+            ...     # Note that the Profiler should be initialized before model.train
+            ...     with mindspore.profiler.profile(
+            ...         activities=[ProfilerActivity.CPU, ProfilerActivity.NPU],
+            ...         schedule=schedule(wait=0, warmup=0, active=3, repeat=1, skip_first=0),
+            ...         on_trace_ready=mindspore.profiler.tensorboard_trace_handler("./data"),
+            ...         experimental_config=experimental_config
+            ...     ) as profiler:
             ...         net = Net()
             ...         for i in range(5):
             ...             train(net)
             ...             profiler.step()
         """
+        if not Mstx.enable:
+            return
+        if context.get_context('device_target') != DeviceTarget.NPU.value:
+            return
+        if not Mstx.NPU_PROFILER:
+            logging.warning("Invalid npu profiler for mstx, please check.")
+            return
         if not message or not isinstance(message, str):
             logging.warning("Invalid message for mstx.mark func. Please input valid message string.")
             return
@@ -117,10 +139,11 @@ class Mstx:
         Examples:
             >>> import numpy as np
             >>> import mindspore as ms
+            >>> import mindspore
             >>> from mindspore import nn
             >>> import mindspore.dataset as ds
             >>> from mindspore import Profiler
-            >>> from mindspore.profiler import ProfilerLevel, ProfilerActivity, schedule, tensor_board_trace_handler
+            >>> from mindspore.profiler import ProfilerLevel, ProfilerActivity, schedule, tensorboard_trace_handler
             >>> from mindspore.profiler import mstx
             >>>
             >>> class Net(nn.Cell):
@@ -151,16 +174,29 @@ class Mstx:
             ...     # when in mindspore.GRAPH_MODE
             ...     ms.set_context(mode=ms.PYNATIVE_MODE)
             ...     ms.set_device(device_target="Ascend", device_id=0)
-            ...     with Profiler(profiler_level=ProfilerLevel.LevelNone,
-            ...                   on_trace_ready=tensor_board_trace_handler,
-            ...                   activities=[ProfilerActivity.CPU, ProfilerActivity.NPU],
-            ...                   schedule=schedule(wait=0, warmup=0, active=3, repeat=1, skip_first=0),
-            ...                   mstx=True) as profiler:
+            ...     # Init Profiler
+            ...     experimental_config = mindspore.profiler._ExperimentalConfig(
+            ...                                 profiler_level=ProfilerLevel.LevelNone,
+            ...                                 mstx=True)
+            ...     # Note that the Profiler should be initialized before model.train
+            ...     with mindspore.profiler.profile(
+            ...         activities=[ProfilerActivity.CPU, ProfilerActivity.NPU],
+            ...         schedule=schedule(wait=0, warmup=0, active=3, repeat=1, skip_first=0),
+            ...         on_trace_ready=mindspore.profiler.tensorboard_trace_handler("./data"),
+            ...         experimental_config=experimental_config
+            ...     ) as profiler:
             ...         net = Net()
             ...         for i in range(5):
             ...             train(net)
             ...             profiler.step()
         """
+        if not Mstx.enable:
+            return 0
+        if context.get_context('device_target') != DeviceTarget.NPU.value:
+            return 0
+        if not Mstx.NPU_PROFILER:
+            logging.warning("Invalid npu profiler for mstx, please check.")
+            return 0
         if not message or not isinstance(message, str):
             logging.warning("Invalid message for mstx.range_start func. Please input valid message string.")
             return 0
@@ -191,6 +227,13 @@ class Mstx:
             >>> # model.train(1, data)
             >>> # mstx.range_end(range_id)
         """
+        if not Mstx.enable or range_id == 0:
+            return
+        if context.get_context('device_target') != DeviceTarget.NPU.value:
+            return
+        if not Mstx.NPU_PROFILER:
+            logging.warning("Invalid npu profiler for mstx, please check.")
+            return
         if not isinstance(range_id, int):
             logging.warning(
                 "Invalid message for mstx.range_start func. Please input return value from mstx.range_start."

mindspore/profiler/platform/npu_profiler.py

@@ -25,8 +25,12 @@ import mindspore._c_expression as c_expression
 
 from mindspore.profiler.common.path_manager import PathManager
 from mindspore.profiler.common.registry import PROFILERS
-from mindspore.profiler.common.constant import DeviceTarget, ProfilerActivity, AnalysisMode
-
+from mindspore.profiler.common.constant import (
+    DeviceTarget,
+    ProfilerActivity,
+    AnalysisMode,
+    ExportType,
+)
 from mindspore._c_expression import _framework_profiler_enable_mi, _framework_profiler_disable_mi
 from mindspore.profiler.common.profiler_context import ProfilerContext
 from mindspore.profiler.platform.base_profiler import BaseProfiler
@@ -53,6 +57,7 @@ from mindspore.profiler.analysis.viewer.ms_minddata_viewer import (
 )
 from mindspore.profiler.common.util import print_msg_with_pid
 from mindspore.profiler.common.log import ProfilerLogger
+from mindspore.profiler.mstx import Mstx
 
 
 @PROFILERS.register_module(DeviceTarget.NPU.value)
@@ -99,6 +104,8 @@ class NpuProfiler(BaseProfiler):
         """Start profiling."""
         self._logger.info("NpuProfiler start.")
 
+        Mstx.enable = self._prof_ctx.npu_profiler_params.get("mstx", False)
+
         if ProfilerActivity.CPU in self._prof_ctx.activities:
             _framework_profiler_enable_mi()
             self._prof_mgr.set_profile_framework("time")
@@ -114,6 +121,9 @@ class NpuProfiler(BaseProfiler):
     def stop(self) -> None:
         """Stop profiling."""
         self._logger.info("NpuProfiler stop.")
+
+        Mstx.enable = False
+
         if self._profiler:
             self._profiler.stop()
 
@@ -147,15 +157,17 @@ class NPUProfilerAnalysis:
     """
 
     @classmethod
-    def online_analyse(cls):
+    def online_analyse(cls, async_mode: bool = False):
         """
         Online analysis for NPU
         """
         cls._pre_analyse_online()
-        if ProfilerContext().mode == AnalysisMode.SYNC_MODE.value:
-            cls._run_tasks(**ProfilerContext().to_dict())
-        elif ProfilerContext().mode == AnalysisMode.ASYNC_MODE.value:
+        if async_mode:
+            ProfilerContext().mode = AnalysisMode.ASYNC_MODE.value
             MultiProcessPool().add_async_job(cls._run_tasks, **ProfilerContext().to_dict())
+        else:
+            ProfilerContext().mode = AnalysisMode.SYNC_MODE.value
+            cls._run_tasks(**ProfilerContext().to_dict())
 
     @classmethod
     def offline_analyse(
@@ -248,7 +260,10 @@ class NPUProfilerAnalysis:
         task_mgr = cls._construct_task_mgr(**kwargs)
         task_mgr.run()
         ProfilerLogger.get_instance().info(json.dumps(task_mgr.cost_time, indent=4))
-        if kwargs.get("data_simplification"):
+        activities = kwargs.get("activities")
+        if activities and ProfilerActivity.NPU.value in activities:
+            ProfilerPathManager().move_db_file()
+        if kwargs.get("data_simplification") and ProfilerActivity.NPU.value in kwargs.get("activities"):
             ProfilerPathManager().simplify_data()
 
     @classmethod
@@ -258,10 +273,21 @@ class NPUProfilerAnalysis:
         """
         task_mgr = TaskManager()
         activities = kwargs.get("activities", [])
+        export_type = kwargs.get("export_type", [])
         enable_data_process = kwargs.get("data_process", False)
 
         # CANN flow parser
         cann_flow_parsers = []
+
+        if export_type == [ExportType.Db.value]:
+            cann_flow_parsers.append(
+                AscendMsprofParser(**kwargs)
+            )
+            task_mgr.create_flow(
+                *cann_flow_parsers, flow_name="cann_flow", show_process=True
+            )
+            return task_mgr
+
         if ProfilerActivity.NPU.value in activities:
             cann_flow_parsers.append(
                 AscendMsprofParser(**kwargs)