diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2021-05-07 15:14:19 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2021-05-07 15:57:51 +0800 |
commit | 49d97ea0acdadda7870033ca7b1a1a1fd0d5b48f (patch) | |
tree | 811df981c173d3d0e99a88e637c035d382cd5781 /dynamic-layers/clang-layer | |
parent | 922c44cb704fd4e3bbfd055c610263c886847cd2 (diff) | |
download | meta-intel-49d97ea0acdadda7870033ca7b1a1a1fd0d5b48f.tar.gz |
onednn: fix failures with gcc 11
Backport a patch to fix:
| error: no match for 'operator!=' (operand types are 'const std::thread::id' and 'const std::thread::id')
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers/clang-layer')
-rw-r--r-- | dynamic-layers/clang-layer/recipes-core/dnn/files/fix-gcc-11-failures.patch | 37 | ||||
-rw-r--r-- | dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.2.2.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/files/fix-gcc-11-failures.patch b/dynamic-layers/clang-layer/recipes-core/dnn/files/fix-gcc-11-failures.patch new file mode 100644 index 00000000..a7f348b3 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-core/dnn/files/fix-gcc-11-failures.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 1fe0f2594a1bfc6386fd8f6537f971d5ae9c1214 Mon Sep 17 00:00:00 2001 | ||
2 | From: Denis Samoilov <denis.samoylov@intel.com> | ||
3 | Date: Fri, 2 Apr 2021 19:46:22 -0700 | ||
4 | Subject: [PATCH] common, gpu: include thread and limit headers to fix GCC 11 | ||
5 | build issues | ||
6 | |||
7 | Upstream-Status: Backport [https://github.com/oneapi-src/oneDNN/commit/1fe0f2594a1bfc6386fd8f6537f971d5ae9c1214] | ||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
9 | --- | ||
10 | src/common/primitive_cache.hpp | 1 + | ||
11 | src/gpu/jit/ngen/ngen_auto_swsb.hpp | 1 + | ||
12 | 2 files changed, 2 insertions(+) | ||
13 | |||
14 | diff --git a/src/common/primitive_cache.hpp b/src/common/primitive_cache.hpp | ||
15 | index d3390c0649..ba186b2e66 100644 | ||
16 | --- a/src/common/primitive_cache.hpp | ||
17 | +++ b/src/common/primitive_cache.hpp | ||
18 | @@ -19,6 +19,7 @@ | ||
19 | |||
20 | #include <future> | ||
21 | #include <memory> | ||
22 | +#include <thread> | ||
23 | #include <unordered_map> | ||
24 | |||
25 | #include "c_types_map.hpp" | ||
26 | diff --git a/src/gpu/jit/ngen/ngen_auto_swsb.hpp b/src/gpu/jit/ngen/ngen_auto_swsb.hpp | ||
27 | index deb2275ef0..5236bc0fa0 100644 | ||
28 | --- a/src/gpu/jit/ngen/ngen_auto_swsb.hpp | ||
29 | +++ b/src/gpu/jit/ngen/ngen_auto_swsb.hpp | ||
30 | @@ -28,6 +28,7 @@ | ||
31 | |||
32 | #include <list> | ||
33 | #include <map> | ||
34 | +#include <limits> | ||
35 | |||
36 | namespace ngen { | ||
37 | namespace autoswsb { | ||
diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.2.2.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.2.2.bb index 52381264..f993a88e 100644 --- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.2.2.bb +++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.2.2.bb | |||
@@ -16,6 +16,7 @@ inherit pkgconfig cmake ptest | |||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | SRCREV = "518b5e03690e142eb07934d8ddb9c3571fe4f206" | 17 | SRCREV = "518b5e03690e142eb07934d8ddb9c3571fe4f206" |
18 | SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v2.2 \ | 18 | SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v2.2 \ |
19 | file://fix-gcc-11-failures.patch \ | ||
19 | file://run-ptest \ | 20 | file://run-ptest \ |
20 | " | 21 | " |
21 | 22 | ||