[IE TESTS] Added single layer tests HSwish (#1861)

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 b30c395..286a708 100644 (file)
--- 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,7 +47,8 @@ const std::vector<ActivationTypes> activationTypes = {
         HardSigmoid,
         Selu,
         Ceiling,
-        Mish
+        Mish,
+        HSwish
 };
 
 const std::vector<ActivationTypes> activationParamTypes = {

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 77960de..eb41567 100644 (file)
--- 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
@@ -42,7 +42,8 @@ const std::vector<ActivationTypes> activationTypes = {
         HardSigmoid,
         Selu,
         Ceiling,
-        Mish
+        Mish,
+        HSwish
 };
 
 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 54288e4..2744a85 100644 (file)
--- 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::Ceiling,     "Ceiling"},
         {ngraph::helpers::ActivationTypes::PReLu,       "PReLu"},
         {ngraph::helpers::ActivationTypes::Mish,        "Mish"},
+        {ngraph::helpers::ActivationTypes::HSwish,      "HSwish"},
 };
 
 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 f63aefe..aa8c56f 100644 (file)
--- 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
@@ -108,7 +108,8 @@ enum ActivationTypes {
     Selu,
     Ceiling,
     PReLu,
-    Mish
+    Mish,
+    HSwish
 };
 
 enum EltwiseTypes {

diff --git a/inference-engine/tests/ngraph_functions/src/activation.cpp b/inference-engine/tests/ngraph_functions/src/activation.cpp
index 16bf3ee..ab8c878 100644 (file)
--- a/inference-engine/tests/ngraph_functions/src/activation.cpp
+++ b/inference-engine/tests/ngraph_functions/src/activation.cpp
@@ -93,6 +93,8 @@ std::shared_ptr<ngraph::Node> makeActivation(const ngraph::Output<Node> &in,
         }
         case ngraph::helpers::ActivationTypes::Mish:
             return std::make_shared<ngraph::op::v4::Mish>(in);
+        case ngraph::helpers::ActivationTypes::HSwish:
+            return std::make_shared<ngraph::op::v4::HSwish>(in);
         default:
             throw std::runtime_error("Can't create layer for this activation type");
     }