Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/ubuntu_22.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ jobs:
target-branch: ${{ inputs.target-branch }}
cmake-options: >-
-G 'Ninja Multi-Config'
'-DCMAKE_CXX_FLAGS_RELEASE="-g -fno-omit-frame-pointer"'
'-DCMAKE_C_FLAGS_RELEASE="-g -fno-omit-frame-pointer"'
-DENABLE_CPPLINT=OFF
-DENABLE_NCC_STYLE=OFF
-DENABLE_TESTS=ON
Expand All @@ -118,7 +120,7 @@ jobs:
-DCMAKE_VERBOSE_MAKEFILE=ON
-DCPACK_GENERATOR=TGZ
-DENABLE_WHEEL=ON
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON
-DCMAKE_COMPILE_WARNING_AS_ERROR=OFF
-DENABLE_FASTER_BUILD=ON

Debian_Packages:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/ubuntu_24.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,16 @@ jobs:
target-branch: ${{ inputs.target-branch }}
cmake-options: >-
-G 'Ninja Multi-Config'
'-DCMAKE_CXX_FLAGS_RELEASE="-g -fno-omit-frame-pointer"'
'-DCMAKE_C_FLAGS_RELEASE="-g -fno-omit-frame-pointer"'
-DENABLE_CPPLINT=OFF
-DENABLE_NCC_STYLE=OFF
-DENABLE_TESTS=ON
-DENABLE_STRICT_DEPENDENCIES=OFF
-DENABLE_SYSTEM_OPENCL=ON
-DCMAKE_VERBOSE_MAKEFILE=ON
-DCPACK_GENERATOR=TGZ
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON
-DCMAKE_COMPILE_WARNING_AS_ERROR=OFF
-DENABLE_FASTER_BUILD=ON

CXX_Unit_Tests:
Expand Down
6 changes: 3 additions & 3 deletions cmake/developer_package/compile_flags/os_flags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -169,16 +169,16 @@ else()
if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8) OR
(OV_COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10) OR OV_COMPILER_IS_INTEL_LLVM)
# Enable __FILE__ trim only for release mode
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ffile-prefix-map=${OV_NATIVE_PROJECT_ROOT_DIR}/= -ffile-prefix-map=${OV_RELATIVE_BIN_PATH}/=")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffile-prefix-map=${OV_NATIVE_PROJECT_ROOT_DIR}/= -ffile-prefix-map=${OV_RELATIVE_BIN_PATH}/=")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -g -fno-omit-frame-pointer -Wno-error -ffile-prefix-map=${OV_NATIVE_PROJECT_ROOT_DIR}/= -ffile-prefix-map=${OV_RELATIVE_BIN_PATH}/=")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g -fno-omit-frame-pointer -Wno-error -ffile-prefix-map=${OV_NATIVE_PROJECT_ROOT_DIR}/= -ffile-prefix-map=${OV_RELATIVE_BIN_PATH}/=")
endif()

#
# Warnings as errors
#

if(CMAKE_COMPILE_WARNING_AS_ERROR AND CMAKE_VERSION VERSION_LESS 3.24)
ov_add_compiler_flags(-Werror)
ov_add_compiler_flags(-Wno-error)
endif()

#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,15 @@ RMSFusion::RMSFusion(bool force_tail_convert) {
// x * 1/Sqrt(ReduceMean(x^2,axes)+eps)
auto mul1 = wrap_type<ov::op::v1::Multiply>({x, div_or_pow});

// x / Sqrt(ReduceMean(x^2,axes)+eps)
auto div_x = wrap_type<ov::op::v1::Divide>({x, sqrt});
auto mul_or_div = std::make_shared<pattern::op::Or>(OutputVector{mul1, div_x});

// x * 1/Sqrt(ReduceMean(x^2,axes)+eps) * gamma
auto gamma = wrap_type<ov::op::v0::Constant>();
auto gamma_convert = pattern::optional<ov::op::v0::Convert>(gamma);
auto mul2 = wrap_type<ov::op::v1::Multiply>({gamma_convert, mul1});

auto mul2 = wrap_type<ov::op::v1::Multiply>({gamma_convert, mul_or_div});

std::shared_ptr<ov::Node> comp = mul2;
if (force_tail_convert) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,3 +251,38 @@ TEST_F(TransformationTestsF, RMSNormFusionTest7) {
comparator.enable(FunctionsComparator::CmpValues::CONST_VALUES);
comparator.enable(FunctionsComparator::CmpValues::ATTRIBUTES);
}

TEST_F(TransformationTestsF, RMSNormFusionTest8) {
{
auto input = std::make_shared<ov::opset10::Parameter>(ov::element::f32, ov::Shape{1, 2, 6});
auto power_const = ov::opset10::Constant::create(ov::element::f32, {}, {2.f});
auto power = std::make_shared<ov::opset10::Power>(input, power_const);
auto mean_axes = ov::opset10::Constant::create(ov::element::i64, ov::Shape{1}, {-1});
auto mean = std::make_shared<ov::opset10::ReduceMean>(power, mean_axes, true);
auto eps = ov::opset10::Constant::create(ov::element::f32, {}, {1e-5f});
auto add_eps = std::make_shared<ov::opset10::Add>(mean, eps);
auto sqrt = std::make_shared<ov::opset10::Sqrt>(add_eps);
auto div = std::make_shared<ov::opset10::Divide>(input, sqrt);
auto gamma = ov::opset10::Constant::create(ov::element::f32,
ov::Shape{6},
{0.029f, 0.014f, 0.003f, 0.013f, 0.015f, 0.009f});
auto mul = std::make_shared<ov::opset10::Multiply>(gamma, div);
auto comp = std::make_shared<ov::opset10::Convert>(mul, ov::element::f16);

model = std::make_shared<ov::Model>(ov::OutputVector{comp}, ov::ParameterVector{input});
manager.register_pass<RMSFusion>();
}
{
auto input = std::make_shared<ov::opset10::Parameter>(ov::element::f32, ov::Shape{1, 2, 6});

auto rms_const = ov::opset10::Constant::create(ov::element::f32,
ov::Shape{6},
{0.029f, 0.014f, 0.003f, 0.013f, 0.015f, 0.009f});
auto rms = std::make_shared<ov::op::internal::RMS>(input, rms_const, 1e-5f, ov::element::f16);

model_ref = std::make_shared<ov::Model>(ov::OutputVector{rms}, ov::ParameterVector{input});
}
comparator.enable(FunctionsComparator::CmpValues::ACCURACY);
comparator.enable(FunctionsComparator::CmpValues::CONST_VALUES);
comparator.enable(FunctionsComparator::CmpValues::ATTRIBUTES);
}
2 changes: 1 addition & 1 deletion src/plugins/intel_gpu/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ add_subdirectory(thirdparty)
include(thirdparty/cmake/rapidjson.cmake)

if(CMAKE_COMPILER_IS_GNUCXX)
ov_add_compiler_flags(-Werror)
ov_add_compiler_flags(-Wno-error)
endif()

add_subdirectory(src/runtime)
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/intel_npu/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ endif()
if(CMAKE_COMPILE_WARNING_AS_ERROR)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
remove_compiler_flags(-Wno-error=deprecated-declarations)
ov_add_compiler_flags(-Werror)
ov_add_compiler_flags(-Wno-error)

elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
if(WIN32)
Expand Down
Loading