TaoLv commented on a change in pull request #14604: [MKLDNN]Add quantized relu
URL: https://github.com/apache/incubator-mxnet/pull/14604#discussion_r274898706
##########
File path: src/operator/nn/mkldnn/mkldnn_act.cc
##########
@@ -74,75 +74,51 @@ static inline mkldnn::algorithm GetMKLDNNActAlgo(const
ActivationParam& param) {
}
}
-typedef std::shared_ptr<mkldnn::eltwise_forward::primitive_desc>
mkldnn_act_pdesc_ptr;
-
-static mkldnn::eltwise_forward::primitive_desc GetActFwdDescImpl(
+mkldnn::eltwise_forward::primitive_desc GetActFwdDescImpl(
const ActivationParam& param, bool is_train,
const mkldnn::memory &input_mem, int dtype) {
mkldnn::memory::primitive_desc data_mpd = input_mem.get_primitive_desc();
mkldnn::memory::desc data_md = data_mpd.desc();
auto cpu_engine = data_mpd.get_engine();
auto alg = GetMKLDNNActAlgo(param);
- MSHADOW_REAL_TYPE_SWITCH(dtype, DType, {
- DType alpha = 0;
- mkldnn::eltwise_forward::desc desc = is_train
- ? mkldnn::eltwise_forward::desc(mkldnn::prop_kind::forward_training,
- alg, data_md, alpha)
- : mkldnn::eltwise_forward::desc(mkldnn::prop_kind::forward_scoring,
- alg, data_md, alpha);
- return mkldnn::eltwise_forward::primitive_desc(desc, cpu_engine);
- });
- LOG(FATAL) << "Unsupported data type for MKLDNN activation";
- mkldnn::eltwise_forward::desc desc = mkldnn::eltwise_forward::desc(
- mkldnn::prop_kind::forward_training, alg, data_md, 0.0);
+
+ mkldnn::eltwise_forward::desc desc = is_train
+ ? mkldnn::eltwise_forward::desc(mkldnn::prop_kind::forward_training,
+ alg, data_md, 0.0f)
+ : mkldnn::eltwise_forward::desc(mkldnn::prop_kind::forward_scoring,
+ alg, data_md, 0.0f);
return mkldnn::eltwise_forward::primitive_desc(desc, cpu_engine);
}
-typedef ParamOpSign<ActivationParam> MKLDNNActSignature;
-
-class MKLDNNActForward {
- std::shared_ptr<mkldnn::eltwise_forward> fwd;
- std::shared_ptr<mkldnn::memory> data;
- std::shared_ptr<mkldnn::memory> out;
-
- public:
- const mkldnn::eltwise_forward::primitive_desc fwd_pd;
-
- MKLDNNActForward(const ActivationParam& param, bool is_train,
- const NDArray &data, const mkldnn::memory &mem): fwd_pd(
- GetActFwdDescImpl(param, is_train, mem, data.dtype())) {
- }
-
- void SetNewMem(const mkldnn::memory &data, const mkldnn::memory &output) {
- if (this->data == nullptr)
- this->data = std::shared_ptr<mkldnn::memory>(new mkldnn::memory(
- data.get_primitive_desc(), data.get_data_handle()));
- else
- this->data->set_data_handle(data.get_data_handle());
-
- CHECK(fwd_pd.dst_primitive_desc() == output.get_primitive_desc());
- if (this->out == nullptr)
- this->out = std::shared_ptr<mkldnn::memory>(new mkldnn::memory(
- fwd_pd.dst_primitive_desc(), output.get_data_handle()));
- else
- this->out->set_data_handle(output.get_data_handle());
-
- if (this->fwd == nullptr) {
- this->fwd = std::shared_ptr<mkldnn::eltwise_forward>(
- new mkldnn::eltwise_forward(fwd_pd,
mkldnn::primitive::at(*this->data),
- *this->out));
- }
+void MKLDNNActForward::SetNewMem(const mkldnn::memory &data, const
mkldnn::memory &output) {
+ if (this->data_ == nullptr)
+ this->data_ = std::shared_ptr<mkldnn::memory>(new mkldnn::memory(
+ data.get_primitive_desc(), data.get_data_handle()));
Review comment:
Try to use make_shared:
```cpp
this->data_ = std::make_shared<mkldnn::memory>(data.get_primitive_desc(),
data.get_data_handle());
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
