mindstudio-probe 1.0.3__py3-none-any.whl → 1.0.4__py3-none-any.whl

msprobe/mindspore/common/log.py

@@ -1,38 +1,38 @@
-# Copyright 2024 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.
-# ============================================================================
-
-import os
-import time
-import sys
-
-from msprobe.mindspore.common.utils import get_rank_if_initialized
-from msprobe.core.common.log import BaseLogger
-from msprobe.core.common.exceptions import DistributedNotInitializedError
-
-
-class MindsporeLogger(BaseLogger):
-    def __init__(self):
-        super().__init__()
-
-    def get_rank(self):
-        try:
-            current_rank = get_rank_if_initialized()
-        except DistributedNotInitializedError:
-            current_rank = None
-
-        return current_rank
-
-
+# Copyright 2024 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.
+# ============================================================================
+
+import os
+import time
+import sys
+
+from msprobe.mindspore.common.utils import get_rank_if_initialized
+from msprobe.core.common.log import BaseLogger
+from msprobe.core.common.exceptions import DistributedNotInitializedError
+
+
+class MindsporeLogger(BaseLogger):
+    def __init__(self):
+        super().__init__()
+
+    def get_rank(self):
+        try:
+            current_rank = get_rank_if_initialized()
+        except DistributedNotInitializedError:
+            current_rank = None
+
+        return current_rank
+
+
 logger = MindsporeLogger()

msprobe/mindspore/common/utils.py

@@ -1,57 +1,81 @@
-# Copyright 2024 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.
-# ============================================================================
-
-import mindspore as ms
-
-from msprobe.core.common.exceptions import DistributedNotInitializedError
-from msprobe.core.common.file_check import path_len_exceeds_limit
-from msprobe.core.common.utils import save_npy
-from msprobe.core.common.log import logger
-
-
-def get_rank_if_initialized():
-    if ms.communication.GlobalComm.INITED:
-        return ms.communication.get_rank()
-    else:
-        raise DistributedNotInitializedError("mindspore distributed environment is not initialized")
-
-
-def convert_bf16_to_fp32(tensor):
-    if tensor.dtype == ms.bfloat16:
-        tensor = tensor.to(ms.float32)
-    return tensor
-
-
-def save_tensor_as_npy(tensor, file_path):
-    if not path_len_exceeds_limit(file_path):
-        tensor = convert_bf16_to_fp32(tensor)
-        saved_tensor = tensor.asnumpy()
-        save_npy(saved_tensor, file_path)
-    else:
-        logger.warning(f'The file path {file_path} length exceeds limit.')
-
-
-class MsprobeStep(ms.train.Callback):
-
-    def __init__(self, debugger):
-        super(MsprobeStep, self).__init__()
-        self.debugger = debugger
-
-    def on_train_step_begin(self, run_context):
-        self.debugger.start()
-
-    def on_train_step_end(self, run_context):
-        self.debugger.stop()
-        self.debugger.step()
+# Copyright 2024 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.
+# ============================================================================
+import os
+import mindspore as ms
+
+from msprobe.core.common.exceptions import DistributedNotInitializedError
+from msprobe.core.common.file_utils import path_len_exceeds_limit, check_path_exists, save_npy
+from msprobe.core.common.log import logger
+
+
+def get_rank_if_initialized():
+    if ms.communication.GlobalComm.INITED:
+        return ms.communication.get_rank()
+    else:
+        raise DistributedNotInitializedError("mindspore distributed environment is not initialized")
+
+
+def convert_bf16_to_fp32(tensor):
+    if tensor.dtype == ms.bfloat16:
+        tensor = tensor.to(ms.float32)
+    return tensor
+
+
+def save_tensor_as_npy(tensor, file_path):
+    if not path_len_exceeds_limit(file_path):
+        tensor = convert_bf16_to_fp32(tensor)
+        saved_tensor = tensor.asnumpy()
+        save_npy(saved_tensor, file_path)
+    else:
+        logger.warning(f'The file path {file_path} length exceeds limit.')
+
+
+def convert_to_int(value):
+    try:
+        return int(value)
+    except Exception:
+        return -1
+
+
+def list_lowest_level_directories(root_dir):
+    check_path_exists(root_dir)
+    lowest_level_dirs = []
+
+    def recurse_dirs(current_dir):
+        for entry in os.listdir(current_dir):
+            full_path = os.path.join(current_dir, entry)
+            if os.path.isdir(full_path):
+                if any(os.path.isdir(os.path.join(full_path, subentry)) for subentry in os.listdir(full_path)):
+                    recurse_dirs(full_path)
+                else:
+                    lowest_level_dirs.append(full_path)
+
+    recurse_dirs(root_dir)
+    return lowest_level_dirs
+
+
+
+class MsprobeStep(ms.train.Callback):
+
+    def __init__(self, debugger):
+        super(MsprobeStep, self).__init__()
+        self.debugger = debugger
+
+    def on_train_step_begin(self, run_context):
+        self.debugger.start()
+
+    def on_train_step_end(self, run_context):
+        self.debugger.stop()
+        self.debugger.step()

msprobe/mindspore/compare/distributed_compare.py

@@ -1,75 +1,75 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-# Copyright (C) 2019-2024. Huawei Technologies Co., Ltd. All rights reserved.
-# 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.
-"""
-import os
-from msprobe.core.common.utils import CompareException, check_compare_param, \
-    check_configuration_param, task_dumppath_get
-from msprobe.core.common.file_check import create_directory
-from msprobe.core.common.exceptions import FileCheckException
-from msprobe.core.common.log import logger
-from msprobe.mindspore.compare.ms_compare import MSComparator
-from msprobe.core.compare.utils import check_and_return_dir_contents, extract_json
-from msprobe.mindspore.compare.ms_graph_compare import GraphMSComparator
-
-def ms_compare_distributed(npu_dump_dir, bench_dump_dir, output_path, **kwargs):
-    if kwargs.get('suffix'):
-        logger.error("Argument 'suffix' is not supported for compare_distributed.")
-        raise CompareException(CompareException.INVALID_PARAM_ERROR)
-    stack_mode = kwargs.get('stack_mode', False)
-    auto_analyze = kwargs.get('auto_analyze', True)
-    fuzzy_match = kwargs.get('fuzzy_match', False)
-    # get the ranks and match by order
-    npu_ranks = sorted(check_and_return_dir_contents(npu_dump_dir, 'rank'))
-    bench_ranks = sorted(check_and_return_dir_contents(bench_dump_dir, 'rank'))
-    if len(npu_ranks) != len(bench_ranks):
-        logger.error('The number of ranks in the two runs are different. '
-                        'Unable to match the ranks. Please use another folder to compare '
-                        'or use compare() api and manually match the ranks.')
-        raise CompareException(CompareException.INVALID_PATH_ERROR)
-    for nr, br in zip(npu_ranks, bench_ranks):
-        npu_data_dir = os.path.join(npu_dump_dir, nr)
-        bench_data_dir = os.path.join(bench_dump_dir, br)
-        npu_path = extract_json(npu_data_dir, stack_json=False)
-        bench_path = extract_json(bench_data_dir, stack_json=False)
-        stack_path = extract_json(npu_data_dir, stack_json=True)
-
-        dump_result_param = {
-            'npu_json_path': npu_path,
-            'bench_json_path': bench_path,
-            'stack_json_path': stack_path,
-            'is_print_compare_log': True
-        }
-        try:
-            summary_compare, md5_compare = task_dumppath_get(dump_result_param)
-            check_configuration_param(stack_mode, auto_analyze, fuzzy_match)
-            create_directory(output_path)
-            check_compare_param(dump_result_param, output_path, summary_compare=summary_compare, md5_compare=md5_compare)
-        except (CompareException, FileCheckException) as error:
-            logger.error('Compare failed. Please check the arguments and do it again!')
-            raise CompareException(error.code) from error
-        ms_comparator = MSComparator()
-        ms_comparator.compare_core(dump_result_param, output_path, suffix=f'_{nr}-{br}', summary_compare=summary_compare,
-                     md5_compare=md5_compare, **kwargs)
-
-
-def ms_graph_compare(inputs, outputs):
-    try:
-        create_directory(outputs)
-    except (CompareException, FileCheckException) as error:
-        logger.error('Compare failed. Please check the arguments and do it again!')
-        return
-    msComparator = GraphMSComparator(inputs, outputs)
-    msComparator.compare_core()
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+# Copyright (C) 2019-2024. Huawei Technologies Co., Ltd. All rights reserved.
+# 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.
+"""
+import os
+from msprobe.core.common.utils import CompareException, check_compare_param, \
+    check_configuration_param, task_dumppath_get
+from msprobe.core.common.file_utils import create_directory
+from msprobe.core.common.exceptions import FileCheckException
+from msprobe.mindspore.common.log import logger
+from msprobe.mindspore.compare.ms_compare import MSComparator
+from msprobe.core.compare.utils import check_and_return_dir_contents, extract_json
+from msprobe.mindspore.compare.ms_graph_compare import GraphMSComparator
+
+def ms_compare_distributed(npu_dump_dir, bench_dump_dir, output_path, **kwargs):
+    if kwargs.get('suffix'):
+        logger.error("Argument 'suffix' is not supported for compare_distributed.")
+        raise CompareException(CompareException.INVALID_PARAM_ERROR)
+    stack_mode = kwargs.get('stack_mode', False)
+    auto_analyze = kwargs.get('auto_analyze', True)
+    fuzzy_match = kwargs.get('fuzzy_match', False)
+    # get the ranks and match by order
+    npu_ranks = sorted(check_and_return_dir_contents(npu_dump_dir, 'rank'))
+    bench_ranks = sorted(check_and_return_dir_contents(bench_dump_dir, 'rank'))
+    if len(npu_ranks) != len(bench_ranks):
+        logger.error('The number of ranks in the two runs are different. '
+                        'Unable to match the ranks. Please use another folder to compare '
+                        'or use compare() api and manually match the ranks.')
+        raise CompareException(CompareException.INVALID_PATH_ERROR)
+    for nr, br in zip(npu_ranks, bench_ranks):
+        npu_data_dir = os.path.join(npu_dump_dir, nr)
+        bench_data_dir = os.path.join(bench_dump_dir, br)
+        npu_path = extract_json(npu_data_dir, stack_json=False)
+        bench_path = extract_json(bench_data_dir, stack_json=False)
+        stack_path = extract_json(npu_data_dir, stack_json=True)
+
+        dump_result_param = {
+            'npu_json_path': npu_path,
+            'bench_json_path': bench_path,
+            'stack_json_path': stack_path,
+            'is_print_compare_log': True
+        }
+        try:
+            summary_compare, md5_compare = task_dumppath_get(dump_result_param)
+            check_configuration_param(stack_mode, auto_analyze, fuzzy_match)
+            create_directory(output_path)
+            check_compare_param(dump_result_param, output_path, summary_compare=summary_compare, md5_compare=md5_compare)
+        except (CompareException, FileCheckException) as error:
+            logger.error('Compare failed. Please check the arguments and do it again!')
+            raise CompareException(error.code) from error
+        ms_comparator = MSComparator()
+        ms_comparator.compare_core(dump_result_param, output_path, suffix=f'_{nr}-{br}', summary_compare=summary_compare,
+                     md5_compare=md5_compare, **kwargs)
+
+
+def ms_graph_compare(inputs, outputs):
+    try:
+        create_directory(outputs)
+    except (CompareException, FileCheckException) as error:
+        logger.error('Compare failed. Please check the arguments and do it again!')
+        return
+    msComparator = GraphMSComparator(inputs, outputs)
+    msComparator.compare_core()