6 files changed, 19 insertions, 44 deletions

diff --git a/math/onednn/Makefile b/math/onednn/Makefile
index 5b9129255e8c..95a67d8871ac 100644
--- a/math/onednn/Makefile
+++ b/math/onednn/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	onednn
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0
+DISTVERSION=	2.1.1
 CATEGORIES=	math # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/math/onednn/distinfo b/math/onednn/distinfo
index b6298f3547b9..5571bbded101 100644
--- a/math/onednn/distinfo
+++ b/math/onednn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609983460
-SHA256 (oneapi-src-oneDNN-v2.0_GH0.tar.gz) = 922b42c3ea7a7122a77c61568dc4512aa8130c264c0489283c989919d1f59a6d
-SIZE (oneapi-src-oneDNN-v2.0_GH0.tar.gz) = 8744921
+TIMESTAMP = 1614359301
+SHA256 (oneapi-src-oneDNN-v2.1.1_GH0.tar.gz) = 9546d997b376ac0fa5f8ea29fb8a99b196aee21fc289aeb8380b1be0c3814d8b
+SIZE (oneapi-src-oneDNN-v2.1.1_GH0.tar.gz) = 9272829
diff --git a/math/onednn/files/patch-cmake_platform.cmake b/math/onednn/files/patch-cmake_platform.cmake
index ce18aaa0fa84..9a54f52bbe93 100644
--- a/math/onednn/files/patch-cmake_platform.cmake
+++ b/math/onednn/files/patch-cmake_platform.cmake
@@ -1,22 +1,26 @@
---- cmake/platform.cmake.orig	2020-10-28 05:50:44 UTC
+--- cmake/platform.cmake.orig	2021-02-26 17:13:42 UTC
 +++ cmake/platform.cmake
-@@ -104,22 +104,22 @@ elseif(UNIX OR MINGW)
-         if(DNNL_TARGET_ARCH STREQUAL "AARCH64")
-              set(DEF_ARCH_OPT_FLAGS "-O3")
+@@ -128,7 +128,7 @@ elseif(UNIX OR MINGW)
+                  set(DEF_ARCH_OPT_FLAGS "-O3")
+              endif()
               # For native compilation tune for the host processor
 -             if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
 +             if (FALSE AND CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
                   append(DEF_ARCH_OPT_FLAGS "-mcpu=native")
               endif()
          elseif(DNNL_TARGET_ARCH STREQUAL "PPC64")
-              set(DEF_ARCH_OPT_FLAGS "-O3")
+@@ -136,7 +136,7 @@ elseif(UNIX OR MINGW)
+                  set(DEF_ARCH_OPT_FLAGS "-O3")
+              endif()
               # For native compilation tune for the host processor
 -             if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
 +             if (FALSE AND CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
                   append(DEF_ARCH_OPT_FLAGS "-mcpu=native")
               endif()
          elseif(DNNL_TARGET_ARCH STREQUAL "S390X")
-              set(DEF_ARCH_OPT_FLAGS "-O3")
+@@ -144,10 +144,10 @@ elseif(UNIX OR MINGW)
+                  set(DEF_ARCH_OPT_FLAGS "-O3")
+              endif()
               # For native compilation tune for the host processor
 -             if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
 +             if (FALSE AND CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
@@ -27,16 +31,8 @@
               set(DEF_ARCH_OPT_FLAGS "-msse4.1")
          endif()
          # Clang cannot vectorize some loops with #pragma omp simd and gets
-@@ -186,24 +186,24 @@ elseif(UNIX OR MINGW)
-         if(DNNL_TARGET_ARCH STREQUAL "AARCH64")
-              set(DEF_ARCH_OPT_FLAGS "-O3")
-              # For native compilation tune for the host processor
--             if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
-+             if (FALSE AND CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
-                  append(DEF_ARCH_OPT_FLAGS "-mcpu=native")
+@@ -225,7 +225,7 @@ elseif(UNIX OR MINGW)
               endif()
-         elseif(DNNL_TARGET_ARCH STREQUAL "PPC64")
-              set(DEF_ARCH_OPT_FLAGS "-O3")
               # In GCC, -ftree-vectorize is turned on under -O3 since 2007.
               # For native compilation tune for the host processor
 -             if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
@@ -44,7 +40,8 @@
                   append(DEF_ARCH_OPT_FLAGS "-mcpu=native")
               endif()
          elseif(DNNL_TARGET_ARCH STREQUAL "S390X")
-              set(DEF_ARCH_OPT_FLAGS "-O3")
+@@ -234,10 +234,10 @@ elseif(UNIX OR MINGW)
+              endif()
               # In GCC, -ftree-vectorize is turned on under -O3 since 2007.
               # For native compilation tune for the host processor
 -             if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
diff --git a/math/onednn/files/patch-src_common_memory__debug.cpp b/math/onednn/files/patch-src_common_memory__debug.cpp
deleted file mode 100644
index 8c3b0c16be69..000000000000
--- a/math/onednn/files/patch-src_common_memory__debug.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/memory_debug.cpp.orig	2020-06-19 06:42:33 UTC
-+++ src/common/memory_debug.cpp
-@@ -21,7 +21,7 @@
- #include <windows.h>
- #endif
- 
--#if defined __linux__ || defined __APPLE__
-+#if defined __linux__ || defined __APPLE__ || defined __FreeBSD__
- #include <unistd.h>
- #include <sys/mman.h>
- #endif
diff --git a/math/onednn/files/patch-src_common_utils.cpp b/math/onednn/files/patch-src_common_utils.cpp
deleted file mode 100644
index 191bda2bd25a..000000000000
--- a/math/onednn/files/patch-src_common_utils.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/utils.cpp.orig	2020-06-19 06:53:00 UTC
-+++ src/common/utils.cpp
-@@ -19,7 +19,7 @@
- #include <windows.h>
- #endif
- 
--#if defined __linux__ || defined __APPLE__
-+#if defined __linux__ || defined __APPLE__ || defined __FreeBSD__
- #include <unistd.h>
- #endif
- 
diff --git a/math/onednn/pkg-plist b/math/onednn/pkg-plist
index 0dfe9b41954d..8ff50ac9f3ff 100644
--- a/math/onednn/pkg-plist
+++ b/math/onednn/pkg-plist
@@ -43,7 +43,7 @@ lib/cmake/mkldnn/mkldnn-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/mkldnn/mkldnn-targets.cmake
 lib/libdnnl.so
 lib/libdnnl.so.2
-lib/libdnnl.so.2.0
+lib/libdnnl.so.2.1
 lib/libmkldnn.so
 lib/libmkldnn.so.2
-lib/libmkldnn.so.2.0
+lib/libmkldnn.so.2.1