Publishing 2019 R1 content

[platform/upstream/dldt.git] / inference-engine / thirdparty / mkl-dnn / src / cpu / nchw_pooling.hpp

diff --git a/inference-engine/thirdparty/mkl-dnn/src/cpu/nchw_pooling.hpp b/inference-engine/thirdparty/mkl-dnn/src/cpu/nchw_pooling.hpp
index 951ef50..0e57565 100644 (file)
--- a/inference-engine/thirdparty/mkl-dnn/src/cpu/nchw_pooling.hpp
+++ b/inference-engine/thirdparty/mkl-dnn/src/cpu/nchw_pooling.hpp
@@ -72,19 +72,19 @@ struct nchw_pooling_fwd_t: public cpu_primitive_t {
         }
     };
 
-    nchw_pooling_fwd_t(const pd_t *pd, const input_vector &inputs,
+    nchw_pooling_fwd_t(const pd_t *apd, const input_vector &inputs,
             const output_vector &outputs)
-        : cpu_primitive_t(&conf_, inputs, outputs), conf_(*pd) {}
+        : cpu_primitive_t(apd, inputs, outputs) {}
     typedef typename prec_traits<data_type>::type data_t;
 
-    virtual void execute(event_t *e) {
+    virtual void execute(event_t *e) const {
         execute_forward();
         e->set_state(event_t::ready);
     }
 
 private:
-    void execute_forward();
-    pd_t conf_;
+    void execute_forward() const;
+    const pd_t *pd() const { return (const pd_t *)primitive_t::pd(); }
 };
 
 template <impl::data_type_t data_type>
@@ -133,19 +133,19 @@ struct nchw_pooling_bwd_t: public cpu_primitive_t {
         }
     };
 
-    nchw_pooling_bwd_t(const pd_t *pd, const input_vector &inputs,
+    nchw_pooling_bwd_t(const pd_t *apd, const input_vector &inputs,
             const output_vector &outputs)
-        : cpu_primitive_t(&conf_, inputs, outputs), conf_(*pd) {}
+        : cpu_primitive_t(apd, inputs, outputs) {}
     typedef typename prec_traits<data_type>::type data_t;
 
-    virtual void execute(event_t *e) {
+    virtual void execute(event_t *e) const {
         execute_backward();
         e->set_state(event_t::ready);
     }
 
 private:
-    void execute_backward();
-    pd_t conf_;
+    void execute_backward() const;
+    const pd_t *pd() const { return (const pd_t *)primitive_t::pd(); }
 };
 
 }