From 613d8224582fbf7a41dbd5637c9deadfe65cd695 Mon Sep 17 00:00:00 2001
From: Roman Lyamin <Roman.Lyamin@intel.com>
Date: Tue, 21 Jul 2020 15:11:05 +0300
Subject: [PATCH] [IE TESTS] Added single layer test Mish (#1401)

---
 .../shared_tests_instances/single_layer_tests/activation.cpp   | 1 +
 .../plugin/cpu/shared_tests_instances/skip_tests_config.cpp    | 2 ++
 .../shared_tests_instances/single_layer_tests/activation.cpp   | 3 ++-
 .../plugin/shared/include/single_layer_tests/activation.hpp    | 1 +
 .../include/ngraph_functions/utils/ngraph_helpers.hpp          | 3 ++-
 inference-engine/tests/ngraph_functions/src/activation.cpp     | 2 ++
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/activation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/activation.cpp
index ac61a1d1a34..b30c395a061 100644
--- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/activation.cpp
+++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/activation.cpp
@@ -47,6 +47,7 @@ const std::vector<ActivationTypes> activationTypes = {
         HardSigmoid,
         Selu,
         Ceiling,
+        Mish
 };
 
 const std::vector<ActivationTypes> activationParamTypes = {
diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/skip_tests_config.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/skip_tests_config.cpp
index 9b799781741..d470888b597 100644
--- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/skip_tests_config.cpp
+++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/skip_tests_config.cpp
@@ -51,5 +51,7 @@ std::vector<std::string> disabledTestPatterns() {
         R"(.*ActivationLayerTest.*Ceiling.*)",
         // TODO: Issue: 32032
         R"(.*ActivationParamLayerTest.*)",
+        // TODO: Issue: 32959
+        R"(.*ActivationLayerTest.*Mish.*)",
     };
 }
\ No newline at end of file
diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/activation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/activation.cpp
index 065f610e153..77960def5b0 100644
--- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/activation.cpp
+++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/activation.cpp
@@ -41,7 +41,8 @@ const std::vector<ActivationTypes> activationTypes = {
         Erf,
         HardSigmoid,
         Selu,
-        Ceiling
+        Ceiling,
+        Mish
 };
 
 std::map<std::vector<size_t>, std::vector<std::vector<size_t>>> basic = {
diff --git a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp
index c1df07e9c72..3e1c7ba4267 100644
--- a/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp
+++ b/inference-engine/tests/functional/plugin/shared/include/single_layer_tests/activation.hpp
@@ -68,6 +68,7 @@ static std::map<ngraph::helpers::ActivationTypes, std::string> activationNames =
         {ngraph::helpers::ActivationTypes::Gelu,        "Gelu"},
         {ngraph::helpers::ActivationTypes::Ceiling,     "Ceiling"},
         {ngraph::helpers::ActivationTypes::PReLu,       "PReLu"},
+        {ngraph::helpers::ActivationTypes::Mish,        "Mish"},
 };
 
 typedef std::tuple<
diff --git a/inference-engine/tests/ngraph_functions/include/ngraph_functions/utils/ngraph_helpers.hpp b/inference-engine/tests/ngraph_functions/include/ngraph_functions/utils/ngraph_helpers.hpp
index cf6e7bb54cb..8084aea03e6 100644
--- a/inference-engine/tests/ngraph_functions/include/ngraph_functions/utils/ngraph_helpers.hpp
+++ b/inference-engine/tests/ngraph_functions/include/ngraph_functions/utils/ngraph_helpers.hpp
@@ -107,7 +107,8 @@ enum ActivationTypes {
     HardSigmoid,
     Selu,
     Ceiling,
-    PReLu
+    PReLu,
+    Mish
 };
 
 enum EltwiseTypes {
diff --git a/inference-engine/tests/ngraph_functions/src/activation.cpp b/inference-engine/tests/ngraph_functions/src/activation.cpp
index 01b141d0c84..16bf3ee6e58 100644
--- a/inference-engine/tests/ngraph_functions/src/activation.cpp
+++ b/inference-engine/tests/ngraph_functions/src/activation.cpp
@@ -91,6 +91,8 @@ std::shared_ptr<ngraph::Node> makeActivation(const ngraph::Output<Node> &in,
                     std::vector<float>{-0.01f});
             return std::make_shared<ngraph::op::PRelu>(in, negative_slope);
         }
+        case ngraph::helpers::ActivationTypes::Mish:
+            return std::make_shared<ngraph::op::v4::Mish>(in);
         default:
             throw std::runtime_error("Can't create layer for this activation type");
     }