Skip to content

Commit 4889447

Browse files
committed
fix format issue
1 parent 6d8bdd0 commit 4889447

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

src/plugins/intel_cpu/src/cpu_memory.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class IMemory {
188188
// Caution!!! This action invalidates the previous data layout. The old data may become unreachable.
189189
virtual void redefineDesc(MemoryDescPtr desc) = 0;
190190

191-
virtual void load(const IMemory& src, bool ftz, bool bf16saturation = false) const = 0;
191+
virtual void load(const IMemory& src, bool ftz, bool bf16saturation) const = 0;
192192

193193
virtual MemoryBlockPtr getMemoryBlock() const = 0;
194194

@@ -260,7 +260,7 @@ class StaticMemory final : public IMemory {
260260
// Always throws since a static memory descriptor should not be modified
261261
void redefineDesc(MemoryDescPtr desc) override;
262262

263-
void load(const IMemory& src, bool ftz, bool bf16saturation = false) const override;
263+
void load(const IMemory& src, bool ftz, bool bf16saturation) const override;
264264

265265
MemoryBlockPtr getMemoryBlock() const override;
266266

@@ -315,7 +315,7 @@ class Memory : public IMemory {
315315

316316
void redefineDesc(MemoryDescPtr desc) override;
317317

318-
void load(const IMemory& src, bool ftz, bool bf16saturation = false) const override;
318+
void load(const IMemory& src, bool ftz, bool bf16saturation) const override;
319319
void nullify() override;
320320

321321
dnnl::engine getEngine() const {
@@ -421,7 +421,7 @@ class StringMemory : public IMemory {
421421

422422
void redefineDesc(MemoryDescPtr desc) override;
423423

424-
void load(const IMemory& src, bool ftz, bool bf16saturation = false) const override;
424+
void load(const IMemory& src, bool ftz, bool bf16saturation) const override;
425425

426426
MemoryBlockPtr getMemoryBlock() const override;
427427

src/plugins/intel_cpu/src/dnnl_postops_composer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ static MemoryPtr prepackDecompressionParams(const MemoryCPtr& paramsPtr,
659659
srcFormat);
660660
auto srcMem = std::make_shared<Memory>(engine, srcMemoryDesc, paramsPtr->getData());
661661

662-
dstMem->load(*srcMem, true);
662+
dstMem->load(*srcMem, true, false);
663663
return dstMem;
664664
}
665665

src/plugins/intel_cpu/src/graph.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,10 +1183,10 @@ void Graph::PushInputData(const std::size_t& index, const ov::SoPtr<ITensor>& in
11831183

11841184
if (actualDesc->getPrecision() == element::string) {
11851185
StringMemory ext_mem(getEngine(), ext_tensor_desc, ext_data_ptr);
1186-
edgeMemory->load(ext_mem, false);
1186+
edgeMemory->load(ext_mem, false, false);
11871187
} else if (!actualDesc->isCompatible(*ext_tensor_desc)) {
11881188
Memory ext_mem(getEngine(), ext_tensor_desc, ext_data_ptr, false);
1189-
edgeMemory->load(ext_mem, false);
1189+
edgeMemory->load(ext_mem, false, false);
11901190
} else {
11911191
size_t size_to_copy = ext_tensor_desc->getCurrentMemSize();
11921192
cpu_parallel_memcpy(inter_data_ptr, ext_data_ptr, size_to_copy);
@@ -1293,10 +1293,10 @@ void Graph::PullOutputData(std::unordered_map<std::size_t, ov::SoPtr<ITensor>>&
12931293

12941294
if (actualDesc->getPrecision() == element::string) {
12951295
StringMemory outBloMem(getEngine(), expected_desc_ptr, ext_blob_ptr);
1296-
outBloMem.load(intr_blob, false);
1296+
outBloMem.load(intr_blob, false, false);
12971297
} else if (!actualDesc->isCompatible(*expected_desc_ptr) && !isScalarOutput) {
12981298
Memory outBloMem(getEngine(), expected_desc_ptr, ext_blob_ptr, false);
1299-
outBloMem.load(intr_blob, false);
1299+
outBloMem.load(intr_blob, false, false);
13001300
} else {
13011301
OPENVINO_ASSERT(srcPrec == dstPrec,
13021302
"The precision of the CPU output tensor index",

src/plugins/intel_cpu/src/memory_state.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void VariableStateBase::set_state_impl(const ov::SoPtr<ov::ITensor>& state) {
5757
auto src = state->data();
5858

5959
Memory mem(get_engine(), state_desc, src);
60-
input_mem()->load(mem, true);
60+
input_mem()->load(mem, true, false);
6161
reset_state_flag = false;
6262
}
6363

@@ -96,7 +96,7 @@ ov::SoPtr<ov::ITensor> VariableStateBase::get_state() const {
9696

9797
// reorder
9898
auto mem = std::make_shared<Memory>(get_engine(), current_ext_desc);
99-
mem->load(*(internal_state_mem()), true);
99+
mem->load(*(internal_state_mem()), true, false);
100100
return std::make_shared<Tensor>(mem);
101101
}
102102

@@ -312,7 +312,7 @@ void VariableStateKVcache::set_state_impl(const ov::SoPtr<ov::ITensor>& state) {
312312
m_scale_zp.at<float>({m, b, h, size_t{1}}));
313313
});
314314
} else {
315-
m_internal_mem->load(external_mem, true);
315+
m_internal_mem->load(external_mem, true, false);
316316
}
317317

318318
// 2. Reset the beam search table

src/plugins/intel_cpu/src/nodes/conv.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1687,7 +1687,7 @@ void Convolution::executeDynamicImpl(const dnnl::stream& strm) {
16871687
const auto& outMem = out->getParentEdgeAt(0)->getMemory();
16881688
auto convOutMem = getDstMemoryAtPort(0);
16891689
Node::redefineOutputMemory({outMem.getStaticDims()});
1690-
convOutMem->load(outMem, true);
1690+
convOutMem->load(outMem, true, false);
16911691
}
16921692
}
16931693

src/plugins/intel_cpu/src/nodes/memory.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class MemoryStub : public IMemory {
8282
m_pMemDesc = desc;
8383
}
8484

85-
void load(const IMemory& src, bool ftz, bool bf16saturation = false) const override {
85+
void load(const IMemory& src, bool ftz, bool bf16saturation) const override {
8686
OPENVINO_THROW("Unexpected call MemoryStub::load()");
8787
}
8888

@@ -306,7 +306,7 @@ void MemoryOutput::runStatic(dnnl::stream strm) {
306306
CPU_NODE_ASSERT(assignedMem, " uninitialized assigned memory");
307307

308308
if (inputMem->getData() != assignedMem->getData()) {
309-
assignedMem->load(*inputMem, true);
309+
assignedMem->load(*inputMem, true, false);
310310
}
311311
}
312312

@@ -811,7 +811,7 @@ void MemoryInput::runDynamic(dnnl::stream strm) {
811811

812812
// copy data when necessary
813813
if (src->getData() != dst->getData()) {
814-
dst->load(*src, true);
814+
dst->load(*src, true, false);
815815
}
816816
}
817817

@@ -855,7 +855,7 @@ void MemoryInput::runStatic(dnnl::stream strm) {
855855
// copy data when necessary
856856
auto dst = getDstMemoryAtPort(0);
857857
if (src->getData() != dst->getData()) {
858-
dst->load(*src, true);
858+
dst->load(*src, true, false);
859859
}
860860
}
861861

@@ -1068,7 +1068,7 @@ void MemoryInputSingle::runStatic(dnnl::stream strm) {
10681068
auto stateMem = getAssignedState()->output_mem();
10691069
CPU_NODE_ASSERT(stateMem, " state memory has nullptr");
10701070
if (result->getData() != stateMem->getData()) {
1071-
stateMem->load(*result, true);
1071+
stateMem->load(*result, true, false);
10721072
}
10731073
}
10741074
getAssignedState()->commit(); // since we don't use MemoryOutput, commit must be called to change the reset state
@@ -1093,7 +1093,7 @@ void MemoryInputSingle::runDynamic(dnnl::stream strm) {
10931093
}
10941094

10951095
if (result->getData() != stateMem->getData()) {
1096-
stateMem->load(*result, true);
1096+
stateMem->load(*result, true, false);
10971097
}
10981098
}
10991099
getAssignedState()->commit(); // since we don't use MemoryOutput, commit must be called to change the reset state

0 commit comments

Comments
 (0)