From owner-svn-ports-all@freebsd.org Sat Apr 4 07:13:48 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 43C2A2A2916; Sat, 4 Apr 2020 07:13:48 +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) server-signature RSA-PSS (4096 bits) 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 48vShV6D03z4bbV; Sat, 4 Apr 2020 07:13:46 +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 F09FB1C676; Sat, 4 Apr 2020 07:13:36 +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 0347Dau2034918; Sat, 4 Apr 2020 07:13:36 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0347DZwA034908; Sat, 4 Apr 2020 07:13:35 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202004040713.0347DZwA034908@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 4 Apr 2020 07:13:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530557 - in head: math math/mkl-dnn math/onednn math/onednn/files misc/mxnet X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head: math math/mkl-dnn math/onednn math/onednn/files misc/mxnet X-SVN-Commit-Revision: 530557 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.29 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: Sat, 04 Apr 2020 07:13:48 -0000 Author: yuri Date: Sat Apr 4 07:13:35 2020 New Revision: 530557 URL: https://svnweb.freebsd.org/changeset/ports/530557 Log: math/mkl-dnn: Rename to math/onednn; Update 1.2.2 -> 1.3 The project is renamed by the upstream. Added: head/math/onednn/ - copied from r530556, head/math/mkl-dnn/ Deleted: head/math/mkl-dnn/ Modified: head/math/Makefile head/math/onednn/Makefile head/math/onednn/distinfo head/math/onednn/files/patch-CMakeLists.txt head/math/onednn/files/patch-cmake_platform.cmake head/math/onednn/pkg-plist head/misc/mxnet/Makefile Modified: head/math/Makefile ============================================================================== --- head/math/Makefile Sat Apr 4 07:03:09 2020 (r530556) +++ head/math/Makefile Sat Apr 4 07:13:35 2020 (r530557) @@ -394,7 +394,6 @@ SUBDIR += mingw32-libgmp SUBDIR += minisat SUBDIR += miracl - SUBDIR += mkl-dnn SUBDIR += mlpack SUBDIR += moab SUBDIR += moo @@ -511,6 +510,7 @@ SUBDIR += octave-forge-zeromq SUBDIR += octomap SUBDIR += oleo + SUBDIR += onednn SUBDIR += openblas SUBDIR += openfst SUBDIR += openlibm Modified: head/math/onednn/Makefile ============================================================================== --- head/math/mkl-dnn/Makefile Sat Apr 4 07:03:09 2020 (r530556) +++ head/math/onednn/Makefile Sat Apr 4 07:13:35 2020 (r530557) @@ -1,10 +1,13 @@ # $FreeBSD$ -PORTNAME= mkl-dnn +PORTNAME= onednn DISTVERSIONPREFIX= v -DISTVERSION= 1.2.2 +DISTVERSION= 1.3 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 @@ -13,12 +16,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= error: shift count >= width of type (and other errors), see https://github.com/intel/mkl-dnn/issues/315 -TEST_DEPENDS= bash:shells/bash +TEST_DEPENDS= bash:shells/bash \ + libsysinfo>0:devel/libsysinfo -USES= cmake compiler:c++11-lang +USES= cmake compiler:c++11-lang localbase:ldflags USE_GITHUB= yes -GH_ACCOUNT= intel -GH_TAGNAME= f32e21b +GH_ACCOUNT= oneapi-src +GH_PROJECT= oneDNN USE_LDCONFIG= yes OPTIONS_DEFINE= OPENMP @@ -33,7 +37,7 @@ CXXFLAGS_i386= -msse4.1 post-install: @${RM} -r ${STAGEDIR}${PREFIX}/share/doc -do-test: # some tests are known to fail: https://github.com/intel/mkl-dnn/issues/350 +do-test: # some tests are known to fail: https://github.com/intel/mkl-dnn/issues/350 (the upstream failed to reproduce it and closed the report) @${REINPLACE_CMD} 's| /bin/bash | ${LOCALBASE}/bin/bash |' ${WRKSRC}/tests/CMakeLists.txt @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS=ON ${CMAKE_SOURCE_PATH} && \ Modified: head/math/onednn/distinfo ============================================================================== --- head/math/mkl-dnn/distinfo Sat Apr 4 07:03:09 2020 (r530556) +++ head/math/onednn/distinfo Sat Apr 4 07:13:35 2020 (r530557) @@ -1,3 +1,5 @@ -TIMESTAMP = 1584687013 -SHA256 (intel-mkl-dnn-v1.2.2-f32e21b_GH0.tar.gz) = afc2bbbd89fcfbc713537ed6ee1d66ea5cefb1c2e6ab4ca9c76f5ea36fd797cd -SIZE (intel-mkl-dnn-v1.2.2-f32e21b_GH0.tar.gz) = 4558242 +TIMESTAMP = 1585981063 +SHA256 (oneapi-src-oneDNN-v1.3_GH0.tar.gz) = b87c23b40a93ef5e479c81028db71c4847225b1a170f82af5e79f1cda826d3bf +SIZE (oneapi-src-oneDNN-v1.3_GH0.tar.gz) = 5173993 +SHA256 (1efd9ec1eaf351d6fa4ef614db1ef09742c85e39.patch) = 14edbf9910d1ce42fec30b4305f66123812f8bacdef26e9766c055286db0e856 +SIZE (1efd9ec1eaf351d6fa4ef614db1ef09742c85e39.patch) = 855 Modified: head/math/onednn/files/patch-CMakeLists.txt ============================================================================== --- head/math/mkl-dnn/files/patch-CMakeLists.txt Sat Apr 4 07:03:09 2020 (r530556) +++ head/math/onednn/files/patch-CMakeLists.txt Sat Apr 4 07:13:35 2020 (r530557) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2019-05-18 21:55:29 UTC +--- CMakeLists.txt.orig 2020-03-31 16:33:27 UTC +++ CMakeLists.txt -@@ -73,7 +73,9 @@ include(CMakePackageConfigHelpers) +@@ -92,7 +92,9 @@ include("cmake/mkldnn_compat.cmake") include("cmake/utils.cmake") include("cmake/options.cmake") @@ -9,10 +9,10 @@ + include("cmake/OpenMP.cmake") +endif() include("cmake/TBB.cmake") + include("cmake/OpenCL.cmake") include("cmake/platform.cmake") - include("cmake/SDL.cmake") -@@ -87,8 +89,12 @@ enable_testing() - include_directories(include) +@@ -133,8 +135,12 @@ include(GNUInstallDirs) + include(CMakePackageConfigHelpers) add_subdirectory(src) -add_subdirectory(examples) @@ -24,5 +24,5 @@ + add_subdirectory(tests) +endif() - if(MKLDNN_INSTALL_MODE STREQUAL "BUNDLE") + if(DNNL_INSTALL_MODE STREQUAL "BUNDLE") install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_PREFIX}) Modified: head/math/onednn/files/patch-cmake_platform.cmake ============================================================================== --- head/math/mkl-dnn/files/patch-cmake_platform.cmake Sat Apr 4 07:03:09 2020 (r530556) +++ head/math/onednn/files/patch-cmake_platform.cmake Sat Apr 4 07:13:35 2020 (r530557) @@ -1,6 +1,6 @@ ---- cmake/platform.cmake.orig 2019-12-24 01:47:09 UTC +--- cmake/platform.cmake.orig 2020-03-31 16:33:27 UTC +++ cmake/platform.cmake -@@ -89,7 +89,6 @@ elseif(UNIX OR MINGW) +@@ -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") @@ -8,11 +8,12 @@ # 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. -@@ -133,7 +132,6 @@ elseif(UNIX OR MINGW) - append(CMAKE_CCXX_SANITIZER_FLAGS "-g -fno-omit-frame-pointer") +@@ -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") endif() - elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") -- set(DEF_ARCH_OPT_FLAGS "-msse4.1") # suppress warning on assumptions made regarding overflow (#146) append(CMAKE_CCXX_NOWARN_FLAGS "-Wno-strict-overflow") - elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") Modified: head/math/onednn/pkg-plist ============================================================================== --- head/math/mkl-dnn/pkg-plist Sat Apr 4 07:03:09 2020 (r530556) +++ head/math/onednn/pkg-plist Sat Apr 4 07:13:35 2020 (r530557) @@ -17,7 +17,7 @@ lib/cmake/dnnl/dnnl-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/dnnl/dnnl-targets.cmake lib/libdnnl.so lib/libdnnl.so.1 -lib/libdnnl.so.1.1 +lib/libdnnl.so.1.3 lib/libmkldnn.so lib/libmkldnn.so.1 -lib/libmkldnn.so.1.1 +lib/libmkldnn.so.1.3 Modified: head/misc/mxnet/Makefile ============================================================================== --- head/misc/mxnet/Makefile Sat Apr 4 07:03:09 2020 (r530556) +++ head/misc/mxnet/Makefile Sat Apr 4 07:13:35 2020 (r530557) @@ -3,7 +3,7 @@ PORTNAME= mxnet DISTVERSION= 1.6.0 DISTVERSIONSUFFIX= .rc0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc # machine-learning PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -16,7 +16,7 @@ COMMENT= Apache MXNet: Ultra-scalable deep learning fr LICENSE= APACHE20 BUILD_DEPENDS= googletest>0:devel/googletest \ - ${LOCALBASE}/include/dnnl.h:math/mkl-dnn + ${LOCALBASE}/include/dnnl.h:math/onednn LIB_DEPENDS= libdmlc.so:devel/dmlc-core \ liblapack.so:math/lapack \ libopenblas.so:math/openblas