Merge branch 'lstm_operator' into seq2seq_example

src/onnx/onnx.cpp

@@ -787,17 +787,14 @@ struct onnx_parser
             auto names = attributes.at("activations").strings();
             vec_names.clear();
             vec_names.resize(names.size());
-            std::transform(
-                names.begin(), names.end(), vec_names.begin(), [](auto& str) { return str; });
+            std::copy(names.begin(), names.end(), vec_names.begin());
         }
 
-        if(std::any_of(vec_names.begin(), vec_names.end(), [&](auto& name) {
-               return (map_actv_funcs.count(name) == 0);
-           }))
+        auto name_it = std::find_if(vec_names.begin(), vec_names.end(), [&](auto& name) {
+            return (map_actv_funcs.count(name) == 0);
+        });
+        if(name_it != vec_names.end())
         {
-            auto name_it = std::find_if(vec_names.begin(), vec_names.end(), [&](auto& name) {
-                return (map_actv_funcs.count(name) == 0);
-            });
             MIGRAPHX_THROW("RNN: activation function " + std::string(*name_it) + " not supported");
         }
 
@@ -881,8 +878,7 @@ struct onnx_parser
             auto names = attributes.at("activations").strings();
             vec_names.clear();
             vec_names.resize(names.size());
-            std::transform(
-                names.begin(), names.end(), vec_names.begin(), [](auto& str) { return str; });
+            std::copy(names.begin(), names.end(), vec_names.begin());
         }
 
         // need 4 activation functions
@@ -920,13 +916,11 @@ struct onnx_parser
             }
         }
 
-        if(std::any_of(vec_names.begin(), vec_names.end(), [&](auto& name) {
-               return (map_actv_funcs.count(name) == 0);
-           }))
+        auto name_it = std::find_if(vec_names.begin(), vec_names.end(), [&](auto& name) {
+            return (map_actv_funcs.count(name) == 0);
+        });
+        if(name_it != vec_names.end())
         {
-            auto name_it = std::find_if(vec_names.begin(), vec_names.end(), [&](auto& name) {
-                return (map_actv_funcs.count(name) == 0);
-            });
             MIGRAPHX_THROW("GRU: activation function " + std::string(*name_it) + " not supported");
         }
 
@@ -1011,8 +1005,7 @@ struct onnx_parser
             auto names = attributes.at("activations").strings();
             vec_names.clear();
             vec_names.resize(names.size());
-            std::transform(
-                names.begin(), names.end(), vec_names.begin(), [](auto& str) { return str; });
+            std::copy(names.begin(), names.end(), vec_names.begin());
         }
 
         // need 6 activation functions for bidirectional directions
@@ -1093,13 +1086,11 @@ struct onnx_parser
             }
         }
 
-        if(std::any_of(vec_names.begin(), vec_names.end(), [&](auto& name) {
-               return (map_actv_funcs.count(name) == 0);
-           }))
+        auto name_it = std::find_if(vec_names.begin(), vec_names.end(), [&](auto& name) {
+            return (map_actv_funcs.count(name) == 0);
+        });
+        if(name_it != vec_names.end())
         {
-            auto name_it = std::find_if(vec_names.begin(), vec_names.end(), [&](auto& name) {
-                return (map_actv_funcs.count(name) == 0);
-            });
             MIGRAPHX_THROW("LSTM: activation function " + std::string(*name_it) + " not supported");
         }