From babdba28ea3fbaa5993cab32924a32245262f2b6 Mon Sep 17 00:00:00 2001 From: Anton Voronov Date: Thu, 15 Dec 2022 04:21:29 -0800 Subject: [PATCH] [CPU] FC: fixed primitive caching for sparse decompression case [CPU][oneDNN] sparsity: removed unused code --- src/plugins/intel_cpu/src/nodes/fullyconnected.cpp | 5 ++--- src/plugins/intel_cpu/src/nodes/fullyconnected.h | 1 - src/plugins/intel_cpu/thirdparty/onednn | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/plugins/intel_cpu/src/nodes/fullyconnected.cpp b/src/plugins/intel_cpu/src/nodes/fullyconnected.cpp index 62d483b0536ebd..da1f10ac0a4405 100644 --- a/src/plugins/intel_cpu/src/nodes/fullyconnected.cpp +++ b/src/plugins/intel_cpu/src/nodes/fullyconnected.cpp @@ -591,7 +591,7 @@ void FullyConnected::createDescriptorInternal(const dnnl::memory::desc &inputDes dnnl::memory::desc wgh_candidate; if (useSparseWeights) { wgh_candidate = { DnnlExtensionUtils::convertToDnnlDims(getInputShapeAtPort(WEIGHTS_ID).getStaticDims()), - wdt, memory::desc::packed(nnzCount) }; + wdt, memory::desc::packed() }; } else { wgh_candidate = { DnnlExtensionUtils::convertToDnnlDims(getInputShapeAtPort(WEIGHTS_ID).getStaticDims()), wdt, dnnl::memory::format_tag::any }; @@ -930,10 +930,9 @@ bool FullyConnected::useSparseWeightsDecompression() { zerosCounts++; } } - nnzCount = elementsCount - zerosCounts; DEBUG_LOG(getName(), ", weightsData.size() = ", elementsCount, ", zerosCounts = ", - zerosCounts, ", nnzCount = ", nnzCount); + zerosCounts, ", nnzCount = ", elementsCount - zerosCounts); weiSparseRate = static_cast(zerosCounts) / static_cast(elementsCount); diff --git a/src/plugins/intel_cpu/src/nodes/fullyconnected.h b/src/plugins/intel_cpu/src/nodes/fullyconnected.h index 91431365d59976..122ba0b3c00a45 100644 --- a/src/plugins/intel_cpu/src/nodes/fullyconnected.h +++ b/src/plugins/intel_cpu/src/nodes/fullyconnected.h @@ -112,7 +112,6 @@ class FullyConnected : public Node { // sparse weights bool useSparseWeights = false; - int nnzCount = -1; float minSparseRate = 1.f; float weiSparseRate = 0.f; bool useSparseWeightsDecompression(); diff --git a/src/plugins/intel_cpu/thirdparty/onednn b/src/plugins/intel_cpu/thirdparty/onednn index 44de3c3698b687..fa686cf1dd3398 160000 --- a/src/plugins/intel_cpu/thirdparty/onednn +++ b/src/plugins/intel_cpu/thirdparty/onednn @@ -1 +1 @@ -Subproject commit 44de3c3698b687c26e487fc8f0213fa487e8fe2c +Subproject commit fa686cf1dd339868694ae95e0a9607e8e82e07b7