From owner-svn-ports-all@freebsd.org Tue Dec 24 13:40:03 2019 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 A71D41E8ACC; Tue, 24 Dec 2019 13:40:03 +0000 (UTC) (envelope-from pkubaj@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 47hy5H3qppz3MfH; Tue, 24 Dec 2019 13:40:03 +0000 (UTC) (envelope-from pkubaj@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 61216E07; Tue, 24 Dec 2019 13:40:03 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBODe39b038730; Tue, 24 Dec 2019 13:40:03 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBODe3gB038729; Tue, 24 Dec 2019 13:40:03 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201912241340.xBODe3gB038729@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Tue, 24 Dec 2019 13:40:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520806 - in head/math/mkl-dnn: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/math/mkl-dnn: . files X-SVN-Commit-Revision: 520806 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: Tue, 24 Dec 2019 13:40:03 -0000 Author: pkubaj Date: Tue Dec 24 13:40:02 2019 New Revision: 520806 URL: https://svnweb.freebsd.org/changeset/ports/520806 Log: math/mkl-dnn: fix build on non-x86 Remove hardcoded -msse4.1 and instead add it to our Makefile, but only on amd64 and i386. PR: 242847 Approved by: yuri (maintainer) Added: head/math/mkl-dnn/files/patch-cmake_platform.cmake (contents, props changed) Modified: head/math/mkl-dnn/Makefile Modified: head/math/mkl-dnn/Makefile ============================================================================== --- head/math/mkl-dnn/Makefile Tue Dec 24 13:36:50 2019 (r520805) +++ head/math/mkl-dnn/Makefile Tue Dec 24 13:40:02 2019 (r520806) @@ -11,8 +11,6 @@ COMMENT= Intel(R) Math Kernel Library for Deep Neural LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -ONLY_FOR_ARCHS= amd64 i386 -ONLY_FOR_ARCHS_REASON= Intel MKL-DNN supports Intel 64 architecture and compatible architectures 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 @@ -29,6 +27,9 @@ OPTIONS_DEFAULT= OPENMP OPENMP_CMAKE_BOOL= USE_OPENMP OPENMP_LIB_DEPENDS= libomp.so:devel/openmp OPENMP_BROKEN_OFF= still requires omp.h, see https://github.com/intel/mkl-dnn/issues/581 + +CXXFLAGS_amd64= -msse4.1 +CFXXLAGS_i386= -msse4.1 post-install: @${RM} -r ${STAGEDIR}${PREFIX}/share/doc Added: head/math/mkl-dnn/files/patch-cmake_platform.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/mkl-dnn/files/patch-cmake_platform.cmake Tue Dec 24 13:40:02 2019 (r520806) @@ -0,0 +1,18 @@ +--- cmake/platform.cmake.orig 2019-12-24 01:47:09 UTC ++++ cmake/platform.cmake +@@ -89,7 +89,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") + # 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") + 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")