-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into xc/fix_sdpa_fusion_for_f16
- Loading branch information
Showing
13 changed files
with
489 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
src/frontends/onnx/frontend/src/op/com.microsoft/simplified_layer_normalization.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| // Copyright (C) 2018-2024 Intel Corporation | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
| #include "core/operator_set.hpp" | ||
| #include "exceptions.hpp" | ||
| #include "openvino/frontend/exception.hpp" | ||
| #include "openvino/op/add.hpp" | ||
| #include "openvino/op/convert.hpp" | ||
| #include "openvino/op/divide.hpp" | ||
| #include "openvino/op/multiply.hpp" | ||
| #include "openvino/op/range.hpp" | ||
| #include "openvino/op/reduce_mean.hpp" | ||
| #include "openvino/op/shape_of.hpp" | ||
| #include "openvino/op/sqrt.hpp" | ||
| #include "utils/common.hpp" | ||
|
|
||
| using namespace ov::op; | ||
| using ::ONNX_NAMESPACE::TensorProto_DataType; | ||
|
|
||
| namespace ov { | ||
| namespace frontend { | ||
| namespace onnx { | ||
| namespace com_microsoft { | ||
| namespace opset_1 { | ||
|
|
||
| ov::OutputVector simplified_layer_normalization(const ov::frontend::onnx::Node& node) { | ||
| common::default_op_checks(node, 2); | ||
|
|
||
| const auto inputs = node.get_ov_inputs(); | ||
| auto X = inputs[0]; | ||
| const auto scale = inputs[1]; | ||
|
|
||
| CHECK_VALID_NODE(node, | ||
| X.get_element_type() == scale.get_element_type(), | ||
| "X and scale must be of same type, got :", | ||
| X.get_element_type(), | ||
| scale.get_element_type()); | ||
|
|
||
| float epsilon = node.get_attribute_value<float>("epsilon", 1e-5f); | ||
| int64_t axis = node.get_attribute_value<int64_t>("axis", -1); | ||
| int64_t default_stash_type = static_cast<int64_t>(TensorProto_DataType::TensorProto_DataType_FLOAT); | ||
| int64_t stash_type_i = node.get_attribute_value<int64_t>("stash_type", default_stash_type); | ||
| element::Type stash_type = common::get_ov_element_type(stash_type_i); | ||
|
|
||
| auto rank = std::make_shared<v0::ShapeOf>(X); | ||
| auto axes = std::make_shared<v4::Range>(v0::Constant::create(element::i64, {}, {axis}), | ||
| (axis < 0 ? v0::Constant::create(element::i64, {}, {0})->output(0) : rank), | ||
| v0::Constant::create(element::i64, {}, {1}), | ||
| element::i64); | ||
|
|
||
| bool needs_type_casting = stash_type != X.get_element_type(); | ||
| if (needs_type_casting) { | ||
| X = std::make_shared<v0::Convert>(X, stash_type); | ||
| } | ||
|
|
||
| auto squared_X = std::make_shared<v1::Multiply>(X, X); // X^2 | ||
| auto mean = std::make_shared<v1::ReduceMean>(squared_X, axes, true); // mean = (1/N) * Σ(j=1 to N) X_j^2 | ||
| auto rms_value = | ||
| std::make_shared<v0::Sqrt>(std::make_shared<v1::Add>(mean, v0::Constant::create(stash_type, {}, {epsilon}))); | ||
| auto inv_std_var = std::make_shared<v1::Divide>(v0::Constant::create(stash_type, {}, {1.0}), rms_value); | ||
| auto normalized = std::make_shared<v1::Multiply>(X, inv_std_var); // X / RMS(X) | ||
|
|
||
| auto scaled = std::make_shared<v1::Multiply>(normalized, scale); // (X / RMS(X)) * scale | ||
|
|
||
| return ov::OutputVector{scaled, inv_std_var}; | ||
| } | ||
|
|
||
| ONNX_OP("SimplifiedLayerNormalization", | ||
| OPSET_SINCE(1), | ||
| com_microsoft::opset_1::simplified_layer_normalization, | ||
| MICROSOFT_DOMAIN); | ||
| } // namespace opset_1 | ||
| } // namespace com_microsoft | ||
| } // namespace onnx | ||
| } // namespace frontend | ||
| } // namespace ov |
69 changes: 69 additions & 0 deletions
69
src/frontends/onnx/tests/models/com.microsoft/simplified_layer_normalization.prototxt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| ir_version: 3 | ||
| producer_name: "OpenVINO ONNX Frontend" | ||
| graph { | ||
| node { | ||
| input: "X" | ||
| input: "scale" | ||
| output: "simplified_layer_norm" | ||
| name: "test_simplified_layer_norm" | ||
| op_type: "SimplifiedLayerNormalization" | ||
| attribute { | ||
| name: "epsilon" | ||
| f: 1e-05 | ||
| type: FLOAT | ||
| } | ||
| attribute { | ||
| name: "axis" | ||
| i: -1 | ||
| type: INT | ||
| } | ||
| attribute { | ||
| name: "stash_type" | ||
| i: 1 | ||
| type: INT | ||
| } | ||
| domain: "com.microsoft" | ||
| } | ||
| initializer { | ||
| dims: 8 | ||
| data_type: 1 | ||
| name: "scale" | ||
| raw_data: "\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f" | ||
| } | ||
| input { | ||
| name: "X" | ||
| type { | ||
| tensor_type { | ||
| elem_type: 1 | ||
| shape { | ||
| dim { | ||
| dim_value: 2 | ||
| } | ||
| dim { | ||
| dim_value: 8 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| output { | ||
| name: "simplified_layer_norm" | ||
| type { | ||
| tensor_type { | ||
| elem_type: 1 | ||
| shape { | ||
| dim { | ||
| dim_value: 2 | ||
| } | ||
| dim { | ||
| dim_value: 8 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| opset_import { | ||
| domain: "com.microsoft" | ||
| version: 1 | ||
| } |
75 changes: 75 additions & 0 deletions
75
src/frontends/onnx/tests/models/com.microsoft/simplified_layer_normalization_2x2x8.prototxt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| ir_version: 3 | ||
| producer_name: "OpenVINO ONNX Frontend" | ||
| graph { | ||
| node { | ||
| input: "X" | ||
| input: "scale" | ||
| output: "simplified_layer_norm" | ||
| name: "test_simplified_layer_norm" | ||
| op_type: "SimplifiedLayerNormalization" | ||
| attribute { | ||
| name: "epsilon" | ||
| f: 1e-05 | ||
| type: FLOAT | ||
| } | ||
| attribute { | ||
| name: "axis" | ||
| i: -1 | ||
| type: INT | ||
| } | ||
| attribute { | ||
| name: "stash_type" | ||
| i: 1 | ||
| type: INT | ||
| } | ||
| domain: "com.microsoft" | ||
| } | ||
| initializer { | ||
| dims: 8 | ||
| data_type: 1 | ||
| name: "scale" | ||
| raw_data: "\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f" | ||
| } | ||
| input { | ||
| name: "X" | ||
| type { | ||
| tensor_type { | ||
| elem_type: 1 | ||
| shape { | ||
| dim { | ||
| dim_value: 2 | ||
| } | ||
| dim { | ||
| dim_value: 2 | ||
| } | ||
| dim { | ||
| dim_value: 8 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| output { | ||
| name: "simplified_layer_norm" | ||
| type { | ||
| tensor_type { | ||
| elem_type: 1 | ||
| shape { | ||
| dim { | ||
| dim_value: 2 | ||
| } | ||
| dim { | ||
| dim_value: 2 | ||
| } | ||
| dim { | ||
| dim_value: 8 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| opset_import { | ||
| domain: "com.microsoft" | ||
| version: 1 | ||
| } |
69 changes: 69 additions & 0 deletions
69
src/frontends/onnx/tests/models/com.microsoft/simplified_layer_normalization_3x8.prototxt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| ir_version: 3 | ||
| producer_name: "OpenVINO ONNX Frontend" | ||
| graph { | ||
| node { | ||
| input: "X" | ||
| input: "scale" | ||
| output: "simplified_layer_norm" | ||
| name: "test_simplified_layer_norm" | ||
| op_type: "SimplifiedLayerNormalization" | ||
| attribute { | ||
| name: "epsilon" | ||
| f: 1e-05 | ||
| type: FLOAT | ||
| } | ||
| attribute { | ||
| name: "axis" | ||
| i: -1 | ||
| type: INT | ||
| } | ||
| attribute { | ||
| name: "stash_type" | ||
| i: 1 | ||
| type: INT | ||
| } | ||
| domain: "com.microsoft" | ||
| } | ||
| initializer { | ||
| dims: 8 | ||
| data_type: 1 | ||
| name: "scale" | ||
| raw_data: "\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f\x00\x00\x80\x3f" | ||
| } | ||
| input { | ||
| name: "X" | ||
| type { | ||
| tensor_type { | ||
| elem_type: 1 | ||
| shape { | ||
| dim { | ||
| dim_value: 3 | ||
| } | ||
| dim { | ||
| dim_value: 8 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| output { | ||
| name: "simplified_layer_norm" | ||
| type { | ||
| tensor_type { | ||
| elem_type: 1 | ||
| shape { | ||
| dim { | ||
| dim_value: 3 | ||
| } | ||
| dim { | ||
| dim_value: 8 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| opset_import { | ||
| domain: "com.microsoft" | ||
| version: 1 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.