Linker fixes

allnes · Jan 10, 2023 · 10383ad · 10383ad
1 parent 47bcad3
commit 10383ad
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/src/plugins/intel_cpu/src/nodes/common/cpu_convert.cpp b/src/plugins/intel_cpu/src/nodes/common/cpu_convert.cpp
@@ -6,26 +6,32 @@
 #include "cpu_memcpy.h"
 #include <utils/bfloat16.hpp>
 #include <utils/general_utils.h>
-#include "nodes/kernels/x64/jit_kernel.hpp"
 #include <selective_build.h>
 #include <ie_parallel.hpp>
 #include <openvino/core/type/float16.hpp>
-#include <cpu/x64/jit_generator.hpp>
 #include <algorithm>
 #include <type_traits>
 #include <tuple>
 #include <cmath>
 #include <onednn/dnnl.h>
+#if defined(OV_CPU_X64)
+#include "nodes/kernels/x64/jit_kernel.hpp"
+#include <cpu/x64/jit_generator.hpp>
+#endif
 
 using namespace InferenceEngine;
-using namespace dnnl::impl::utils;
-using namespace dnnl::impl::cpu::x64;
-using namespace Xbyak;
+
 
 namespace ov {
 namespace intel_cpu {
 namespace {
 
+#if defined(OV_CPU_X64)
+
+using namespace dnnl::impl::utils;
+using namespace dnnl::impl::cpu::x64;
+using namespace Xbyak;
+
 template <typename src_t, typename dst_t>
 void convert_vec(jit_generator & gen,
                  const RegExp & src,
@@ -156,6 +162,8 @@ void jit_convert(const TI* arg, TO* out, size_t count) {
     }
 }
 
+#endif
+
 template <Precision::ePrecision p>
 struct PrecisionInfo {
     using value_type = typename PrecisionTrait<p>::value_type;
@@ -356,6 +364,7 @@ struct ConvertPrecision<std::tuple<ov::intel_cpu::bfloat16_t, float>> {
     }
 };
 
+#if defined(OV_CPU_X64)
 template<typename src_t>
 struct ConvertPrecision<std::tuple<src_t, ov::float16>> {
     void operator()(ConvertContext & ctx) {
@@ -462,6 +471,7 @@ struct ConvertPrecision<std::tuple<ov::float16, ov::float16>> {
         ctx.converted = true;
     }
 };
+#endif
 
 bool isConversionTruncatesRange(const Precision & from, const Precision & to) {
     return to.bitsSize() < from.bitsSize()

diff --git a/src/plugins/intel_cpu/src/nodes/executors/mvn_list.hpp b/src/plugins/intel_cpu/src/nodes/executors/mvn_list.hpp
@@ -42,6 +42,7 @@ class MVNExecutorFactory : public ExecutorFactory {
                                         const dnnl::primitive_attr &attr) {
         auto build = [&](const MVNExecutorDesc* desc) {
             switch (desc->implType) {
+#if defined(OV_CPU_X64)
                 case impl_desc_type::jit_uni: {
                     auto builder = [&](const JitMVNExecutor::Key& key) -> MVNExecutorPtr {
                         auto executor = desc->builder->makeExecutor();
@@ -56,6 +57,7 @@ class MVNExecutorFactory : public ExecutorFactory {
                     auto res = runtimeCache->getOrCreate(key, builder);
                     return res.first;
                 } break;
+#endif
                 default: {
                     auto executor = desc->builder->makeExecutor();
                     if (executor->init(mvnAttrs, srcDescs, dstDescs, attr)) {

diff --git a/src/plugins/intel_cpu/src/nodes_factory.cpp b/src/plugins/intel_cpu/src/nodes_factory.cpp
@@ -124,8 +124,6 @@ Node::NodesFactory::NodesFactory()
     INTEL_CPU_NODE(MemoryInput, Type::MemoryInput);
     INTEL_CPU_NODE(MemoryOutput, Type::MemoryOutput);
     INTEL_CPU_NODE(Tile, Type::Tile);
-    INTEL_CPU_NODE(DFT, Type::DFT);
-    INTEL_CPU_NODE(RDFT, Type::RDFT);
     INTEL_CPU_NODE(GatherTree, Type::GatherTree);
     INTEL_CPU_NODE(SpaceToDepth, Type::SpaceToDepth);
     INTEL_CPU_NODE(FullyConnected, Type::FullyConnected);
@@ -173,8 +171,6 @@ Node::NodesFactory::NodesFactory()
     INTEL_CPU_NODE(ShuffleChannels, Type::ShuffleChannels);
     INTEL_CPU_NODE(DepthToSpace, Type::DepthToSpace);
     INTEL_CPU_NODE(Deconvolution, Type::Deconvolution);
-    INTEL_CPU_NODE(Gather, Type::Gather);
-    INTEL_CPU_NODE(GridSample, Type::GridSample);
     INTEL_CPU_NODE(Range, Type::Range);
     INTEL_CPU_NODE(StridedSlice, Type::StridedSlice);
     INTEL_CPU_NODE(GRN, Type::GRN);
@@ -185,6 +181,10 @@ Node::NodesFactory::NodesFactory()
     INTEL_CPU_NODE(Eye, Type::Eye);
     INTEL_CPU_NODE(Unique, Type::Unique);
 #if defined(OV_CPU_X64)
+    INTEL_CPU_NODE(Gather, Type::Gather);
+    INTEL_CPU_NODE(GridSample, Type::GridSample);
+    INTEL_CPU_NODE(DFT, Type::DFT);
+    INTEL_CPU_NODE(RDFT, Type::RDFT);
     INTEL_CPU_NODE(ColorConvert, Type::ColorConvert);
     INTEL_CPU_NODE(NormalizeL2, Type::NormalizeL2);
     INTEL_CPU_NODE(BinaryConvolution, Type::BinaryConvolution);