Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dian xt ms #29

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
modify
  • Loading branch information
AmiyaSX committed Feb 15, 2023
commit b1dc8d866bcc2cc415180915fac7654d60cc1d87
9 changes: 7 additions & 2 deletions xt/model/dqn/dqn_mlp_ms.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from xt.model.model_ms import XTModel_MS
from zeus.common.util.common import import_config
from zeus.common.util.register import Registers
from xt.model.ms_compat import Dense, Adam, MSELoss, Cell, Model, ms
from xt.model.ms_compat import Dense, Adam, MSELoss, Cell, Model, DynamicLossScaleUpdateCell, ms
import mindspore.ops as ops
from xt.model.ms_utils import MSVariables
from xt.model.dqn.dqn_cnn_ms import MyTrainOneStepCell
Expand All @@ -47,7 +47,12 @@ def create_model(self, model_info):
adam = Adam(params=self.net.trainable_params(), learning_rate=self.learning_rate)
# model = Model(self.net, loss_fn=loss, optimizer=adam)
loss_net = ms.nn.WithLossCell(self.net, loss_fn)
model = MyTrainOneStepCell(loss_net, adam, scale_sense=1, grad_clip=True)
device_target = ms.get_context("device_target")
if device_target == 'Ascend':
manager = DynamicLossScaleUpdateCell(loss_scale_value=2 ** 12, scale_factor=2, scale_window=1000)
model = MyTrainOneStepCell(loss_net, adam, manager, grad_clip=True, clipnorm=10.)
else:
model = MyTrainOneStepCell(loss_net, adam, grad_clip=True, clipnorm=10.)
self.actor_var = MSVariables(self.net)
return model

Expand Down
6 changes: 2 additions & 4 deletions xt/model/model_ms.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,13 @@ def predict(self, state):
:param state:
:return: output tensor ref to policy.model
"""
state = ms.Tensor(state)
return self.model.predict(state).asnumpy()
return self.model.predict(state)

def train(self, state, label):
"""Train the model."""
state = ms.Tensor(state, dtype=ms.float32)
label = ms.Tensor(label, dtype=ms.float32)
loss = self.model.network(state, label)
self.actor_var = MSVariables(self.model.network)
loss = self.model(state, label)
return loss.asnumpy().item()

def set_weights(self, weights):
Expand Down
6 changes: 0 additions & 6 deletions xt/model/ms_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@ def import_ms_compact():
from mindspore.ops import Cast, MultitypeFuncGraph, ReduceSum, ReduceMax, ReduceMean
from mindspore import History

def loss_to_val(loss):
"""Make keras instance into value."""
if isinstance(loss, History):
loss = loss.history.get("loss")[0]
return loss


DTYPE_MAP = {
"float32": ms.float32,
Expand Down