Skip to content

Commit 96d0c2e

Browse files
committed
Upgrade oneDNN to v3.9
Fix CI failures Fix bazel build failure
1 parent 3e5e094 commit 96d0c2e

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

third_party/mkl-dnn.BUILD

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ _DNNL_RUNTIME_OMP = {
1515
"#cmakedefine DNNL_ENABLE_STACK_CHECKER": "#undef DNNL_ENABLE_STACK_CHECKER",
1616
"#cmakedefine DNNL_EXPERIMENTAL_UKERNEL": "/* undef DNNL_EXPERIMENTAL_UKERNEL */",
1717
"#cmakedefine DNNL_EXPERIMENTAL": "#undef DNNL_EXPERIMENTAL",
18-
"#cmakedefine DNNL_EXPERIMENTAL_SPARSE": "#undef DNNL_EXPERIMENTAL_SPARSE",
1918
"#cmakedefine ONEDNN_BUILD_GRAPH": "#undef ONEDNN_BUILD_GRAPH",
2019
"#cmakedefine DNNL_EXPERIMENTAL_PROFILING": "#undef DNNL_EXPERIMENTAL_PROFILING",
20+
"#cmakedefine DNNL_EXPERIMENTAL_LOGGING": "#undef DNNL_EXPERIMENTAL_LOGGING",
21+
"#cmakedefine DNNL_EXPERIMENTAL_SYCL_KERNEL_COMPILER": "#undef DNNL_EXPERIMENTAL_SYCL_KERNEL_COMPILER",
2122
"#cmakedefine DNNL_DISABLE_GPU_REF_KERNELS": "#undef DNNL_DISABLE_GPU_REF_KERNELS",
2223
"#cmakedefine01 BUILD_TRAINING": "#define BUILD_TRAINING 1",
2324
"#cmakedefine01 BUILD_INFERENCE": "#define BUILD_INFERENCE 0",
@@ -49,8 +50,6 @@ _DNNL_RUNTIME_OMP = {
4950
"#cmakedefine01 BUILD_AVX512": "#define BUILD_AVX512 0",
5051
"#cmakedefine01 BUILD_AMX": "#define BUILD_AMX 0",
5152
"#cmakedefine01 BUILD_PRIMITIVE_GPU_ISA_ALL": "#define BUILD_PRIMITIVE_GPU_ISA_ALL 1",
52-
"#cmakedefine01 BUILD_GEN9": "#define BUILD_GEN9 0",
53-
"#cmakedefine01 BUILD_GEN11": "#define BUILD_GEN11 0",
5453
"#cmakedefine01 BUILD_XELP": "#define BUILD_XELP 0",
5554
"#cmakedefine01 BUILD_XEHPG": "#define BUILD_XEHPG 0",
5655
"#cmakedefine01 BUILD_XEHPC": "#define BUILD_XEHPC 0",
@@ -70,8 +69,8 @@ template_rule(
7069
out = "include/oneapi/dnnl/dnnl_version.h",
7170
substitutions = {
7271
"@DNNL_VERSION_MAJOR@": "3",
73-
"@DNNL_VERSION_MINOR@": "7",
74-
"@DNNL_VERSION_PATCH@": "1",
72+
"@DNNL_VERSION_MINOR@": "9",
73+
"@DNNL_VERSION_PATCH@": "0",
7574
},
7675
)
7776

@@ -86,7 +85,7 @@ template_rule(
8685
name = "include_dnnl_version_hash",
8786
src = "include/oneapi/dnnl/dnnl_version_hash.h.in",
8887
out = "include/oneapi/dnnl/dnnl_version_hash.h",
89-
substitutions = {"@DNNL_VERSION_HASH@": "8d263e693366ef8db40acc569cc7d8edf644556d",}
88+
substitutions = {"@DNNL_VERSION_HASH@": "56e10537b8d046f9a3a7c971e48d394948150b4a",}
9089
)
9190

9291
cc_library(
@@ -99,6 +98,7 @@ cc_library(
9998
"src/cpu/aarch64/**/*.cpp",
10099
"src/cpu/rv64/**/*.cpp",
101100
"src/cpu/sycl/**/*.cpp",
101+
"src/cpu/ppc64/**/*.cpp",
102102
]),
103103
hdrs = glob([
104104
"include/oneapi/dnnl/*.h",
@@ -110,13 +110,16 @@ cc_library(
110110
"src/cpu/**/**/*.h",
111111
"src/common/*.hpp",
112112
"src/common/**/**/*.h",
113-
"src/common/ittnotify/jitprofiling.h",
113+
"third_party/xbyak/*.h",
114+
"third_party/ittnotify/jitprofiling.h",
115+
"third_party/spdlog/**/*.h",
114116
], exclude=[
115117
"src/cpu/aarch64/**/*.hpp",
116118
"src/cpu/aarch64/**/*.h",
117119
"src/cpu/rv64/**/*.hpp",
118120
"src/cpu/rv64/**/*.h",
119121
"src/cpu/sycl/**/*.hpp",
122+
"src/cpu/ppc64/**/*.hpp",
120123
]) + [
121124
"include/oneapi/dnnl/dnnl_config.h",
122125
"include/oneapi/dnnl/dnnl_version.h",
@@ -141,7 +144,7 @@ cc_library(
141144
"src/",
142145
"src/common/",
143146
"src/cpu/",
144-
"src/cpu/x64/xbyak/",
147+
"third_party/",
145148
],
146149
visibility = ["//visibility:public"],
147150
linkopts = [

0 commit comments

Comments
 (0)