Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions tests/modeling_test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from ml_dtypes import bfloat16

import mindspore as ms
from mindspore import mint, nn, ops
from mindspore import nn, ops

logger = logging.getLogger("ModelingsUnitTest")

Expand Down Expand Up @@ -124,10 +124,10 @@ def get_pt2ms_mappings(m):
mappings[f"{name}.running_mean"] = f"{name}.moving_mean", lambda x: x
mappings[f"{name}.running_var"] = f"{name}.moving_variance", lambda x: x
mappings[f"{name}.num_batches_tracked"] = None, lambda x: x
elif isinstance(cell, (mint.nn.BatchNorm1d, mint.nn.BatchNorm2d, mint.nn.BatchNorm3d)):
# TODO: for mint.nn, the dtype for each param should expected to be same among torch and mindspore
# this is a temporary fix, delete this branch in future.
mappings[f"{name}.num_batches_tracked"] = f"{name}.num_batches_tracked", lambda x: x.to(ms.float32)
# num_batches_tracked is int64 in ms2.6
# elif isinstance(cell, (mint.nn.BatchNorm1d, mint.nn.BatchNorm2d, mint.nn.BatchNorm3d)):
# # this is a temporary fix, delete this branch in future.
# mappings[f"{name}.num_batches_tracked"] = f"{name}.num_batches_tracked", lambda x: x.to(ms.float32)
return mappings


Expand All @@ -143,8 +143,9 @@ def convert_state_dict(m, state_dict_pt):
state_dict_ms = {}
for name_pt, data_pt in state_dict_pt.items():
name_ms, data_mapping = mappings.get(name_pt, (name_pt, lambda x: x))
# data_pt can be int
data_ms = ms.Parameter(
data_mapping(ms.Tensor.from_numpy(data_pt.float().numpy()).to(dtype_mappings[data_pt.dtype])), name=name_ms
data_mapping(ms.Tensor.from_numpy(data_pt.numpy()).to(dtype_mappings[data_pt.dtype])), name=name_ms
)
if name_ms is not None:
state_dict_ms[name_ms] = data_ms
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from tests.transformers_tests.models.modeling_common import ids_numpy, random_attention_mask

DTYPE_AND_THRESHOLDS = {"fp32": 1e-3, "fp16": 1e-2, "bf16": 1e-2}
MODES = [0, 1]
MODES = [0]

logging.basicConfig(level=logging.INFO)
logger = logging.getLogger(__name__)
Expand Down