Skip to content

Commit

Permalink
[CI] Update reviewdog to not used deprecated option and check all fil…
Browse files Browse the repository at this point in the history 
…es (#28974)

### Details:
 - Update reviewdog for code style check:
   * remove deprecated option usage
   * add nofilter for check files to check all not diff only
   * exclude temp and thirdparty code
- Apply code style in affected files

### Related PRs:
- #28946

### Tickets:
 - N/A

---------

Signed-off-by: Raasz, Pawel <[email protected]>
  • Loading branch information
@praasz
praasz authored Feb 14, 2025
1 parent d7ecf52 commit 1d1d099
Show file tree
Hide file tree
Showing 14 changed files with 58 additions and 49 deletions.
14 changes: 11 additions & 3 deletions .github/workflows/code_style.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
level: warning
fail_on_error: true
fail_level: error
filter_mode: nofilter
exclude: |
"*/thirdparty/*"
"./temp/*"
clang-format-aarch64:
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -71,7 +75,11 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
level: warning
fail_on_error: true
fail_level: error
filter_mode: nofilter
exclude: |
"*/thirdparty/*"
"./temp/*"
ShellCheck:
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -103,7 +111,7 @@ jobs:
level: style
reporter: github-pr-review
check_all_files_with_shebangs: true
fail_on_error: true
fail_level: error
exclude: |
"*/thirdparty/*"
"./temp/*"
Expand Down
3 changes: 2 additions & 1 deletion src/frontends/onnx/frontend/src/utils/onnx_internal.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ std::shared_ptr<ov::Model> decode_to_framework_nodes(std::shared_ptr<ModelProto>
detail::MappedMemoryHandles mmap_cache,
ov::frontend::ExtensionHolder extensions) {
apply_transformations(*model_proto);
auto graph = std::make_shared<Graph>(ov::util::get_directory(model_path).string(), model_proto, mmap_cache, extensions);
auto graph =
std::make_shared<Graph>(ov::util::get_directory(model_path).string(), model_proto, mmap_cache, extensions);
return graph->decode();
}
} // namespace ov::frontend::onnx::detail
9 changes: 6 additions & 3 deletions src/frontends/onnx/tests/onnx_import_convpool.in.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,14 +426,17 @@ OPENVINO_TEST(${BACKEND_NAME}, onnx_model_convtranspose_output_shape) {

test_case.add_input_from_file<float>(util::path_join({ov::test::utils::getExecutableDirectory(),
TEST_ONNX_MODELS_DIRNAME,
"files/convtranspose_output_shape/x.bin"}).string());
"files/convtranspose_output_shape/x.bin"})
.string());
test_case.add_input_from_file<float>(util::path_join({ov::test::utils::getExecutableDirectory(),
TEST_ONNX_MODELS_DIRNAME,
"files/convtranspose_output_shape/w.bin"}).string());
"files/convtranspose_output_shape/w.bin"})
.string());
test_case.add_expected_output_from_file<float>({1, 2, 10, 8},
util::path_join({ov::test::utils::getExecutableDirectory(),
TEST_ONNX_MODELS_DIRNAME,
"files/convtranspose_output_shape/y.bin"}).string());
"files/convtranspose_output_shape/y.bin"})
.string());

test_case.run();
}
Expand Down
3 changes: 1 addition & 2 deletions src/frontends/tensorflow/src/graph_iterator_saved_model.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ bool GraphIteratorSavedModel::is_supported(const std::string& path) {

#if defined(OPENVINO_ENABLE_UNICODE_PATH_SUPPORT) && defined(_WIN32)
bool GraphIteratorSavedModel::is_supported(const std::wstring& path) {
return ov::util::directory_exists(path) &&
ov::util::file_exists(ov::util::path_join_w({path, L"saved_model.pb"}));
return ov::util::directory_exists(path) && ov::util::file_exists(ov::util::path_join_w({path, L"saved_model.pb"}));
}
#endif

Expand Down
6 changes: 3 additions & 3 deletions src/plugins/intel_cpu/src/emitters/snippets/aarch64/jit_loop_emitters.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ void jit_loop_end_emitter::validate_arguments(const std::vector<size_t>& in, con
}

void jit_loop_end_emitter::emit_code_impl(const std::vector<size_t>& in,
const std::vector<size_t>& out,
const std::vector<size_t>& pool_vec_idxs,
const std::vector<size_t>& pool_gpr_idxs) const {
const std::vector<size_t>& out,
const std::vector<size_t>& pool_vec_idxs,
const std::vector<size_t>& pool_gpr_idxs) const {
validate_arguments(in, out);
emit_impl(in, out);
}
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/intel_cpu/src/emitters/snippets/aarch64/jit_loop_emitters.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ class jit_loop_end_emitter : public jit_emitter {
}

void emit_code_impl(const std::vector<size_t>& in_idxs,
const std::vector<size_t>& out_idxs,
const std::vector<size_t>& pool_vec_idxs,
const std::vector<size_t>& pool_gpr_idxs) const override;
const std::vector<size_t>& out_idxs,
const std::vector<size_t>& pool_vec_idxs,
const std::vector<size_t>& pool_gpr_idxs) const override;

protected:
void validate_arguments(const std::vector<size_t>& in, const std::vector<size_t>& out) const override;
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/intel_cpu/src/emitters/snippets/x64/jit_loop_emitters.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ void jit_loop_end_emitter::validate_arguments(const std::vector<size_t>& in, con
}

void jit_loop_end_emitter::emit_code_impl(const std::vector<size_t>& in,
const std::vector<size_t>& out,
const std::vector<size_t>& pool_vec_idxs,
const std::vector<size_t>& pool_gpr_idxs) const {
const std::vector<size_t>& out,
const std::vector<size_t>& pool_vec_idxs,
const std::vector<size_t>& pool_gpr_idxs) const {
validate_arguments(in, out);
jit_emitter::emit_code_impl(in, out, pool_vec_idxs, pool_gpr_idxs);
}
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/intel_cpu/src/emitters/snippets/x64/jit_loop_emitters.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ class jit_loop_end_emitter : public jit_emitter {
}

void emit_code_impl(const std::vector<size_t>& in_idxs,
const std::vector<size_t>& out_idxs,
const std::vector<size_t>& pool_vec_idxs,
const std::vector<size_t>& pool_gpr_idxs) const override;
const std::vector<size_t>& out_idxs,
const std::vector<size_t>& pool_vec_idxs,
const std::vector<size_t>& pool_gpr_idxs) const override;

protected:
void validate_arguments(const std::vector<size_t>& in, const std::vector<size_t>& out) const override;
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/intel_cpu/src/emitters/snippets/x64/jit_reg_spill_emitters.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ void jit_reg_spill_end_emitter::validate_arguments(const std::vector<size_t>& in
}

void jit_reg_spill_end_emitter::emit_code_impl(const std::vector<size_t>& in,
const std::vector<size_t>& out,
const std::vector<size_t>& pool_vec_idxs,
const std::vector<size_t>& pool_gpr_idxs) const {
const std::vector<size_t>& out,
const std::vector<size_t>& pool_vec_idxs,
const std::vector<size_t>& pool_gpr_idxs) const {
validate_arguments(in, out);
emit_impl(in, out);
}
Expand Down
12 changes: 6 additions & 6 deletions src/plugins/intel_cpu/src/emitters/snippets/x64/jit_reg_spill_emitters.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ class jit_reg_spill_begin_emitter : public jit_emitter {
void validate_arguments(const std::vector<size_t>& in, const std::vector<size_t>& out) const override;
void emit_impl(const std::vector<size_t>& in, const std::vector<size_t>& out) const override;
void emit_code_impl(const std::vector<size_t>& in_idxs,
const std::vector<size_t>& out_idxs,
const std::vector<size_t>& pool_vec_idxs,
const std::vector<size_t>& pool_gpr_idxs) const override;
const std::vector<size_t>& out_idxs,
const std::vector<size_t>& pool_vec_idxs,
const std::vector<size_t>& pool_gpr_idxs) const override;
std::set<snippets::Reg> m_regs_to_spill;
std::shared_ptr<EmitABIRegSpills> m_abi_reg_spiller;
};
Expand All @@ -49,9 +49,9 @@ class jit_reg_spill_end_emitter : public jit_emitter {
}

void emit_code_impl(const std::vector<size_t>& in_idxs,
const std::vector<size_t>& out_idxs,
const std::vector<size_t>& pool_vec_idxs,
const std::vector<size_t>& pool_gpr_idxs) const override;
const std::vector<size_t>& out_idxs,
const std::vector<size_t>& pool_vec_idxs,
const std::vector<size_t>& pool_gpr_idxs) const override;

protected:
void validate_arguments(const std::vector<size_t>& in, const std::vector<size_t>& out) const override;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/intel_cpu/src/nodes/executors/aarch64/jit_eltwise.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ bool JitEltwiseExecutor::isSupported(const Algorithm& algorithm,
Algorithm::EltwiseMod,
Algorithm::EltwiseMultiply,
Algorithm::EltwiseMulAdd,
Algorithm::EltwiseNotEqual,
Algorithm::EltwiseNotEqual,
Algorithm::EltwisePowerStatic,
Algorithm::EltwisePrelu,
Algorithm::EltwiseRelu,
Expand Down
12 changes: 6 additions & 6 deletions src/plugins/intel_cpu/src/nodes/kernels/aarch64/jit_uni_eltwise_generic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ void jit_uni_eltwise_generic<isa>::generate() {
preamble();

static const std::vector<element::Type> exec_precisions_priority = {element::f16, element::f32};
auto const exec_prc = eltwise_precision_helper::get_precision(jep_.inputs_number, jep_.src_prc, eltwise_data_, exec_precisions_priority);
auto const exec_prc = eltwise_precision_helper::get_precision(jep_.inputs_number,
jep_.src_prc,
eltwise_data_,
exec_precisions_priority);

eltwise_emitter = create_eltwise_emitter(eltwise_data_.front(), exec_prc);
for (size_t i = 1; i < eltwise_data_.size(); ++i) {
Expand All @@ -46,8 +49,7 @@ void jit_uni_eltwise_generic<isa>::generate() {
for (size_t i = 0; i < jep.inputs_number; i++) {
ldr(start_to_offsets,
ptr(reg_const_params,
static_cast<int32_t>(offsetof(jit_eltwise_call_args_ptrs, src_offsets) +
i * sizeof(size_t))));
static_cast<int32_t>(offsetof(jit_eltwise_call_args_ptrs, src_offsets) + i * sizeof(size_t))));
ldr(get_src_reg(i),
ptr(reg_const_params,
static_cast<int32_t>(offsetof(jit_eltwise_call_args_ptrs, src_ptr[0]) + i * sizeof(size_t))));
Expand Down Expand Up @@ -91,8 +93,7 @@ void jit_uni_eltwise_generic<isa>::generate() {

for (size_t i = 0; i < jep.inputs_number; i++) {
ldr(get_src_reg(i),
ptr(param1,
static_cast<int32_t>(offsetof(jit_eltwise_call_args_ptrs, src_ptr) + i * sizeof(size_t))));
ptr(param1, static_cast<int32_t>(offsetof(jit_eltwise_call_args_ptrs, src_ptr) + i * sizeof(size_t))));
init_ptrs_with_offsets(get_src_reg(i), jep.src_offsets[i]);
}

Expand Down Expand Up @@ -786,7 +787,6 @@ struct SupportedPrecisions {
};
} // namespace


using namespace aarch64;

std::set<std::vector<element::Type>> eltwise_precision_helper::get_supported_precisions(const Algorithm& algo) {
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/intel_cpu/src/nodes/kernels/x64/mlp_kernel.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,8 @@ class ReduceAdd2bh : public dnnl::impl::cpu::x64::jit_generator {
struct CallArgs {
float* src0;
float* src1;
int16_t * dst;
int16_t * prefetch_dst;
int16_t* dst;
int16_t* prefetch_dst;
int64_t num_cols;
};
// add two float input eltwise and convert to bf16 : ConvertFP32toBF16(src0 + src1)
Expand All @@ -545,7 +545,7 @@ class ReduceAdd2bh : public dnnl::impl::cpu::x64::jit_generator {
// the prefetch distance is increased to ensure by the time store happens
// prefetch has done and no HW prefetcher is triggered
args.prefetch_dst = (m + 2 < num_rows) ? (args.dst + 2 * dst_stride) : (args.dst);

(*this)(&args);
}
}
Expand Down
16 changes: 7 additions & 9 deletions thirdparty/itt_collector/sea_itt_lib/IttNotifyStdSrc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1577,15 +1577,13 @@ void FillApiList(__itt_api_info* api_list_ptr) {
#define ITT_STUB_IMPL_ORIG(name) ITT_STUB_IMPL(name)
#ifdef _DEBUG // dangerous stub that doesn't return anything (even when expected) but records the function call for
// statistics sake
# define ITT_STUB_NO_IMPL(fn) \
if (0 == strcmp("__itt_" ITT_TO_STR(fn), api_list_ptr[i].name)) { \
struct local { \
static void stub(...) { \
CIttFnStat oIttFnStat("NO IMPL:\t" ITT_TO_STR(fn)); \
} \
}; \
*api_list_ptr[i].func_ptr = reinterpret_cast<void*>(local::stub); \
continue; \
# define ITT_STUB_NO_IMPL(fn) \
if (0 == strcmp("__itt_" ITT_TO_STR(fn), api_list_ptr[i].name)) { \
struct local { \
static void stub(...) { CIttFnStat oIttFnStat("NO IMPL:\t" ITT_TO_STR(fn)); } \
}; \
*api_list_ptr[i].func_ptr = reinterpret_cast<void*>(local::stub); \
continue; \
}
#else
# define ITT_STUB_NO_IMPL(fn)
Expand Down

0 comments on commit 1d1d099

Please sign in to comment.