Index: head/math/onednn/Makefile
===================================================================
--- head/math/onednn/Makefile	(revision 560678)
+++ head/math/onednn/Makefile	(revision 560679)
@@ -1,78 +1,77 @@
 # $FreeBSD$
 
 PORTNAME=	onednn
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7
-PORTREVISION=	3
+DISTVERSION=	2.0
 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 <bsd.port.mk>
Index: head/math/onednn/distinfo
===================================================================
--- head/math/onednn/distinfo	(revision 560678)
+++ head/math/onednn/distinfo	(revision 560679)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604535503
-SHA256 (oneapi-src-oneDNN-v1.7_GH0.tar.gz) = 2dbd53578b36bd84bbc3e411d1a4cacc0eed832892818c5fa16b72cbf1dab015
-SIZE (oneapi-src-oneDNN-v1.7_GH0.tar.gz) = 8696108
+TIMESTAMP = 1609983460
+SHA256 (oneapi-src-oneDNN-v2.0_GH0.tar.gz) = 922b42c3ea7a7122a77c61568dc4512aa8130c264c0489283c989919d1f59a6d
+SIZE (oneapi-src-oneDNN-v2.0_GH0.tar.gz) = 8744921
Index: head/math/onednn/pkg-plist
===================================================================
--- head/math/onednn/pkg-plist	(revision 560678)
+++ head/math/onednn/pkg-plist	(revision 560679)
@@ -1,28 +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.1
-lib/libdnnl.so.1.7
+lib/libdnnl.so.2
+lib/libdnnl.so.2.0
 lib/libmkldnn.so
-lib/libmkldnn.so.1
-lib/libmkldnn.so.1.7
+lib/libmkldnn.so.2
+lib/libmkldnn.so.2.0
Index: head/misc/mxnet/Makefile
===================================================================
--- head/misc/mxnet/Makefile	(revision 560678)
+++ head/misc/mxnet/Makefile	(revision 560679)
@@ -1,59 +1,60 @@
 # $FreeBSD$
 
 PORTNAME=	mxnet
 DISTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Apache MXNet: Ultra-scalable deep learning framework
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	googletest>0:devel/googletest \
 		${LOCALBASE}/include/dnnl.h:math/onednn
 LIB_DEPENDS=	libdmlc.so:devel/dmlc-core \
 		liblapack.so:math/lapack \
 		libopenblas.so:math/openblas
 
 USES=		cmake compiler:c++11-lang localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	apache
 GH_PROJECT=	incubator-mxnet
 GH_TUPLE=	apache:incubator-tvm:9bd2c7b:tvm/3rdparty/tvm \
 		dmlc:dlpack:3efc489:dlpack/3rdparty/dlpack
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	USE_CUDA USE_CUDNN USE_MKLDNN USE_NCCL ENABLE_CUDA_RTC \
 		BUILD_CPP_EXAMPLES USE_JEMALLOC USE_MKL_IF_AVAILABLE
 
 LDFLAGS+=	-pthread -lexecinfo
 
 OPTIONS_DEFINE=		CPP OPENCV
 OPTIONS_DEFAULT=	CPP OPENCV
 OPTIONS_SUB=		yes
 
 CPP_DESC=		Install the C++ binding (cpp-package)
 CPP_CMAKE_BOOL=		USE_CPP_PACKAGE
 CPP_USES=		python:build
 CPP_VARS=		BINARY_ALIAS=python=${PYTHON_CMD}
 
 OPENCV_CMAKE_BOOL=	USE_OPENCV
 OPENCV_LIB_DEPENDS=	libopencv_core.so:graphics/opencv-core \
 			libopencv_videoio.so:graphics/opencv
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != amd64 && ${ARCH} != i386
 CMAKE_OFF+=	USE_SSE
 .endif
 
 post-patch:
 	@${RM} ${WRKSRC}/include/mkldnn/*
 .for h in dnnl.h dnnl.hpp mkldnn.h mkldnn.hpp mkldnn_dnnl_mangling.h mkldnn_types.h mkldnn_version.h
 	@${LN} -s ${LOCALBASE}/include/${h} ${WRKSRC}/include/mkldnn/${h}
 .endfor
 
 post-install-CPP-on: # https://github.com/apache/incubator-mxnet/issues/17080
 	@cd ${STAGEDIR}${PREFIX} && ${RM} include/mxnet-cpp/.gitignore include/mxnet-cpp/CPPLINT.cfg
 
 .include <bsd.port.post.mk>
Index: head/misc/ngraph/Makefile
===================================================================
--- head/misc/ngraph/Makefile	(revision 560678)
+++ head/misc/ngraph/Makefile	(revision 560679)
@@ -1,52 +1,52 @@
 # $FreeBSD$
 
 PORTNAME=	ngraph
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.29.0-rc.0-345
 DISTVERSIONSUFFIX=	-g58b649aa6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc # machine-learning
 PKGNAMESUFFIX=	-machine-learning-library
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library, compiler and runtime for Deep Learning
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	onednn>0:math/onednn
 LIB_DEPENDS=	libtbb.so:devel/tbb
 
 USES=		cmake eigen:3 localbase pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	NervanaSystems
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	NGRAPH_UNIT_TEST_ENABLE NGRAPH_TEST_UTIL_ENABLE NGRAPH_TBB_ENABLE NGRAPH_JSON_ENABLE NGRAPH_MLIR_ENABLE NGRAPH_CODEGEN_ENABLE NGRAPH_STRICT_ERROR_CHECK
 CMAKE_ON=	NGRAPH_USE_PREBUILT_LLVM
 CMAKE_ARGS=	-DClang_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/clang \
 		-DTBB_ROOT=${LOCALBASE}
 
 CXXFLAGS+=	-I${LOCALBASE}/include/eigen3
 BINARY_ALIAS=	git=/usr/bin/true
 
 # ngraph uses clang from ports in a c++14 mode
 BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
 RUN_DEPENDS+=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
 CPP=		clang-cpp${LLVM_DEFAULT}
 CC=		clang${LLVM_DEFAULT}
 CXX=		clang++${LLVM_DEFAULT}
 
 OPTIONS_DEFINE=		NATIVE
 
 NATIVE_DESC=		Build with native optimizations (-march=native)
 NATIVE_CMAKE_BOOL=	NGRAPH_NATIVE_ARCH_ENABLE
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX} && \
 		${RM} -r licenses && \
 		${RM} LICENSE VERSION && \
 		${MV} cmake lib/ && \
 		${RM} -r include/ngraph/frontend/ATen
 
 .include <bsd.port.mk>