mindstudio-probe 1.1.0__py3-none-any.whl → 1.1.1__py3-none-any.whl

msprobe/mindspore/common/utils.py

@@ -1,4 +1,5 @@
-# Copyright 2024 Huawei Technologies Co., Ltd
+# Copyright (c) 2024-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.
@@ -11,13 +12,14 @@
 # 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 random
 
 import mindspore as ms
 
+from mindspore import ops
+from mindspore.mint import nn
 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
@@ -41,7 +43,7 @@ def convert_bf16_to_fp32(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()
+        saved_tensor = tensor.contiguous().asnumpy()
         save_npy(saved_tensor, file_path)
     else:
         logger.warning(f'The file path {file_path} length exceeds limit.')
@@ -74,13 +76,15 @@ def list_lowest_level_directories(root_dir):
     return lowest_level_dirs
 
 
-def seed_all(seed=1234, mode=False):
+def seed_all(seed=1234, mode=False, rm_dropout=True):
     check_seed_all(seed, mode)
     os.environ['PYTHONHASHSEED'] = str(seed)
     ms.set_seed(seed)
     random.seed(seed)
     ms.set_context(deterministic="ON" if mode else "OFF")
     os.environ['HCCL_DETERMINISTIC'] = str(mode)
+    if rm_dropout:
+        remove_dropout()
 
 
 class MsprobeStep(ms.train.Callback):
@@ -95,3 +99,38 @@ class MsprobeStep(ms.train.Callback):
     def on_train_step_end(self, run_context):
         self.debugger.stop()
         self.debugger.step()
+
+
+class Dropout(ops.Dropout):
+    def __init__(self, keep_prob=0.5, Seed0=0, Seed1=1):
+        super().__init__(1., Seed0, Seed1)
+
+
+class Dropout2D(ops.Dropout2D):
+    def __init__(self, keep_prob=0.5):
+        super().__init__(1.)
+
+
+class Dropout3D(ops.Dropout3D):
+    def __init__(self, keep_prob=0.5):
+        super().__init__(1.)
+
+
+class DropoutExt(nn.Dropout):
+    def __init__(self, p=0.5):
+        super().__init__(0)
+
+
+def dropout_ext(input_tensor, p=0.5, training=True):
+    return input_tensor
+
+
+def remove_dropout():
+    ops.Dropout = Dropout
+    ops.operations.Dropout = Dropout
+    ops.Dropout2D = Dropout2D
+    ops.operations.Dropout2D = Dropout2D
+    ops.Dropout3D = Dropout3D
+    ops.operations.Dropout3D = Dropout3D
+    nn.Dropout = DropoutExt
+    nn.functional.dropout = dropout_ext

msprobe/mindspore/compare/distributed_compare.py

@@ -1,10 +1,24 @@
+# Copyright (c) 2024-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.utils import CompareException
 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.mindspore.compare.ms_compare import ms_compare
 from msprobe.core.compare.utils import check_and_return_dir_contents, extract_json
 from msprobe.mindspore.compare.ms_graph_compare import GraphMSComparator
 
@@ -13,16 +27,14 @@ 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)
+    is_print_compare_log = kwargs.get('is_print_compare_log', True)
     # 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.')
+                     '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)
@@ -35,21 +47,9 @@ def ms_compare_distributed(npu_dump_dir, bench_dump_dir, output_path, **kwargs):
             'npu_json_path': npu_path,
             'bench_json_path': bench_path,
             'stack_json_path': stack_path,
-            'is_print_compare_log': True
+            'is_print_compare_log': is_print_compare_log
         }
-        try:
-            summary_compare, md5_compare = task_dumppath_get(dump_result_param)
-            check_configuration_param(stack_mode, auto_analyze, fuzzy_match, 
-                                      dump_result_param.get('is_print_compare_log', True))
-            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)
+        ms_compare(input_param=dump_result_param, output_path=output_path, suffix=f'_{nr}-{br}', **kwargs)
 
 
 def ms_graph_compare(inputs, outputs):