From owner-svn-ports-all@freebsd.org Fri Jun 19 07:18:31 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 263B4342554; Fri, 19 Jun 2020 07:18:31 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49p9Bv0G6Nz4gCW; Fri, 19 Jun 2020 07:18:31 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F3E8117719; Fri, 19 Jun 2020 07:18:30 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05J7IUeD044932; Fri, 19 Jun 2020 07:18:30 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05J7ITQ6044926; Fri, 19 Jun 2020 07:18:29 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202006190718.05J7ITQ6044926@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Fri, 19 Jun 2020 07:18:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r539595 - in head/math/onednn: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/math/onednn: . files X-SVN-Commit-Revision: 539595 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jun 2020 07:18:31 -0000 Author: yuri Date: Fri Jun 19 07:18:29 2020 New Revision: 539595 URL: https://svnweb.freebsd.org/changeset/ports/539595 Log: math/onednn: Update 1.4 -> 1.5 Reported by: portscout Added: head/math/onednn/files/patch-src_common_memory__debug.cpp (contents, props changed) head/math/onednn/files/patch-src_common_utils.cpp (contents, props changed) Modified: head/math/onednn/Makefile head/math/onednn/distinfo head/math/onednn/files/patch-cmake_platform.cmake head/math/onednn/pkg-plist Modified: head/math/onednn/Makefile ============================================================================== --- head/math/onednn/Makefile Fri Jun 19 06:55:48 2020 (r539594) +++ head/math/onednn/Makefile Fri Jun 19 07:18:29 2020 (r539595) @@ -2,11 +2,8 @@ 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 Modified: head/math/onednn/distinfo ============================================================================== --- head/math/onednn/distinfo Fri Jun 19 06:55:48 2020 (r539594) +++ head/math/onednn/distinfo Fri Jun 19 07:18:29 2020 (r539595) @@ -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 Modified: head/math/onednn/files/patch-cmake_platform.cmake ============================================================================== --- head/math/onednn/files/patch-cmake_platform.cmake Fri Jun 19 06:55:48 2020 (r539594) +++ head/math/onednn/files/patch-cmake_platform.cmake Fri Jun 19 07:18:29 2020 (r539595) @@ -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") Added: head/math/onednn/files/patch-src_common_memory__debug.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/onednn/files/patch-src_common_memory__debug.cpp Fri Jun 19 07:18:29 2020 (r539595) @@ -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 + #endif + +-#if defined __linux__ || defined __APPLE__ ++#if defined __linux__ || defined __APPLE__ || defined __FreeBSD__ + #include + #include + #endif Added: head/math/onednn/files/patch-src_common_utils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/onednn/files/patch-src_common_utils.cpp Fri Jun 19 07:18:29 2020 (r539595) @@ -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 + #endif + +-#if defined __linux__ || defined __APPLE__ ++#if defined __linux__ || defined __APPLE__ || defined __FreeBSD__ + #include + #endif + Modified: head/math/onednn/pkg-plist ============================================================================== --- head/math/onednn/pkg-plist Fri Jun 19 06:55:48 2020 (r539594) +++ head/math/onednn/pkg-plist Fri Jun 19 07:18:29 2020 (r539595) @@ -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