diff --git a/math/onednn/Makefile b/math/onednn/Makefile index 4c60eb74f971..a5e2179f6dec 100644 --- a/math/onednn/Makefile +++ b/math/onednn/Makefile @@ -1,81 +1,81 @@ PORTNAME= onednn DISTVERSIONPREFIX= v -DISTVERSION= 3.4.3 +DISTVERSION= 3.5 CATEGORIES= math # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= Intel(R) Math Kernel Library for Deep Neural Networks WWW= https://github.com/oneapi-src/oneDNN LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= armv6 armv7 i386 mips powerpc powerpcspe BROKEN_aarch64= error: sys/prctl.h file not found .if !exists(/usr/include/omp.h) BROKEN= requires OpenMP support that is missing on this architecture .endif TEST_DEPENDS= bash:shells/bash \ libsysinfo>0:devel/libsysinfo USES= cmake compiler:c++11-lang localbase:ldflags USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= oneapi-src GH_PROJECT= oneDNN 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: # tests never finish, see https://github.com/oneapi-src/oneDNN/issues/1619 @${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 diff --git a/math/onednn/distinfo b/math/onednn/distinfo index e0397df3969e..133fcf649d18 100644 --- a/math/onednn/distinfo +++ b/math/onednn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716956950 -SHA256 (oneapi-src-oneDNN-v3.4.3_GH0.tar.gz) = b795dc07d0d83aaec531081e77d5fb2e503a143f4330eabe4f035d4117c191ae -SIZE (oneapi-src-oneDNN-v3.4.3_GH0.tar.gz) = 12866333 +TIMESTAMP = 1718166569 +SHA256 (oneapi-src-oneDNN-v3.5_GH0.tar.gz) = 8356aa9befde4d4ff93f1b016ac4310730b2de0cc0b8c6c7ce306690bc0d7b43 +SIZE (oneapi-src-oneDNN-v3.5_GH0.tar.gz) = 13189199 diff --git a/math/onednn/files/patch-cmake_platform.cmake b/math/onednn/files/patch-cmake_platform.cmake index e8df48bc1ce7..7ae3309c3f0e 100644 --- a/math/onednn/files/patch-cmake_platform.cmake +++ b/math/onednn/files/patch-cmake_platform.cmake @@ -1,42 +1,38 @@ ---- cmake/platform.cmake.orig 2023-11-30 15:53:57 UTC +--- cmake/platform.cmake.orig 2024-06-11 23:20:12 UTC +++ cmake/platform.cmake -@@ -223,7 +223,7 @@ elseif(UNIX OR MINGW) +@@ -242,7 +242,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") -@@ -231,10 +231,10 @@ elseif(UNIX OR MINGW) +@@ -250,7 +250,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) ++ 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 -@@ -325,7 +325,7 @@ elseif(UNIX OR MINGW) + elseif(DNNL_TARGET_ARCH STREQUAL "X64") +@@ -348,7 +348,7 @@ 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 "-mcpu=native") endif() elseif(DNNL_TARGET_ARCH STREQUAL "S390X") -@@ -334,7 +334,7 @@ elseif(UNIX OR MINGW) +@@ -357,7 +357,7 @@ 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 "RV64") diff --git a/math/onednn/pkg-plist b/math/onednn/pkg-plist index 5adc6956d2d1..d1378a72d434 100644 --- a/math/onednn/pkg-plist +++ b/math/onednn/pkg-plist @@ -1,44 +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/oneapi/dnnl/dnnl.h include/oneapi/dnnl/dnnl.hpp include/oneapi/dnnl/dnnl_common.h include/oneapi/dnnl/dnnl_common.hpp include/oneapi/dnnl/dnnl_common_types.h include/oneapi/dnnl/dnnl_config.h include/oneapi/dnnl/dnnl_debug.h include/oneapi/dnnl/dnnl_graph.h include/oneapi/dnnl/dnnl_graph.hpp +include/oneapi/dnnl/dnnl_graph_ocl.h +include/oneapi/dnnl/dnnl_graph_ocl.hpp include/oneapi/dnnl/dnnl_graph_sycl.h include/oneapi/dnnl/dnnl_graph_sycl.hpp include/oneapi/dnnl/dnnl_graph_types.h include/oneapi/dnnl/dnnl_ocl.h include/oneapi/dnnl/dnnl_ocl.hpp include/oneapi/dnnl/dnnl_ocl_types.h 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_ukernel.h +include/oneapi/dnnl/dnnl_ukernel.hpp +include/oneapi/dnnl/dnnl_ukernel_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/libdnnl.so lib/libdnnl.so.3 -lib/libdnnl.so.3.4 +lib/libdnnl.so.3.5