Publishing 2019 R1 content

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

diff --git a/inference-engine/thirdparty/mkl-dnn/tests/gtests/test_convolution_relu_forward_f32.cpp b/inference-engine/thirdparty/mkl-dnn/src/cpu/cpu_primitive.cpp
similarity index 60%
rename from inference-engine/thirdparty/mkl-dnn/tests/gtests/test_convolution_relu_forward_f32.cpp
rename to inference-engine/thirdparty/mkl-dnn/src/cpu/cpu_primitive.cpp
index 92e447c..80e06e7 100644 (file)
--- a/inference-engine/thirdparty/mkl-dnn/tests/gtests/test_convolution_relu_forward_f32.cpp
+++ b/inference-engine/thirdparty/mkl-dnn/src/cpu/cpu_primitive.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2016-2018 Intel Corporation
+* Copyright 2018 Intel Corporation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,27 +14,20 @@
 * limitations under the License.
 *******************************************************************************/
 
-#include "mkldnn_test_common.hpp"
-#include "gtest/gtest.h"
+#include "cpu_primitive.hpp"
+#include "cpu_memory.hpp"
 
-#include "mkldnn.hpp"
-#include "test_convolution_relu_forward_common.hpp"
 namespace mkldnn {
+namespace impl {
+namespace cpu {
 
-using convolution_test = convolution_relu_test<float, float, float, float>;
-
-TEST_P(convolution_test, TestConvolution)
+const cpu_memory_t *cpu_primitive_t::output_memory_primitive(size_t index) const
 {
+    return static_cast<const cpu_memory_t *>(outputs()[index]);
 }
 
-#define FP32
-#define DIRECTION_FORWARD
-#include "convolution_common.h"
-
-#undef ELTWISE_ALPHA
-#define ELTWISE_ALPHA 0.2f
 
-#undef ELTWISE_BETA
-#define ELTWISE_BETA 0.0f
-#include "convolution_common.h"
 }
+}
+}
+