Index: head/math/mkl-dnn/Makefile =================================================================== --- head/math/mkl-dnn/Makefile (revision 485466) +++ head/math/mkl-dnn/Makefile (revision 485467) @@ -1,38 +1,49 @@ # $FreeBSD$ PORTNAME= mkl-dnn DISTVERSIONPREFIX= v -DISTVERSION= 0.16 +DISTVERSION= 0.17 CATEGORIES= math 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 USES= cmake:outsource compiler:c++11-lib USE_GITHUB= yes GH_ACCOUNT= intel USE_LDCONFIG= yes PLIST_FILES= include/mkldnn.h \ include/mkldnn.hpp \ include/mkldnn_debug.h \ include/mkldnn_types.h \ lib/libmkldnn.so \ lib/libmkldnn.so.0 \ - lib/libmkldnn.so.0.16.0 + lib/libmkldnn.so.${DISTVERSION}.0 -do-test: +OPTIONS_DEFINE= OPENMP + +OPENMP_CMAKE_BOOL= USE_OPENMP +OPENMP_LIB_DEPENDS= libomp.so:devel/openmp + +# use clang from ports because cmake can't find OpenMP with base clang, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678 +BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} +CPP= clang-cpp${LLVM_DEFAULT} +CC= clang${LLVM_DEFAULT} +CXX= clang++${LLVM_DEFAULT} + +do-test: # some tests are known to fail: https://github.com/intel/mkl-dnn/issues/350 @${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/mkl-dnn/distinfo =================================================================== --- head/math/mkl-dnn/distinfo (revision 485466) +++ head/math/mkl-dnn/distinfo (revision 485467) @@ -1,3 +1,3 @@ -TIMESTAMP = 1536106132 -SHA256 (intel-mkl-dnn-v0.16_GH0.tar.gz) = 7557f820d6801dbe7741627199c0165fe9e651245b9c1c744d615f576da1098a -SIZE (intel-mkl-dnn-v0.16_GH0.tar.gz) = 1339496 +TIMESTAMP = 1542731420 +SHA256 (intel-mkl-dnn-v0.17_GH0.tar.gz) = 3473da3b486934da169895a7efd6421482d274601c0aed3505b127971f233a07 +SIZE (intel-mkl-dnn-v0.17_GH0.tar.gz) = 1413454 Index: head/math/mkl-dnn/files/patch-CMakeLists.txt =================================================================== --- head/math/mkl-dnn/files/patch-CMakeLists.txt (revision 485466) +++ head/math/mkl-dnn/files/patch-CMakeLists.txt (revision 485467) @@ -1,17 +1,28 @@ ---- CMakeLists.txt.orig 2018-09-05 00:11:53 UTC +--- CMakeLists.txt.orig 2018-11-17 00:02:10 UTC +++ CMakeLists.txt -@@ -69,7 +69,10 @@ enable_testing() +@@ -66,7 +66,9 @@ set(CMAKE_TEST_CCXX_FLAGS) # TESTS + + 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/platform.cmake") + include("cmake/SDL.cmake") +@@ -79,7 +81,10 @@ enable_testing() include_directories(include) add_subdirectory(src) -add_subdirectory(examples) -add_subdirectory(tests) - -install(FILES LICENSE DESTINATION share/doc/${LIB_NAME}) +if(BUILD_EXAMPLES) + add_subdirectory(examples) +endif() +if(BUILD_TESTS) + add_subdirectory(tests) +endif() +#install(FILES LICENSE DESTINATION share/doc/${LIB_NAME})