Index: head/math/onednn/Makefile =================================================================== --- head/math/onednn/Makefile (revision 566621) +++ head/math/onednn/Makefile (revision 566622) @@ -1,77 +1,77 @@ # $FreeBSD$ PORTNAME= onednn DISTVERSIONPREFIX= v -DISTVERSION= 2.0 +DISTVERSION= 2.1.1 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 CMAKE_OFF= DNNL_BUILD_TESTS DNNL_BUILD_EXAMPLES OPTIONS_DEFAULT= SIMD_DEFAULT OPENMP OPTIONS_SINGLE= SIMD CPU_RUNTIME OPTIONS_SINGLE_SIMD= SIMD_DEFAULT SIMD_NATIVE OPTIONS_SINGLE_CPU_RUNTIME= OPENMP TBB SEQ THREADPOOL_STANDALONE THREADPOOL_EIGEN THREADPOOL_TBB CPU_RUNTIME_DESC= Threading runtime for CPU engines OPENMP_CMAKE_ON= -DDNNL_CPU_RUNTIME=OMP SEQ_DESC= Sequential (no parallelism) SEQ_CMAKE_ON= -DDNNL_CPU_RUNTIME=SEQ SIMD_DEFAULT_DESC= Default, no non-default SIMD instructions are used SIMD_NATIVE_DESC= Optimize for this CPU SIMD_NATIVE_CXXFLAGS= -march=native SIMD_SSE41_DESC= Use SSE4.1 instructions SIMD_SSE41_CXXFLAGS= -msse4.1 TBB_DESC= Threading Building Blocks TBB_CMAKE_ON= -DDNNL_CPU_RUNTIME=TBB TBB_BROKEN= https://github.com/oneapi-src/oneDNN/issues/876 THREADPOOL_STANDALONE_DESC= Threadpool based on the standalone implementation THREADPOOL_STANDALONE_CMAKE_ON= -DDNNL_CPU_RUNTIME=THREADPOOL -D_DNNL_TEST_THREADPOOL_IMPL=STANDALONE THREADPOOL_STANDALONE_BROKEN= https://github.com/oneapi-src/oneDNN/issues/877 THREADPOOL_EIGEN_DESC= Threadpool based on the Eigen implementation THREADPOOL_EIGEN_CMAKE_ON= -DDNNL_CPU_RUNTIME=THREADPOOL -D_DNNL_TEST_THREADPOOL_IMPL=EIGEN THREADPOOL_TBB_DESC= Threadpool based on the TBB implementation THREADPOOL_TBB_CMAKE_ON= -DDNNL_CPU_RUNTIME=THREADPOOL -D_DNNL_TEST_THREADPOOL_IMPL=TBB THREADPOOL_TBB_BROKEN= https://github.com/oneapi-src/oneDNN/issues/876 ARCH_LOCAL!= /usr/bin/uname -p # because OPTIONS_SINGLE_SIMD doesn't support per-ARCH values OPTIONS_SINGLE_SIMD_{arch}, like OPTIONS_DEFINE_{arch} .if ${ARCH_LOCAL} == i386 || ${ARCH_LOCAL} == amd64 OPTIONS_SINGLE_SIMD+= SIMD_SSE41 .endif CXXFLAGS:= ${CXXFLAGS:S/-O2/-O3/} # clang writes wrong binary code when -O2 optimization is used and one testcase is failing, see https://bugs.llvm.org/show_bug.cgi?id=48104 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} -DDNNL_BUILD_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 566621) +++ head/math/onednn/distinfo (revision 566622) @@ -1,3 +1,3 @@ -TIMESTAMP = 1609983460 -SHA256 (oneapi-src-oneDNN-v2.0_GH0.tar.gz) = 922b42c3ea7a7122a77c61568dc4512aa8130c264c0489283c989919d1f59a6d -SIZE (oneapi-src-oneDNN-v2.0_GH0.tar.gz) = 8744921 +TIMESTAMP = 1614359301 +SHA256 (oneapi-src-oneDNN-v2.1.1_GH0.tar.gz) = 9546d997b376ac0fa5f8ea29fb8a99b196aee21fc289aeb8380b1be0c3814d8b +SIZE (oneapi-src-oneDNN-v2.1.1_GH0.tar.gz) = 9272829 Index: head/math/onednn/files/patch-src_common_memory__debug.cpp =================================================================== --- head/math/onednn/files/patch-src_common_memory__debug.cpp (revision 566621) +++ head/math/onednn/files/patch-src_common_memory__debug.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- 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 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -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 (revision 566621) +++ head/math/onednn/files/patch-src_common_utils.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- 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 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/onednn/files/patch-cmake_platform.cmake =================================================================== --- head/math/onednn/files/patch-cmake_platform.cmake (revision 566621) +++ head/math/onednn/files/patch-cmake_platform.cmake (revision 566622) @@ -1,58 +1,55 @@ ---- cmake/platform.cmake.orig 2020-10-28 05:50:44 UTC +--- cmake/platform.cmake.orig 2021-02-26 17:13:42 UTC +++ cmake/platform.cmake -@@ -104,22 +104,22 @@ elseif(UNIX OR MINGW) - if(DNNL_TARGET_ARCH STREQUAL "AARCH64") - set(DEF_ARCH_OPT_FLAGS "-O3") +@@ -128,7 +128,7 @@ elseif(UNIX OR MINGW) + set(DEF_ARCH_OPT_FLAGS "-O3") + endif() # 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") +@@ -136,7 +136,7 @@ elseif(UNIX OR MINGW) + set(DEF_ARCH_OPT_FLAGS "-O3") + endif() # 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 "S390X") - set(DEF_ARCH_OPT_FLAGS "-O3") +@@ -144,10 +144,10 @@ elseif(UNIX OR MINGW) + set(DEF_ARCH_OPT_FLAGS "-O3") + endif() # 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 "-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() # Clang cannot vectorize some loops with #pragma omp simd and gets -@@ -186,24 +186,24 @@ 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") +@@ -225,7 +225,7 @@ elseif(UNIX OR MINGW) 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") endif() elseif(DNNL_TARGET_ARCH STREQUAL "S390X") - set(DEF_ARCH_OPT_FLAGS "-O3") +@@ -234,10 +234,10 @@ elseif(UNIX OR MINGW) + endif() # 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 "-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 566621) +++ head/math/onednn/pkg-plist (revision 566622) @@ -1,49 +1,49 @@ include/dnnl.h include/dnnl.hpp include/dnnl_config.h include/dnnl_debug.h include/dnnl_ocl.h include/dnnl_ocl.hpp include/dnnl_sycl.h include/dnnl_sycl.hpp include/dnnl_sycl_types.h include/dnnl_threadpool.h include/dnnl_threadpool.hpp 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 include/oneapi/dnnl/dnnl.h include/oneapi/dnnl/dnnl.hpp include/oneapi/dnnl/dnnl_config.h include/oneapi/dnnl/dnnl_debug.h include/oneapi/dnnl/dnnl_ocl.h include/oneapi/dnnl/dnnl_ocl.hpp include/oneapi/dnnl/dnnl_sycl.h include/oneapi/dnnl/dnnl_sycl.hpp include/oneapi/dnnl/dnnl_sycl_types.h include/oneapi/dnnl/dnnl_threadpool.h include/oneapi/dnnl/dnnl_threadpool.hpp include/oneapi/dnnl/dnnl_threadpool_iface.hpp include/oneapi/dnnl/dnnl_types.h include/oneapi/dnnl/dnnl_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.2 -lib/libdnnl.so.2.0 +lib/libdnnl.so.2.1 lib/libmkldnn.so lib/libmkldnn.so.2 -lib/libmkldnn.so.2.0 +lib/libmkldnn.so.2.1