mindspore 2.3.0__cp39-none-any.whl → 2.3.0rc2__cp39-none-any.whl

mindspore/scipy/ops.py

@@ -20,11 +20,6 @@ from ..common import dtype as mstype
 
 
 class SolveTriangular():
-    """
-    Solve linear system,(triangular matrix)
-    a * x = b
-    """
-
     def __init__(self, lower: bool = False, unit_diagonal: bool = False, trans: str = 'N'):
         self.lower = lower
         self.unit_diagonal = unit_diagonal
@@ -163,3 +158,6 @@ class LinearSumAssignment(Primitive):
     def __init__(self):
         super().__init__(name="LinearSumAssignment")
         self.init_prim_io_names(inputs=['cost_matrix', 'dimension_limit', 'maximize'], outputs=['row_ind', 'col_ind'])
+
+# pylint: disable=C0413,W0611
+from .ops_grad import get_bprpo_eigh

mindspore/scipy/optimize/__init__.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 # ============================================================================
 """Optimize submodule"""
-__all__ = ["minimize", "line_search", "linear_sum_assignment"]
-
 from .minimize import minimize
 from .line_search import line_search
 from .linear_sum_assignment import linear_sum_assignment
+
+__all__ = ["minimize", "line_search", "linear_sum_assignment"]

mindspore/train/__init__.py

@@ -27,17 +27,17 @@ from mindspore.train.loss_scale_manager import LossScaleManager, FixedLossScaleM
 from mindspore.train.serialization import save_checkpoint, load_checkpoint, load_param_into_net, export, \
     load, parse_print, build_searched_strategy, merge_sliced_parameter, load_distributed_checkpoint, \
     async_ckpt_thread_status, restore_group_info_list, convert_model, obfuscate_model, export_split_mindir, \
-    load_checkpoint_async, check_checkpoint
+    load_checkpoint_async
 from mindspore.train.callback import Callback, LossMonitor, TimeMonitor, ModelCheckpoint, SummaryCollector, \
-    CheckpointConfig, RunContext, LearningRateScheduler, SummaryLandscape, FlopsUtilizationCollector, \
-    History, LambdaCallback, ReduceLROnPlateau, EarlyStopping, OnRequestExit, BackupAndRestore, MindIOTTPAdapter
+    CheckpointConfig, RunContext, LearningRateScheduler, SummaryLandscape, \
+    History, LambdaCallback, ReduceLROnPlateau, EarlyStopping, OnRequestExit, BackupAndRestore
 from mindspore.train.summary import SummaryRecord
 from mindspore.train.train_thor import ConvertNetUtils, ConvertModelUtils
 from mindspore.train.metrics import *
 from mindspore.train.data_sink import data_sink
 
 __all__ = ["Model", "DatasetHelper", "connect_network_with_dataset", "build_train_network", "LossScaleManager",
-           "FixedLossScaleManager", "DynamicLossScaleManager", "save_checkpoint", "load_checkpoint", "check_checkpoint",
+           "FixedLossScaleManager", "DynamicLossScaleManager", "save_checkpoint", "load_checkpoint",
            "load_param_into_net", "export", "load", "export_split_mindir", "parse_print", "build_searched_strategy",
            "merge_sliced_parameter", "load_distributed_checkpoint", "async_ckpt_thread_status",
            "restore_group_info_list", "convert_model", "data_sink", "obfuscate_model", "load_checkpoint_async"]

mindspore/train/anf_ir_pb2.py

@@ -20,7 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   syntax='proto2',
   serialized_options=None,
   create_key=_descriptor._internal_create_key,
-  serialized_pb=b'\n\x0c\x61nf_ir.proto\x12\x0emindspore.irpb\"\xdb\x04\n\nValueProto\x12\'\n\x05\x64type\x18\x01 \x01(\x0e\x32\x18.mindspore.irpb.DataType\x12\x10\n\x08\x62ool_val\x18\x02 \x01(\x08\x12\x0f\n\x07int_val\x18\x03 \x01(\x03\x12\x10\n\x08uint_val\x18\x04 \x01(\x04\x12\x11\n\tfloat_val\x18\x05 \x01(\x02\x12\x12\n\ndouble_val\x18\x06 \x01(\x01\x12\x0f\n\x07str_val\x18\x07 \x01(\t\x12/\n\ntensor_val\x18\x08 \x01(\x0b\x32\x1b.mindspore.irpb.TensorProto\x12)\n\x05graph\x18\t \x01(\x0b\x32\x1a.mindspore.irpb.GraphProto\x12\x11\n\tbool_vals\x18\n \x03(\x08\x12\x10\n\x08int_vals\x18\x0b \x03(\x03\x12\x11\n\tuint_vals\x18\x0c \x03(\x04\x12\x12\n\nfloat_vals\x18\r \x03(\x02\x12\x13\n\x0b\x64ouble_vals\x18\x0e \x03(\x01\x12\x10\n\x08str_vals\x18\x0f \x03(\t\x12\x30\n\x0btensor_vals\x18\x10 \x03(\x0b\x32\x1b.mindspore.irpb.TensorProto\x12*\n\x06graphs\x18\x11 \x03(\x0b\x32\x1a.mindspore.irpb.GraphProto\x12*\n\x06values\x18\x12 \x03(\x0b\x32\x1a.mindspore.irpb.ValueProto\x12\x31\n\x08\x64ict_val\x18\x13 \x03(\x0b\x32\x1f.mindspore.irpb.NamedValueProto\x12+\n\x08type_val\x18\x14 \x01(\x0b\x32\x19.mindspore.irpb.TypeProto\"I\n\x0e\x41ttributeProto\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05value\x18\x02 \x01(\x0b\x32\x1a.mindspore.irpb.ValueProto\"I\n\x0fNamedValueProto\x12\x0b\n\x03key\x18\x01 \x01(\t\x12)\n\x05value\x18\x02 \x01(\x0b\x32\x1a.mindspore.irpb.ValueProto\"t\n\x10TensorShapeProto\x12\x37\n\x03\x64im\x18\x01 \x03(\x0b\x32*.mindspore.irpb.TensorShapeProto.Dimension\x1a\'\n\tDimension\x12\x0c\n\x04size\x18\x01 \x01(\x03\x12\x0c\n\x04name\x18\x02 \x01(\t\"\xda\x02\n\tTypeProto\x12+\n\tdata_type\x18\x01 \x01(\x0e\x32\x18.mindspore.irpb.DataType\x12\x37\n\x0btensor_type\x18\x02 \x01(\x0b\x32 .mindspore.irpb.TypeProto.TensorH\x00\x12;\n\rsequence_type\x18\x03 \x01(\x0b\x32\".mindspore.irpb.TypeProto.SequenceH\x00\x1a\x66\n\x06Tensor\x12+\n\telem_type\x18\x01 \x01(\x0e\x32\x18.mindspore.irpb.DataType\x12/\n\x05shape\x18\x02 \x01(\x0b\x32 .mindspore.irpb.TensorShapeProto\x1a\x39\n\x08Sequence\x12-\n\nelem_types\x18\x01 \x03(\x0b\x32\x19.mindspore.irpb.TypeProtoB\x07\n\x05value\"x\n\x0eParameterProto\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\'\n\x04type\x18\x02 \x01(\x0b\x32\x19.mindspore.irpb.TypeProto\x12/\n\x0b\x64\x65\x66\x61ult_val\x18\x03 \x01(\x0b\x32\x1a.mindspore.irpb.ValueProto\"D\n\x0bOutputProto\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\'\n\x04type\x18\x02 \x01(\x0b\x32\x19.mindspore.irpb.TypeProto\"z\n\nInputProto\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x31\n\x04type\x18\x02 \x01(\x0e\x32#.mindspore.irpb.InputProto.EdgeType\"+\n\x08\x45\x64geType\x12\r\n\tDATA_EDGE\x10\x00\x12\x10\n\x0c\x43ONTROL_EDGE\x10\x01\"\x83\x02\n\tNodeProto\x12)\n\x05input\x18\x01 \x03(\x0b\x32\x1a.mindspore.irpb.InputProto\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0f\n\x07op_type\x18\x03 \x01(\t\x12\r\n\x05scope\x18\x04 \x01(\t\x12\x31\n\tattribute\x18\x05 \x03(\x0b\x32\x1e.mindspore.irpb.AttributeProto\x12.\n\x0boutput_type\x18\x06 \x01(\x0b\x32\x19.mindspore.irpb.TypeProto\x12\x10\n\x08output_i\x18\x07 \x01(\x04\x12\x11\n\tfull_name\x18\x08 \x01(\t\x12\x15\n\rinstance_name\x18\n \x01(\t\"\xb0\x01\n\nModelProto\x12\x12\n\nir_version\x18\x01 \x01(\x03\x12\x0e\n\x06\x64omain\x18\x02 \x01(\t\x12\x15\n\rmodel_version\x18\x03 \x01(\x03\x12)\n\x05graph\x18\x04 \x01(\x0b\x32\x1a.mindspore.irpb.GraphProto\x12<\n\x12metadata_operators\x18\x05 \x01(\x0b\x32 .mindspore.irpb.OperatorSetProto\"?\n\rOperatorProto\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0e\n\x06\x63onfig\x18\x02 \x01(\x0c\x12\x10\n\x08obj_info\x18\x03 \x01(\x0c\"U\n\x10OperatorSetProto\x12\x30\n\toperators\x18\x01 \x03(\x0b\x32\x1d.mindspore.irpb.OperatorProto\x12\x0f\n\x07summary\x18\x02 \x01(\t\"\xda\x01\n\nGraphProto\x12\'\n\x04node\x18\x01 \x03(\x0b\x32\x19.mindspore.irpb.NodeProto\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x32\n\nparameters\x18\x03 \x03(\x0b\x32\x1e.mindspore.irpb.ParameterProto\x12,\n\x07outputs\x18\x04 \x03(\x0b\x32\x1b.mindspore.irpb.OutputProto\x12\x33\n\nconst_vals\x18\x05 \x03(\x0b\x32\x1f.mindspore.irpb.NamedValueProto\"\xd4\x01\n\x0bTensorProto\x12\x0c\n\x04\x64ims\x18\x01 \x03(\x03\x12+\n\tdata_type\x18\x02 \x01(\x0e\x32\x18.mindspore.irpb.DataType\x12\x16\n\nfloat_data\x18\x03 \x03(\x02\x42\x02\x10\x01\x12\x16\n\nint32_data\x18\x04 \x03(\x05\x42\x02\x10\x01\x12\x16\n\nint64_data\x18\x05 \x03(\x03\x42\x02\x10\x01\x12\x17\n\x0b\x64ouble_data\x18\x06 \x03(\x01\x42\x02\x10\x01\x12\x17\n\x0buint64_data\x18\x07 \x03(\x04\x42\x02\x10\x01\x12\x10\n\x08raw_data\x18\x08 \x01(\x0c*/\n\x07Version\x12\x14\n\x10UNKNOWWN_VERSION\x10\x00\x12\x0e\n\nIR_VERSION\x10\x01*\x89\x06\n\x08\x44\x61taType\x12\x10\n\x0c\x44T_UNDEFINED\x10\x00\x12\x0b\n\x07\x44T_BOOL\x10\x01\x12\x0b\n\x07\x44T_INT8\x10\x02\x12\x0c\n\x08\x44T_INT16\x10\x03\x12\x0c\n\x08\x44T_INT32\x10\x04\x12\x0c\n\x08\x44T_INT64\x10\x05\x12\x0c\n\x08\x44T_UINT8\x10\x06\x12\r\n\tDT_UINT16\x10\x07\x12\r\n\tDT_UINT32\x10\x08\x12\r\n\tDT_UINT64\x10\t\x12\x0e\n\nDT_FLOAT16\x10\n\x12\x0e\n\nDT_FLOAT32\x10\x0b\x12\x0e\n\nDT_FLOAT64\x10\x0c\x12\r\n\tDT_STRING\x10\r\x12\r\n\tDT_TENSOR\x10\x0e\x12\x0c\n\x08\x44T_GRAPH\x10\x0f\x12\x0c\n\x08\x44T_BOOLS\x10\x10\x12\x0c\n\x08\x44T_INTS8\x10\x11\x12\r\n\tDT_INTS16\x10\x12\x12\r\n\tDT_INTS32\x10\x13\x12\r\n\tDT_INTS64\x10\x14\x12\r\n\tDT_UINTS8\x10\x15\x12\x0e\n\nDT_UINTS16\x10\x16\x12\x0e\n\nDT_UINTS32\x10\x17\x12\x0e\n\nDT_UINTS64\x10\x18\x12\x0f\n\x0b\x44T_FLOATS16\x10\x19\x12\x0f\n\x0b\x44T_FLOATS32\x10\x1a\x12\x0f\n\x0b\x44T_FLOATS64\x10\x1b\x12\x0e\n\nDT_STRINGS\x10\x1c\x12\x0e\n\nDT_TENSORS\x10\x1d\x12\r\n\tDT_GRAPHS\x10\x1e\x12\x0c\n\x08\x44T_TUPLE\x10\x1f\x12\x0b\n\x07\x44T_LIST\x10 \x12\x0b\n\x07\x44T_DICT\x10!\x12\x0b\n\x07\x44T_NONE\x10\"\x12\x0f\n\x0b\x44T_SYM_INST\x10#\x12\x0f\n\x0b\x44T_BASE_INT\x10$\x12\x10\n\x0c\x44T_BASE_UINT\x10%\x12\x11\n\rDT_BASE_FLOAT\x10&\x12\x0b\n\x07\x44T_TYPE\x10\'\x12\n\n\x06\x44T_ANY\x10(\x12\r\n\tDT_REFKEY\x10)\x12\n\n\x06\x44T_REF\x10*\x12\x10\n\x0c\x44T_COMPLEX64\x10+\x12\x11\n\rDT_COMPLEX128\x10,\x12\x13\n\x0f\x44T_BASE_COMPLEX\x10-\x12\x0f\n\x0b\x44T_BFLOAT16\x10.\x12\x10\n\x0c\x44T_BFLOATS16\x10/\x12\x0b\n\x07\x44T_INT4\x10\x30\x12\x0c\n\x08\x44T_SLICE\x10\x31'
+  serialized_pb=b'\n\x0c\x61nf_ir.proto\x12\x0emindspore.irpb\"\xdb\x04\n\nValueProto\x12\'\n\x05\x64type\x18\x01 \x01(\x0e\x32\x18.mindspore.irpb.DataType\x12\x10\n\x08\x62ool_val\x18\x02 \x01(\x08\x12\x0f\n\x07int_val\x18\x03 \x01(\x03\x12\x10\n\x08uint_val\x18\x04 \x01(\x04\x12\x11\n\tfloat_val\x18\x05 \x01(\x02\x12\x12\n\ndouble_val\x18\x06 \x01(\x01\x12\x0f\n\x07str_val\x18\x07 \x01(\t\x12/\n\ntensor_val\x18\x08 \x01(\x0b\x32\x1b.mindspore.irpb.TensorProto\x12)\n\x05graph\x18\t \x01(\x0b\x32\x1a.mindspore.irpb.GraphProto\x12\x11\n\tbool_vals\x18\n \x03(\x08\x12\x10\n\x08int_vals\x18\x0b \x03(\x03\x12\x11\n\tuint_vals\x18\x0c \x03(\x04\x12\x12\n\nfloat_vals\x18\r \x03(\x02\x12\x13\n\x0b\x64ouble_vals\x18\x0e \x03(\x01\x12\x10\n\x08str_vals\x18\x0f \x03(\t\x12\x30\n\x0btensor_vals\x18\x10 \x03(\x0b\x32\x1b.mindspore.irpb.TensorProto\x12*\n\x06graphs\x18\x11 \x03(\x0b\x32\x1a.mindspore.irpb.GraphProto\x12*\n\x06values\x18\x12 \x03(\x0b\x32\x1a.mindspore.irpb.ValueProto\x12\x31\n\x08\x64ict_val\x18\x13 \x03(\x0b\x32\x1f.mindspore.irpb.NamedValueProto\x12+\n\x08type_val\x18\x14 \x01(\x0b\x32\x19.mindspore.irpb.TypeProto\"I\n\x0e\x41ttributeProto\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x05value\x18\x02 \x01(\x0b\x32\x1a.mindspore.irpb.ValueProto\"I\n\x0fNamedValueProto\x12\x0b\n\x03key\x18\x01 \x01(\t\x12)\n\x05value\x18\x02 \x01(\x0b\x32\x1a.mindspore.irpb.ValueProto\"t\n\x10TensorShapeProto\x12\x37\n\x03\x64im\x18\x01 \x03(\x0b\x32*.mindspore.irpb.TensorShapeProto.Dimension\x1a\'\n\tDimension\x12\x0c\n\x04size\x18\x01 \x01(\x03\x12\x0c\n\x04name\x18\x02 \x01(\t\"\xda\x02\n\tTypeProto\x12+\n\tdata_type\x18\x01 \x01(\x0e\x32\x18.mindspore.irpb.DataType\x12\x37\n\x0btensor_type\x18\x02 \x01(\x0b\x32 .mindspore.irpb.TypeProto.TensorH\x00\x12;\n\rsequence_type\x18\x03 \x01(\x0b\x32\".mindspore.irpb.TypeProto.SequenceH\x00\x1a\x66\n\x06Tensor\x12+\n\telem_type\x18\x01 \x01(\x0e\x32\x18.mindspore.irpb.DataType\x12/\n\x05shape\x18\x02 \x01(\x0b\x32 .mindspore.irpb.TensorShapeProto\x1a\x39\n\x08Sequence\x12-\n\nelem_types\x18\x01 \x03(\x0b\x32\x19.mindspore.irpb.TypeProtoB\x07\n\x05value\"x\n\x0eParameterProto\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\'\n\x04type\x18\x02 \x01(\x0b\x32\x19.mindspore.irpb.TypeProto\x12/\n\x0b\x64\x65\x66\x61ult_val\x18\x03 \x01(\x0b\x32\x1a.mindspore.irpb.ValueProto\"D\n\x0bOutputProto\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\'\n\x04type\x18\x02 \x01(\x0b\x32\x19.mindspore.irpb.TypeProto\"z\n\nInputProto\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x31\n\x04type\x18\x02 \x01(\x0e\x32#.mindspore.irpb.InputProto.EdgeType\"+\n\x08\x45\x64geType\x12\r\n\tDATA_EDGE\x10\x00\x12\x10\n\x0c\x43ONTROL_EDGE\x10\x01\"\x83\x02\n\tNodeProto\x12)\n\x05input\x18\x01 \x03(\x0b\x32\x1a.mindspore.irpb.InputProto\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0f\n\x07op_type\x18\x03 \x01(\t\x12\r\n\x05scope\x18\x04 \x01(\t\x12\x31\n\tattribute\x18\x05 \x03(\x0b\x32\x1e.mindspore.irpb.AttributeProto\x12.\n\x0boutput_type\x18\x06 \x01(\x0b\x32\x19.mindspore.irpb.TypeProto\x12\x10\n\x08output_i\x18\x07 \x01(\x04\x12\x11\n\tfull_name\x18\x08 \x01(\t\x12\x15\n\rinstance_name\x18\n \x01(\t\"\xb0\x01\n\nModelProto\x12\x12\n\nir_version\x18\x01 \x01(\x03\x12\x0e\n\x06\x64omain\x18\x02 \x01(\t\x12\x15\n\rmodel_version\x18\x03 \x01(\x03\x12)\n\x05graph\x18\x04 \x01(\x0b\x32\x1a.mindspore.irpb.GraphProto\x12<\n\x12metadata_operators\x18\x05 \x01(\x0b\x32 .mindspore.irpb.OperatorSetProto\"?\n\rOperatorProto\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0e\n\x06\x63onfig\x18\x02 \x01(\x0c\x12\x10\n\x08obj_info\x18\x03 \x01(\x0c\"U\n\x10OperatorSetProto\x12\x30\n\toperators\x18\x01 \x03(\x0b\x32\x1d.mindspore.irpb.OperatorProto\x12\x0f\n\x07summary\x18\x02 \x01(\t\"\xda\x01\n\nGraphProto\x12\'\n\x04node\x18\x01 \x03(\x0b\x32\x19.mindspore.irpb.NodeProto\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x32\n\nparameters\x18\x03 \x03(\x0b\x32\x1e.mindspore.irpb.ParameterProto\x12,\n\x07outputs\x18\x04 \x03(\x0b\x32\x1b.mindspore.irpb.OutputProto\x12\x33\n\nconst_vals\x18\x05 \x03(\x0b\x32\x1f.mindspore.irpb.NamedValueProto\"\xd4\x01\n\x0bTensorProto\x12\x0c\n\x04\x64ims\x18\x01 \x03(\x03\x12+\n\tdata_type\x18\x02 \x01(\x0e\x32\x18.mindspore.irpb.DataType\x12\x16\n\nfloat_data\x18\x03 \x03(\x02\x42\x02\x10\x01\x12\x16\n\nint32_data\x18\x04 \x03(\x05\x42\x02\x10\x01\x12\x16\n\nint64_data\x18\x05 \x03(\x03\x42\x02\x10\x01\x12\x17\n\x0b\x64ouble_data\x18\x06 \x03(\x01\x42\x02\x10\x01\x12\x17\n\x0buint64_data\x18\x07 \x03(\x04\x42\x02\x10\x01\x12\x10\n\x08raw_data\x18\x08 \x01(\x0c*/\n\x07Version\x12\x14\n\x10UNKNOWWN_VERSION\x10\x00\x12\x0e\n\nIR_VERSION\x10\x01*\xfb\x05\n\x08\x44\x61taType\x12\x10\n\x0c\x44T_UNDEFINED\x10\x00\x12\x0b\n\x07\x44T_BOOL\x10\x01\x12\x0b\n\x07\x44T_INT8\x10\x02\x12\x0c\n\x08\x44T_INT16\x10\x03\x12\x0c\n\x08\x44T_INT32\x10\x04\x12\x0c\n\x08\x44T_INT64\x10\x05\x12\x0c\n\x08\x44T_UINT8\x10\x06\x12\r\n\tDT_UINT16\x10\x07\x12\r\n\tDT_UINT32\x10\x08\x12\r\n\tDT_UINT64\x10\t\x12\x0e\n\nDT_FLOAT16\x10\n\x12\x0e\n\nDT_FLOAT32\x10\x0b\x12\x0e\n\nDT_FLOAT64\x10\x0c\x12\r\n\tDT_STRING\x10\r\x12\r\n\tDT_TENSOR\x10\x0e\x12\x0c\n\x08\x44T_GRAPH\x10\x0f\x12\x0c\n\x08\x44T_BOOLS\x10\x10\x12\x0c\n\x08\x44T_INTS8\x10\x11\x12\r\n\tDT_INTS16\x10\x12\x12\r\n\tDT_INTS32\x10\x13\x12\r\n\tDT_INTS64\x10\x14\x12\r\n\tDT_UINTS8\x10\x15\x12\x0e\n\nDT_UINTS16\x10\x16\x12\x0e\n\nDT_UINTS32\x10\x17\x12\x0e\n\nDT_UINTS64\x10\x18\x12\x0f\n\x0b\x44T_FLOATS16\x10\x19\x12\x0f\n\x0b\x44T_FLOATS32\x10\x1a\x12\x0f\n\x0b\x44T_FLOATS64\x10\x1b\x12\x0e\n\nDT_STRINGS\x10\x1c\x12\x0e\n\nDT_TENSORS\x10\x1d\x12\r\n\tDT_GRAPHS\x10\x1e\x12\x0c\n\x08\x44T_TUPLE\x10\x1f\x12\x0b\n\x07\x44T_LIST\x10 \x12\x0b\n\x07\x44T_DICT\x10!\x12\x0b\n\x07\x44T_NONE\x10\"\x12\x0f\n\x0b\x44T_SYM_INST\x10#\x12\x0f\n\x0b\x44T_BASE_INT\x10$\x12\x10\n\x0c\x44T_BASE_UINT\x10%\x12\x11\n\rDT_BASE_FLOAT\x10&\x12\x0b\n\x07\x44T_TYPE\x10\'\x12\n\n\x06\x44T_ANY\x10(\x12\r\n\tDT_REFKEY\x10)\x12\n\n\x06\x44T_REF\x10*\x12\x10\n\x0c\x44T_COMPLEX64\x10+\x12\x11\n\rDT_COMPLEX128\x10,\x12\x13\n\x0f\x44T_BASE_COMPLEX\x10-\x12\x0f\n\x0b\x44T_BFLOAT16\x10.\x12\x10\n\x0c\x44T_BFLOATS16\x10/\x12\x0b\n\x07\x44T_INT4\x10\x30'
 )
 
 _VERSION = _descriptor.EnumDescriptor(
@@ -301,16 +301,11 @@ _DATATYPE = _descriptor.EnumDescriptor(
       serialized_options=None,
       type=None,
       create_key=_descriptor._internal_create_key),
-    _descriptor.EnumValueDescriptor(
-      name='DT_SLICE', index=49, number=49,
-      serialized_options=None,
-      type=None,
-      create_key=_descriptor._internal_create_key),
   ],
   containing_type=None,
   serialized_options=None,
   serialized_start=2650,
-  serialized_end=3427,
+  serialized_end=3413,
 )
 _sym_db.RegisterEnumDescriptor(_DATATYPE)
 
@@ -366,7 +361,6 @@ DT_BASE_COMPLEX = 45
 DT_BFLOAT16 = 46
 DT_BFLOATS16 = 47
 DT_INT4 = 48
-DT_SLICE = 49
 
 
 _INPUTPROTO_EDGETYPE = _descriptor.EnumDescriptor(

mindspore/train/callback/__init__.py

@@ -35,10 +35,7 @@ from mindspore.train.callback._early_stop import EarlyStopping
 from mindspore.train.callback._reduce_lr_on_plateau import ReduceLROnPlateau
 from mindspore.train.callback._on_request_exit import OnRequestExit
 from mindspore.train.callback._backup_and_restore import BackupAndRestore
-from mindspore.train.callback._flops_collector import FlopsUtilizationCollector
-from mindspore.train.callback._mindio_ttp import MindIOTTPAdapter
 
-__all__ = ["Callback", "LossMonitor", "TimeMonitor", "ModelCheckpoint", "FlopsUtilizationCollector",
+__all__ = ["Callback", "LossMonitor", "TimeMonitor", "ModelCheckpoint",
            "SummaryCollector", "CheckpointConfig", "RunContext", "LearningRateScheduler", "SummaryLandscape",
-           "History", "LambdaCallback", "ReduceLROnPlateau", "EarlyStopping", "OnRequestExit", "BackupAndRestore",
-           "MindIOTTPAdapter"]
+           "History", "LambdaCallback", "ReduceLROnPlateau", "EarlyStopping", "OnRequestExit", "BackupAndRestore"]

mindspore/train/callback/_backup_and_restore.py

@@ -34,10 +34,10 @@ class BackupAndRestore(Callback):
 
     Args:
         backup_dir (str): Path to store and load the checkpoint file.
-        save_freq (Union["epoch", int]): When set to ``"epoch"`` the callback saves the checkpoint at the end of
+        save_freq(Union["epoch", int]): When set to ``"epoch"`` the callback saves the checkpoint at the end of
                                         each epoch. When set to an integer, the callback saves the checkpoint
                                         every `save_freq` epoch. Default: ``"epoch"`` .
-        delete_checkpoint (bool): If `delete_checkpoint=True`, the checkpoint will be deleted after
+        delete_checkpoint(bool): If `delete_checkpoint=True`, the checkpoint will be deleted after
                                         training is finished. Default: ``True`` .
 
     Raises:

mindspore/train/callback/_checkpoint.py

@@ -28,15 +28,9 @@ from mindspore.train._utils import _make_directory
 from mindspore.train.serialization import save_checkpoint, _save_graph
 from mindspore.parallel._cell_wrapper import destroy_allgather_cell
 from mindspore.parallel._recovery_context import _set_recovery_context, _get_recovery_context
-from mindspore.parallel._auto_parallel_context import _get_auto_parallel_context
-from mindspore.parallel._utils import _get_device_num
-from mindspore.communication.management import get_rank
-from mindspore.train._utils import get_parameter_redundancy, remove_param_redundancy
 from mindspore.train.callback._callback import Callback, set_cur_net
 from mindspore.common.tensor import Tensor
 from mindspore.common.parameter import Parameter
-from mindspore.common.generator import Generator
-from mindspore.common.api import _cell_graph_executor
 from mindspore._c_expression import _collect_host_info
 
 
@@ -45,29 +39,6 @@ SAVE_DIR = _cur_dir
 _info_list = ["epoch_num", "step_num"]
 
 
-def _get_dp_tp_from_redundancy(redundancy_tuple):
-    """From redundancy get dp and tp"""
-    dp = []
-    tp = []
-    for dp_value in redundancy_tuple:
-        dp.append(list(dp_value))
-    for i in range(len(redundancy_tuple[0])):
-        tp.append([v[i] for v in redundancy_tuple])
-    return dp, tp
-
-
-def _get_dp_tp_from_layout(parameter_redundancy_dict):
-    """From layout dict get dp and tp"""
-    tp = []
-    dp = []
-    value_len = 0
-    for _, value in parameter_redundancy_dict.items():
-        if len(value) > value_len:
-            value_len = len(value)
-            dp, tp = _get_dp_tp_from_redundancy(value)
-    return dp, tp
-
-
 def _chg_ckpt_file_name_if_same_exist(directory, prefix, exception=False):
     """Check if there is a file with the same name."""
     if callable(prefix) or callable(directory):
@@ -103,15 +74,14 @@ class CheckpointConfig:
     The configuration of model checkpoint.
 
     Note:
-        - During the training process, if dataset is transmitted through the data channel,
-          it is suggested to set 'save_checkpoint_steps' to an integer multiple of loop_size.
-          Otherwise, the time to save the checkpoint may be biased.
-          It is recommended to set only one save strategy and one keep strategy at the same time.
-          If both `save_checkpoint_steps` and `save_checkpoint_seconds` are set,
-          `save_checkpoint_seconds` will be invalid.
-          If both `keep_checkpoint_max` and `keep_checkpoint_per_n_minutes` are set,
-          `keep_checkpoint_per_n_minutes` will be invalid.
-        - The `enc_mode` and `crc_check` parameters are mutually exclusive and cannot be configured simultaneously.
+        During the training process, if dataset is transmitted through the data channel,
+        it is suggested to set 'save_checkpoint_steps' to an integer multiple of loop_size.
+        Otherwise, the time to save the checkpoint may be biased.
+        It is recommended to set only one save strategy and one keep strategy at the same time.
+        If both `save_checkpoint_steps` and `save_checkpoint_seconds` are set,
+        `save_checkpoint_seconds` will be invalid.
+        If both `keep_checkpoint_max` and `keep_checkpoint_per_n_minutes` are set,
+        `keep_checkpoint_per_n_minutes` will be invalid.
 
     Args:
         save_checkpoint_steps (int): Steps to save checkpoint. Default: ``1`` .
@@ -134,8 +104,6 @@ class CheckpointConfig:
         enc_mode (str): This parameter is valid only when enc_key is not set to None. Specifies the encryption
                         mode, currently supports 'AES-GCM', 'AES-CBC' and 'SM4-CBC'. Default: ``'AES-GCM'`` .
         exception_save (bool): Whether to save the current checkpoint when an exception occurs. Default: ``False`` .
-        crc_check (bool): Whether to perform crc32 calculation when saving checkpoint and save the calculation
-                          result to the end of ckpt. Default: ``False`` .
         kwargs (dict): Configuration options dictionary.
 
     Raises:
@@ -158,9 +126,11 @@ class CheckpointConfig:
         >>> config.save_checkpoint_steps
         1
         >>> config.save_checkpoint_seconds
+        100
         >>> config.keep_checkpoint_max
         5
         >>> config.keep_checkpoint_per_n_minutes
+        5
         >>> config.integrated_save
         True
         >>> config.async_save
@@ -187,7 +157,6 @@ class CheckpointConfig:
                  enc_key=None,
                  enc_mode='AES-GCM',
                  exception_save=False,
-                 crc_check=False,
                  **kwargs):
 
         if save_checkpoint_steps is not None:
@@ -230,9 +199,7 @@ class CheckpointConfig:
         self._append_dict = self._handle_append_info(append_info)
         self._enc_key = Validator.check_isinstance('enc_key', enc_key, (type(None), bytes))
         self._enc_mode = Validator.check_isinstance('enc_mode', enc_mode, str)
-        self._crc_check = Validator.check_isinstance('crc_check', crc_check, bool)
         self._map_param_inc = kwargs.get('incremental', False)
-        self.enable_redundance = kwargs.get('enable_redundance', False)
 
     @property
     def save_checkpoint_steps(self):
@@ -323,16 +290,6 @@ class CheckpointConfig:
         """
         return self._enc_mode
 
-    @property
-    def crc_check(self):
-        """
-        Get the value of the whether to enable crc check.
-
-        Returns:
-            bool, whether to enable crc check.
-        """
-        return self._crc_check
-
     @property
     def append_dict(self):
         """
@@ -398,8 +355,7 @@ class CheckpointConfig:
                     raise TypeError(f"For 'CheckpointConfig', the element of 'append_info' must has only one dict, "
                                     "but got {dict_num}")
                 for key, value in element.items():
-                    if isinstance(key, str) and isinstance(value,
-                                                           (int, float, bool, str, Parameter, Tensor, Generator)):
+                    if isinstance(key, str) and isinstance(value, (int, float, bool, str, Parameter, Tensor)):
                         handle_append_info[key] = value
                     else:
                         raise TypeError(f"For 'CheckpointConfig', the key type of the dict 'append_info' "
@@ -492,13 +448,8 @@ class ModelCheckpoint(Callback):
                                 "but got {}.".format(type(config)))
             self._config = config
 
-        self._aiturbo_init_flag = os.getenv("AITURBO") == "1"
         # get existing checkpoint files
-        if self._aiturbo_init_flag:
-            import aiturbo
-            self._manager = aiturbo.CheckpointShmManager()
-        else:
-            self._manager = CheckpointManager()
+        self._manager = CheckpointManager()
         if not callable(directory) and not callable(prefix):
             self._prefix = _chg_ckpt_file_name_if_same_exist(self._directory, self._prefix)
         self._append_dict = self._config.append_dict or {}
@@ -516,28 +467,6 @@ class ModelCheckpoint(Callback):
             run_context (RunContext): Context of the train running.
         """
         cb_params = run_context.original_args()
-        if self._aiturbo_init_flag:
-            import aiturbo
-            ckpt_storage_path = self._directory
-            rank_id = get_rank()
-            stage_num = _get_auto_parallel_context("pipeline_stages")
-            stage_rank_num = _get_device_num() // stage_num
-            param_layout = cb_params.train_network.parameter_layout_dict
-            if not param_layout:
-                layout = {"stage_num": stage_num, "stage_rank_num": stage_rank_num, "stage_layout": None}
-                aiturbo.init(ckpt_storage_path, rank_id, layout, None, False, None)
-            else:
-                device_num = _get_device_num()
-                chunk_size = device_num // stage_num
-                initial_rank = (rank_id // chunk_size) * chunk_size
-                param_redundancy_dict = get_parameter_redundancy(param_layout, initial_rank)
-                dp, _ = _get_dp_tp_from_layout(param_redundancy_dict)
-                layout = {"stage_num": stage_num, "stage_rank_num": stage_rank_num,
-                          "stage_layout": param_redundancy_dict}
-                single_params = remove_param_redundancy(param_redundancy_dict)
-                single_params = {device_id: list(params) for device_id, params in single_params.items()}
-                aiturbo.init(ckpt_storage_path, rank_id, layout, single_params, self._config.enable_redundance, dp)
-            self._aiturbo_init_flag = False
         if self._prefix_func:
             self._prefix = self._prefix_func(cb_params)
             if not isinstance(self._prefix, str) or self._prefix.find('/') >= 0:
@@ -642,22 +571,15 @@ class ModelCheckpoint(Callback):
             if context.get_context("enable_ge") and os.getenv('MS_DISABLE_REF_MODE') \
                     and context.get_context("mode") == context.GRAPH_MODE:
                 set_cur_net(cb_params.train_network)
-                cb_params.train_network.add_flags(ge_sync_data=True)
-                _cell_graph_executor(cb_params.train_network, phase='save')
+                cb_params.train_network.exec_checkpoint_graph()
             if "epoch_num" in self._append_dict:
                 self._append_dict["epoch_num"] = self._append_epoch_num + cb_params.cur_epoch_num
             if "step_num" in self._append_dict:
                 self._append_dict["step_num"] = self._append_step_num + cb_params.cur_step_num
             network = self._config.saved_network if self._config.saved_network is not None else cb_params.train_network
-            if os.getenv("AITURBO") == "1":
-                save_checkpoint(network, cur_file, self._config.integrated_save, self._config.async_save,
-                                self._append_dict, self._config.enc_key, self._config.enc_mode,
-                                crc_check=self._config.crc_check, incremental=self._map_param_inc,
-                                global_step_num=cb_params.cur_step_num)
-            else:
-                save_checkpoint(network, cur_file, self._config.integrated_save, self._config.async_save,
-                                self._append_dict, self._config.enc_key, self._config.enc_mode,
-                                crc_check=self._config.crc_check, incremental=self._map_param_inc)
+            save_checkpoint(network, cur_file, self._config.integrated_save, self._config.async_save,
+                            self._append_dict, self._config.enc_key, self._config.enc_mode,
+                            incremental=self._map_param_inc)
 
             self._latest_ckpt_file_name = cur_file
 
@@ -677,16 +599,6 @@ class ModelCheckpoint(Callback):
         """Return the latest checkpoint path and file name."""
         return self._latest_ckpt_file_name
 
-    @property
-    def _get_save_checkpoint_steps(self):
-        """Return save ckpt steps"""
-        return self._config.save_checkpoint_steps
-
-    @property
-    def _get_last_trigger_step(self):
-        """Return last triggered steps"""
-        return self._last_triggered_step
-
 
 class CheckpointManager:
     """Manage checkpoint files according to train_config of checkpoint."""

mindspore/train/callback/_landscape.py

@@ -66,7 +66,7 @@ def nptype_to_prototype(np_value):
         np.uint32: 'DT_UINT32',
         np.uint64: 'DT_UINT64',
         np.float16: 'DT_FLOAT16',
-        np.float_: 'DT_FLOAT64',
+        np.float: 'DT_FLOAT64',
         np.float32: 'DT_FLOAT32',
         np.float64: 'DT_FLOAT64',
         None: 'DT_UNDEFINED'

mindspore/train/callback/_time_monitor.py

@@ -30,7 +30,7 @@ class TimeMonitor(Callback):
             if the program get `batch_num` during training, `data_size` will be set to `batch_num`,
             otherwise `data_size` will be used. Default: ``None`` .
 
-        data_time (bool): Whether to show the average time of fetching data in Host.
+        data_time (bool): Whether to sow the average time of fetching data in Host.
             Note that data fetch and network compute are processed sequentially in non dataset sink mode, while
             they are asynchronous in dataset sink mode. Default: ``False`` .
 

mindspore/train/data_sink.py

@@ -130,11 +130,10 @@ def data_sink(fn, dataset, sink_size=1, jit_config=None, input_signature=None):
     A wrapper function to generate a function for the input function.
 
     Note:
-        When using data sinking, the dataset will be automatically looped to the device. The device side can cache up
-        to 100 batches of data and occupy no more than 2GB of memory. At this time, only the number of steps for each
-        sinking `sink_size` needs to be considered. `sink_size` defaults to ``1``, indicating that each epoch only
-        takes one batch of data from the cache for training and outputs a loss. If `sink_size` is greater than 1, each
-        epoch takes out `sink_size` batches of data from the cache for training and outputs a loss.
+        When using data sinking, the dataset will be automatically sent in a loop, and only the step size of sinking
+        `sink_size` needs to be considered. The default value of `sink_size` is ``1``, which means that all data will
+        be sunk every epoch. If `sink_size` is greater than 1, the amount of data sunk per epoch will be the dataset
+        with a size of `sink_size`.
 
     Args:
         fn (Function): The Python function that will be run with dataset.

mindspore/train/dataset_helper.py

@@ -16,13 +16,12 @@
 from __future__ import absolute_import
 
 import math
-import copy
 
 from mindspore import _checkparam as Validator
 from mindspore import log as logger
 from mindspore.common._auto_dynamic import is_auto_dynamic, convert_new_shapes
 from mindspore.common.dtype import pytype_to_dtype
-from mindspore.common.api import _cell_graph_executor, _is_args_fullmode, ARG_SPECIFIED
+from mindspore.common.api import _cell_graph_executor
 from mindspore.common._utils import is_shape_unknown
 from mindspore.dataset.engine import offload
 from mindspore import context, nn
@@ -98,19 +97,10 @@ class _DataWrapper(nn.Cell):
         self.get_next = P.GetNext(
             dataset_types, dataset_shapes, len(dataset_types), queue_name)
         if network.get_inputs() is not None:
-            network_inputs = network.get_inputs()
-            is_fullmode = _is_args_fullmode(network_inputs, False)
-            if is_fullmode:
-                symbol_inputs = [getattr(inp, "symbolic_shape", None) for inp in network.get_inputs()]
-            else:
-                symbol_inputs = [None for _ in dataset_shapes]
-                arg_specified = network_inputs.get(ARG_SPECIFIED, [])
-                for idx, inp in arg_specified:
-                    symbol_inputs[idx] = getattr(inp, "symbolic_shape", None)
-            symbols_for_parallel = _change_symbols_for_parallel(dataset_shapes, copy.deepcopy(symbol_inputs))
-            if any((s is not None for s in symbols_for_parallel)):
+            symbol_inputs = [getattr(inp, "symbolic_shape", None) for inp in network.get_inputs()]
+            symbol_inputs = _change_symbols_for_parallel(dataset_shapes, symbol_inputs)
+            if any((s is not None for s in symbol_inputs)):
                 self.get_next.add_prim_attr("symbols", symbol_inputs)
-                self.get_next.add_prim_attr("symbols_for_parallel", symbols_for_parallel)
         self.network = network
         self._get_attr_from_cell(network)
 
@@ -165,13 +155,6 @@ def _check_inputs(network_shapes, dataset_shapes, dataset_types):
     """
     Check if set inputs are correct.
     """
-    if not _is_args_fullmode(network_shapes, False):
-        temp_network_shapes = [None for _ in dataset_shapes]
-        arg_specified = network_shapes.get(ARG_SPECIFIED, [])
-        for idx, inp in arg_specified:
-            temp_network_shapes[idx] = inp
-        network_shapes = temp_network_shapes
-
     for tensor_index, ele_dataset_shape in enumerate(dataset_shapes):
         if network_shapes[tensor_index] is None:
             continue
@@ -263,32 +246,27 @@ def connect_network_with_dataset(network, dataset_helper):
     queue_name = dataset.__transfer_dataset__.queue_name
     if _dynamic_sink_scenario(dataset, dataset_iter, is_dynamic):
         dataset_types, dataset_shapes = dataset_helper.get_data_info()
-        # Need to do full_batch for shapes which also do in the _DatasetIterMSLoopSink
-        if _need_to_full():
-            dataset_shapes = _to_full_shapes(dataset_shapes, _get_device_num() // _get_pipeline_stages())
         dataset_types = [pytype_to_dtype(x) for x in dataset_types]
         if not is_dynamic:
             dataset_shapes = _auto_dynamic_shape.auto_dynamic_generate_compile_args(dataset_shapes, True)
         key = str(dataset_types) + str(dataset_shapes)
-
-        if hasattr(aux, "__shape_type__") and aux.__shape_type__ != key:
-            _auto_dynamic_shape.update_phase_and_compile_args(dataset_shapes, key, True, aux)
-            if hasattr(aux, '__network_manage__') and key in aux.__network_manage__:
-                network = aux.__network_manage__[key]
+        _auto_dynamic_shape.update_phase_and_compile_args(dataset_shapes, key, True, aux)
+        if hasattr(aux, '__network_manage__') and key in aux.__network_manage__:
+            network = aux.__network_manage__[key]
+        else:
+            if _need_to_full():
+                device_num = _get_device_num() // _get_pipeline_stages()
+                dataset_shapes = _to_full_shapes(dataset_shapes, device_num)
+
+            network = _generate_dataset_sink_mode_net(
+                network, dataset_shapes, dataset_types, queue_name)
+            if hasattr(aux, '__network_manage__'):
+                aux.__network_manage__ = aux.__network_manage__
             else:
-                if _need_to_full():
-                    device_num = _get_device_num() // _get_pipeline_stages()
-                    dataset_shapes = _to_full_shapes(dataset_shapes, device_num)
-
-                network = _generate_dataset_sink_mode_net(
-                    network, dataset_shapes, dataset_types, queue_name)
-                if hasattr(aux, '__network_manage__'):
-                    aux.__network_manage__ = aux.__network_manage__
-                else:
-                    aux.__network_manage__ = dict()
-                aux.__network_manage__[key] = network
-            network.add_flags(sink_mode=True)
-            return network
+                aux.__network_manage__ = dict()
+            aux.__network_manage__[key] = network
+        network.add_flags(sink_mode=True)
+        return network
 
     if hasattr(aux, '__sink_network__'):
         network = aux.__sink_network__
@@ -299,8 +277,6 @@ def connect_network_with_dataset(network, dataset_helper):
             network = _generate_network_with_dataset(
                 network, dataset_helper, queue_name)
             aux.__sink_network__ = network
-            dataset_types, dataset_shapes = dataset_helper.types_shapes()
-            aux.__shape_type__ = str(dataset_types) + str(dataset_shapes)
 
     if _dynamic_sink_data(dataset, dataset_iter) and _dynamic_sink_exception_scenario(dataset_iter, is_dynamic):
         dataset_helper.get_data_info()
@@ -496,7 +472,6 @@ class DatasetHelper:
             '''
             Inner class for parsing send info.
             '''
-
             def __init__(self, send_info, run_context):
                 self.info_ = {}
                 self.sink_size = run_context.original_args()["batch_num"]