Index: head/math/onednn/Makefile =================================================================== --- head/math/onednn/Makefile (revision 539594) +++ head/math/onednn/Makefile (revision 539595) @@ -1,47 +1,44 @@ # $FreeBSD$ 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 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 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 539594) +++ head/math/onednn/distinfo (revision 539595) @@ -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 Index: head/math/onednn/files/patch-cmake_platform.cmake =================================================================== --- head/math/onednn/files/patch-cmake_platform.cmake (revision 539594) +++ head/math/onednn/files/patch-cmake_platform.cmake (revision 539595) @@ -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") Index: head/math/onednn/files/patch-src_common_memory__debug.cpp =================================================================== --- head/math/onednn/files/patch-src_common_memory__debug.cpp (nonexistent) +++ head/math/onednn/files/patch-src_common_memory__debug.cpp (revision 539595) @@ -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 Property changes on: head/math/onednn/files/patch-src_common_memory__debug.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/onednn/files/patch-src_common_utils.cpp =================================================================== --- head/math/onednn/files/patch-src_common_utils.cpp (nonexistent) +++ head/math/onednn/files/patch-src_common_utils.cpp (revision 539595) @@ -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 + Property changes on: head/math/onednn/files/patch-src_common_utils.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/onednn/pkg-plist =================================================================== --- head/math/onednn/pkg-plist (revision 539594) +++ head/math/onednn/pkg-plist (revision 539595) @@ -1,24 +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.4 +lib/libdnnl.so.1.5 lib/libmkldnn.so lib/libmkldnn.so.1 -lib/libmkldnn.so.1.4 +lib/libmkldnn.so.1.5