From owner-svn-ports-all@freebsd.org Tue Nov 20 19:21:16 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB6EF113ACEF; Tue, 20 Nov 2018 19:21:15 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 927AD7D968; Tue, 20 Nov 2018 19:21:15 +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 7544315887; Tue, 20 Nov 2018 19:21:15 +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 wAKJLFpT073922; Tue, 20 Nov 2018 19:21:15 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAKJLEIi073906; Tue, 20 Nov 2018 19:21:14 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201811201921.wAKJLEIi073906@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Tue, 20 Nov 2018 19:21:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485467 - in head/math/mkl-dnn: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/math/mkl-dnn: . files X-SVN-Commit-Revision: 485467 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 927AD7D968 X-Spamd-Result: default: False [0.45 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.00)[0.001,0]; NEURAL_SPAM_MEDIUM(0.14)[0.143,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.31)[0.310,0] X-Rspamd-Server: mx1.freebsd.org 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: Tue, 20 Nov 2018 19:21:16 -0000 Author: yuri Date: Tue Nov 20 19:21:14 2018 New Revision: 485467 URL: https://svnweb.freebsd.org/changeset/ports/485467 Log: math/mkl-dnn: Update 0.16 -> 0.17 Port changes: * Add the OPENMP option Modified: head/math/mkl-dnn/Makefile head/math/mkl-dnn/distinfo head/math/mkl-dnn/files/patch-CMakeLists.txt Modified: head/math/mkl-dnn/Makefile ============================================================================== --- head/math/mkl-dnn/Makefile Tue Nov 20 19:19:21 2018 (r485466) +++ head/math/mkl-dnn/Makefile Tue Nov 20 19:21:14 2018 (r485467) @@ -2,7 +2,7 @@ PORTNAME= mkl-dnn DISTVERSIONPREFIX= v -DISTVERSION= 0.16 +DISTVERSION= 0.17 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -26,9 +26,20 @@ PLIST_FILES= include/mkldnn.h \ include/mkldnn_types.h \ lib/libmkldnn.so \ lib/libmkldnn.so.0 \ - lib/libmkldnn.so.0.16.0 + lib/libmkldnn.so.${DISTVERSION}.0 -do-test: +OPTIONS_DEFINE= OPENMP + +OPENMP_CMAKE_BOOL= USE_OPENMP +OPENMP_LIB_DEPENDS= libomp.so:devel/openmp + +# use clang from ports because cmake can't find OpenMP with base clang, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678 +BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} +CPP= clang-cpp${LLVM_DEFAULT} +CC= clang${LLVM_DEFAULT} +CXX= clang++${LLVM_DEFAULT} + +do-test: # some tests are known to fail: https://github.com/intel/mkl-dnn/issues/350 @${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/mkl-dnn/distinfo ============================================================================== --- head/math/mkl-dnn/distinfo Tue Nov 20 19:19:21 2018 (r485466) +++ head/math/mkl-dnn/distinfo Tue Nov 20 19:21:14 2018 (r485467) @@ -1,3 +1,3 @@ -TIMESTAMP = 1536106132 -SHA256 (intel-mkl-dnn-v0.16_GH0.tar.gz) = 7557f820d6801dbe7741627199c0165fe9e651245b9c1c744d615f576da1098a -SIZE (intel-mkl-dnn-v0.16_GH0.tar.gz) = 1339496 +TIMESTAMP = 1542731420 +SHA256 (intel-mkl-dnn-v0.17_GH0.tar.gz) = 3473da3b486934da169895a7efd6421482d274601c0aed3505b127971f233a07 +SIZE (intel-mkl-dnn-v0.17_GH0.tar.gz) = 1413454 Modified: head/math/mkl-dnn/files/patch-CMakeLists.txt ============================================================================== --- head/math/mkl-dnn/files/patch-CMakeLists.txt Tue Nov 20 19:19:21 2018 (r485466) +++ head/math/mkl-dnn/files/patch-CMakeLists.txt Tue Nov 20 19:21:14 2018 (r485467) @@ -1,6 +1,17 @@ ---- CMakeLists.txt.orig 2018-09-05 00:11:53 UTC +--- CMakeLists.txt.orig 2018-11-17 00:02:10 UTC +++ CMakeLists.txt -@@ -69,7 +69,10 @@ enable_testing() +@@ -66,7 +66,9 @@ set(CMAKE_TEST_CCXX_FLAGS) # TESTS + + include("cmake/utils.cmake") + include("cmake/options.cmake") +-include("cmake/OpenMP.cmake") ++if (USE_OPENMP) ++ include("cmake/OpenMP.cmake") ++endif() + include("cmake/TBB.cmake") + include("cmake/platform.cmake") + include("cmake/SDL.cmake") +@@ -79,7 +81,10 @@ enable_testing() include_directories(include) add_subdirectory(src)