Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Fix backward_clip num inputs and type of clip params #15688

Merged
merged 6 commits into from
Aug 9, 2019
Merged

Fix backward_clip num inputs and type of clip params #15688

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2da17c6
Fix backward_clip num inputs and type of clip params
ptrendx Jul 26, 2019
0f452ae
Clip test
ptrendx Aug 2, 2019
87b410e
Trigger CI
ptrendx Aug 5, 2019
2a935df
Changes to clip docs
ptrendx Aug 6, 2019
64eed65
Fix docstring
ptrendx Aug 6, 2019
69c1606
Trigger CI
ptrendx Aug 7, 2019
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
8 changes: 4 additions & 4 deletions src/operator/tensor/matrix_op-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,7 +1457,7 @@ struct ClipParam : public dmlc::Parameter<ClipParam> {
struct clip {
template<typename DType>
MSHADOW_XINLINE static void Map(index_t i, DType* out, const DType* datas,
DType a_min, DType a_max) {
const float a_min, const float a_max) {
DType data = datas[i];
if (data > a_max) {
out[i] = a_max;
Expand All @@ -1473,7 +1473,7 @@ struct clip {
struct clip_grad {
template<typename DType>
MSHADOW_XINLINE static void Map(index_t i, DType* out, const DType* grad, const DType* datas,
DType a_min, DType a_max) {
const float a_min, const float a_max) {
DType data = datas[i];
if (data > a_max) {
out[i] = 0;
Expand All @@ -1500,7 +1500,7 @@ void Clip(const nnvm::NodeAttrs& attrs,
MSHADOW_TYPE_SWITCH(outputs[0].type_flag_, DType, {
mxnet_op::Kernel<mxnet::op::clip, xpu>::Launch(s, outputs[0].Size(), outputs[0].dptr<DType>(),
inputs[0].dptr<DType>(),
DType(param.a_min), DType(param.a_max));
param.a_min, param.a_max);
});
}

Expand Down Expand Up @@ -1529,7 +1529,7 @@ void ClipGrad_(const nnvm::NodeAttrs& attrs,
Stream<xpu> *s = ctx.get_stream<xpu>();
MSHADOW_TYPE_SWITCH(outputs[0].type_flag_, DType, {
Kernel<clip_grad, xpu>::Launch(s, outputs[0].Size(), outputs[0].dptr<DType>(),
inputs[0].dptr<DType>(), inputs[1].dptr<DType>(), DType(param.a_min), DType(param.a_max));
inputs[0].dptr<DType>(), inputs[1].dptr<DType>(), param.a_min, param.a_max);
});
}

Expand Down
2 changes: 1 addition & 1 deletion src/operator/tensor/matrix_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ parameter values:
.add_arguments(ClipParam::__FIELDS__());

NNVM_REGISTER_OP(_backward_clip)
.set_num_inputs(1)
.set_num_inputs(2)
DickJC123 marked this conversation as resolved.
Show resolved Hide resolved
.set_num_outputs(1)
.set_attr_parser(ParamParser<ClipParam>)
.set_attr<nnvm::TIsBackward>("TIsBackward", true)
Expand Down