math/onednn: Update 1.4 -> 1.5

Reported by:	portscout

6 files changed, 52 insertions, 26 deletions

diff --git a/math/onednn/Makefile b/math/onednn/Makefile
index 2adfe028bc3d..47f70844c0e1 100644
--- a/math/onednn/Makefile
+++ b/math/onednn/Makefile
@@ -2,12 +2,9 @@
 
 PORTNAME=	onednn
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4
+DISTVERSION=	1.5
 CATEGORIES=	math # machine-learning
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	1efd9ec1eaf351d6fa4ef614db1ef09742c85e39.patch:-p1
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Intel(R) Math Kernel Library for Deep Neural Networks
 
diff --git a/math/onednn/distinfo b/math/onednn/distinfo
index 5bd10804e067..f2230b636789 100644
--- a/math/onednn/distinfo
+++ b/math/onednn/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1587257567
-SHA256 (oneapi-src-oneDNN-v1.4_GH0.tar.gz) = 54737bcb4dc1961d32ee75da3ecc529fa48198f8b2ca863a079e19a9c4adb70f
-SIZE (oneapi-src-oneDNN-v1.4_GH0.tar.gz) = 5320976
-SHA256 (1efd9ec1eaf351d6fa4ef614db1ef09742c85e39.patch) = 14edbf9910d1ce42fec30b4305f66123812f8bacdef26e9766c055286db0e856
-SIZE (1efd9ec1eaf351d6fa4ef614db1ef09742c85e39.patch) = 855
+TIMESTAMP = 1592548152
+SHA256 (oneapi-src-oneDNN-v1.5_GH0.tar.gz) = 2aacc00129418185e0bc1269d3ef82f93f08de2c336932989c0c360279129edb
+SIZE (oneapi-src-oneDNN-v1.5_GH0.tar.gz) = 5515754
diff --git a/math/onednn/files/patch-cmake_platform.cmake b/math/onednn/files/patch-cmake_platform.cmake
index 23affea8113d..7dfc4d5d0b58 100644
--- a/math/onednn/files/patch-cmake_platform.cmake
+++ b/math/onednn/files/patch-cmake_platform.cmake
@@ -1,19 +1,24 @@
---- cmake/platform.cmake.orig	2020-03-31 16:33:27 UTC
+--- cmake/platform.cmake.orig	2020-06-05 21:56:56 UTC
 +++ cmake/platform.cmake
-@@ -95,7 +95,6 @@ elseif(UNIX OR MINGW)
-     append(CMAKE_CCXX_NOEXCEPT_FLAGS "-fno-exceptions")
-     # compiler specific settings
-     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
--        set(DEF_ARCH_OPT_FLAGS "-msse4.1")
+@@ -104,10 +104,10 @@ 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")
+              endif()
+-        elseif(DNNL_TARGET_ARCH STREQUAL "X64")
++        elseif(FALSE AND DNNL_TARGET_ARCH STREQUAL "X64")
+              set(DEF_ARCH_OPT_FLAGS "-msse4.1")
+         endif()
          # Clang cannot vectorize some loops with #pragma omp simd and gets
-         # very upset. Tell it that it's okay and that we love it
-         # unconditionally.
-@@ -144,7 +143,7 @@ elseif(UNIX OR MINGW)
-              set(DNNL_ENABLE_JIT_PROFILING CACHE BOOL "OFF" FORCE)
-              message(WARNING "AArch64 build, DNNL_ENABLE_JIT_PROFILING is OFF")
-         else()
--             set(DEF_ARCH_OPT_FLAGS "-msse4.1")
-+             #set(DEF_ARCH_OPT_FLAGS "-msse4.1")
+@@ -159,7 +159,7 @@ elseif(UNIX OR MINGW)
+              if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
+                  append(DEF_ARCH_OPT_FLAGS "-mcpu=native")
+              endif()
+-        elseif(DNNL_TARGET_ARCH STREQUAL "X64")
++        elseif(FALSE AND DNNL_TARGET_ARCH STREQUAL "X64")
+              set(DEF_ARCH_OPT_FLAGS "-msse4.1")
          endif()
          # suppress warning on assumptions made regarding overflow (#146)
-         append(CMAKE_CCXX_NOWARN_FLAGS "-Wno-strict-overflow")
diff --git a/math/onednn/files/patch-src_common_memory__debug.cpp b/math/onednn/files/patch-src_common_memory__debug.cpp
new file mode 100644
index 000000000000..8c3b0c16be69
--- /dev/null
+++ b/math/onednn/files/patch-src_common_memory__debug.cpp
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..191bda2bd25a
--- /dev/null
+++ b/math/onednn/files/patch-src_common_utils.cpp
@@ -0,0 +1,11 @@
+--- 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 81a725dffcef..3e836fe341bf 100644
--- a/math/onednn/pkg-plist
+++ b/math/onednn/pkg-plist
@@ -16,9 +16,13 @@ lib/cmake/dnnl/dnnl-config-version.cmake
 lib/cmake/dnnl/dnnl-config.cmake
 lib/cmake/dnnl/dnnl-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/dnnl/dnnl-targets.cmake
+lib/cmake/mkldnn/mkldnn-config-version.cmake
+lib/cmake/mkldnn/mkldnn-config.cmake
+lib/cmake/mkldnn/mkldnn-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/mkldnn/mkldnn-targets.cmake
 lib/libdnnl.so
 lib/libdnnl.so.1
-lib/libdnnl.so.1.4
+lib/libdnnl.so.1.5
 lib/libmkldnn.so
 lib/libmkldnn.so.1
-lib/libmkldnn.so.1.4
+lib/libmkldnn.so.1.5