Index: head/math/onednn/Makefile =================================================================== --- head/math/onednn/Makefile (revision 554115) +++ head/math/onednn/Makefile (revision 554116) @@ -1,50 +1,50 @@ # $FreeBSD$ PORTNAME= onednn DISTVERSIONPREFIX= v -DISTVERSION= 1.6.5 +DISTVERSION= 1.7 CATEGORIES= math # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= Intel(R) Math Kernel Library for Deep Neural Networks LICENSE= APACHE20 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 \ libsysinfo>0:devel/libsysinfo USES= cmake compiler:c++11-lang localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= oneapi-src GH_PROJECT= oneDNN USE_LDCONFIG= yes OPTIONS_DEFINE= OPENMP OPTIONS_DEFAULT= OPENMP OPENMP_CMAKE_BOOL= USE_OPENMP OPENMP_BROKEN_OFF= still requires omp.h, see https://github.com/intel/mkl-dnn/issues/581 CXXFLAGS_amd64= -msse4.1 CXXFLAGS_i386= -msse4.1 .include .if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != powerpc64 CMAKE_ARGS+= -DDNNL_TARGET_ARCH:STRING="GENERIC" .endif post-install: @${RM} -r ${STAGEDIR}${PREFIX}/share/doc 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} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include Index: head/math/onednn/distinfo =================================================================== --- head/math/onednn/distinfo (revision 554115) +++ head/math/onednn/distinfo (revision 554116) @@ -1,3 +1,3 @@ -TIMESTAMP = 1604130246 -SHA256 (oneapi-src-oneDNN-v1.6.5_GH0.tar.gz) = 6258d961fe1757b70d10cf34f0925079401ffae264f056b15024270b11d5c1eb -SIZE (oneapi-src-oneDNN-v1.6.5_GH0.tar.gz) = 5802462 +TIMESTAMP = 1604535503 +SHA256 (oneapi-src-oneDNN-v1.7_GH0.tar.gz) = 2dbd53578b36bd84bbc3e411d1a4cacc0eed832892818c5fa16b72cbf1dab015 +SIZE (oneapi-src-oneDNN-v1.7_GH0.tar.gz) = 8696108 Index: head/math/onednn/files/patch-CMakeLists.txt =================================================================== --- head/math/onednn/files/patch-CMakeLists.txt (revision 554115) +++ head/math/onednn/files/patch-CMakeLists.txt (revision 554116) @@ -1,37 +1,28 @@ ---- CMakeLists.txt.orig 2020-08-06 03:36:08 UTC +--- CMakeLists.txt.orig 2020-10-28 05:50:44 UTC +++ CMakeLists.txt -@@ -91,7 +91,7 @@ endif() - if(NOT DNNL_TARGET_ARCH) - if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)") - set(DNNL_TARGET_ARCH "AARCH64") -- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(ppc64.*|PPC64.*)") -+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(ppc64.*|PPC64.*|powerpc64.*)") - set(DNNL_TARGET_ARCH "PPC64") - else() - set(DNNL_TARGET_ARCH "X64") -@@ -113,7 +113,9 @@ include("cmake/mkldnn_compat.cmake") +@@ -115,7 +115,9 @@ include("cmake/mkldnn_compat.cmake") 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/Threadpool.cmake") include("cmake/OpenCL.cmake") -@@ -156,8 +158,12 @@ include(GNUInstallDirs) +@@ -160,8 +162,12 @@ include(GNUInstallDirs) include(CMakePackageConfigHelpers) add_subdirectory(src) -add_subdirectory(examples) -add_subdirectory(tests) +if(BUILD_EXAMPLES) + add_subdirectory(examples) +endif() +if(BUILD_TESTS) + add_subdirectory(tests) +endif() if(DNNL_INSTALL_MODE STREQUAL "BUNDLE") install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_PREFIX}) Index: head/math/onednn/files/patch-cmake_platform.cmake =================================================================== --- head/math/onednn/files/patch-cmake_platform.cmake (revision 554115) +++ head/math/onednn/files/patch-cmake_platform.cmake (revision 554116) @@ -1,43 +1,38 @@ ---- cmake/platform.cmake.orig 2020-08-06 03:36:08 UTC +--- cmake/platform.cmake.orig 2020-10-28 05:50:44 UTC +++ cmake/platform.cmake -@@ -104,16 +104,16 @@ elseif(UNIX OR MINGW) +@@ -104,22 +104,22 @@ 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 "PPC64") 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 -@@ -162,17 +162,17 @@ elseif(UNIX OR MINGW) - if(DNNL_TARGET_ARCH STREQUAL "AARCH64") + elseif(DNNL_TARGET_ARCH STREQUAL "S390X") 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") + append(DEF_ARCH_OPT_FLAGS "-march=native") endif() - elseif(DNNL_TARGET_ARCH STREQUAL "PPC64") - set(DEF_ARCH_OPT_FLAGS "-O3") - # In GCC, -ftree-vectorize is turned on under -O3 since 2007. - # 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") +- 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 +@@ -203,7 +203,7 @@ elseif(UNIX OR MINGW) + if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR) + append(DEF_ARCH_OPT_FLAGS "-march=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) Index: head/math/onednn/pkg-plist =================================================================== --- head/math/onednn/pkg-plist (revision 554115) +++ head/math/onednn/pkg-plist (revision 554116) @@ -1,28 +1,28 @@ include/dnnl.h include/dnnl.hpp include/dnnl_config.h include/dnnl_debug.h include/dnnl_threadpool_iface.hpp include/dnnl_types.h include/dnnl_version.h include/mkldnn.h include/mkldnn.hpp include/mkldnn_config.h include/mkldnn_debug.h include/mkldnn_dnnl_mangling.h include/mkldnn_types.h include/mkldnn_version.h 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.6 +lib/libdnnl.so.1.7 lib/libmkldnn.so lib/libmkldnn.so.1 -lib/libmkldnn.so.1.6 +lib/libmkldnn.so.1.7