svn commit: r528506 - in head/math/darknet: . files

[Mathieu Arnold]

On Sun, Mar 15, 2020 at 09:42:43PM +0000, Yuri Victorovich wrote:
> Author: yuri
> Date: Sun Mar 15 21:42:43 2020
> New Revision: 528506
> URL: https://svnweb.freebsd.org/changeset/ports/528506
> 
> Log:
>   math/darknet: Update 3-446 -> 3_optimal-30
> 
> Added:
>   head/math/darknet/files/
>   head/math/darknet/files/patch-CMakeLists.txt   (contents, props changed)
> Modified:
>   head/math/darknet/Makefile
>   head/math/darknet/distinfo
> 
> Modified: head/math/darknet/Makefile
> ==============================================================================
> --- head/math/darknet/Makefile	Sun Mar 15 21:20:19 2020	(r528505)
> +++ head/math/darknet/Makefile	Sun Mar 15 21:42:43 2020	(r528506)
> @@ -2,9 +2,8 @@
>  
>  PORTNAME=	darknet
>  DISTVERSIONPREFIX=	darknet_yolo_v
> -DISTVERSION=	3-446
> -DISTVERSIONSUFFIX=	-gf2fc239
> -PORTREVISION=	1
> +DISTVERSION=	3_optimal-30
> +DISTVERSIONSUFFIX=	-g92e6e8e

So, unless I read this wrong,

$ pkg version -t 3.446 3.o.30
>



>  PORTEPOCH=	1
>  CATEGORIES=	math # machine-learning
>  
> @@ -28,6 +27,10 @@ PLIST_FILES=	bin/darknet \
>  
>  OPTIONS_DEFINE=		OPENCV
>  OPTIONS_DEFAULT=	OPENCV
> +OPTIONS_DEFINE_amd64=	SSE2 SSE3 SSE4 AVX
> +OPTIONS_DEFINE_i386=	SSE2 SSE3 SSE4 AVX
> +OPTIONS_DEFAULT_amd64=	SSE2
> +OPTIONS_DEFAULT_i386=	SSE2
>  # Many secondary functions in DarkNet depend on OpenCV which is a large dependency.
>  # Build with OPENCV=off for a self-contained executable which would support
>  # core NN computations but would not support many visualization, training and
> @@ -37,6 +40,17 @@ OPENCV_USES=		pkgconfig
>  OPENCV_CMAKE_BOOL=	ENABLE_OPENCV
>  OPENCV_LIB_DEPENDS=	libopencv_video.so:graphics/opencv \
>  			libopencv_core.so:graphics/opencv-core
> +
> +OPTIONS_GROUP=	SIMD
> +OPTIONS_GROUP_SIMD_amd64=	SSE2 SSE3 SSE4 AVX
> +SSE2_DESC=		Use SSE2 instructions
> +SSE2_CMAKE_ON=		-DFREEBSD_SIMD="-msse2"
> +SSE3_DESC=		Use SSE3 instructions
> +SSE3_CMAKE_ON=		-DFREEBSD_SIMD="-msse3"
> +SSE4_DESC=		Use SSE4 instructions
> +SSE4_CMAKE_ON=		-DFREEBSD_SIMD="-msse4.1 -msse4.2 -msse4a"
> +AVX_DESC=		Use AVX instructions
> +AVX_CMAKE_ON=		-DFREEBSD_SIMD="-mavx -mavx2"
>  
>  do-install: # https://github.com/AlexeyAB/darknet/issues/4527
>  	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darknet ${STAGEDIR}${PREFIX}/bin
> 
> Modified: head/math/darknet/distinfo
> ==============================================================================
> --- head/math/darknet/distinfo	Sun Mar 15 21:20:19 2020	(r528505)
> +++ head/math/darknet/distinfo	Sun Mar 15 21:42:43 2020	(r528506)
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1576460707
> -SHA256 (AlexeyAB-darknet-darknet_yolo_v3-446-gf2fc239_GH0.tar.gz) = db38891d52f8d664eeea63d8d4345b6d847a7e068f0e22c3ee9a486962e188dc
> -SIZE (AlexeyAB-darknet-darknet_yolo_v3-446-gf2fc239_GH0.tar.gz) = 7376135
> +TIMESTAMP = 1584304739
> +SHA256 (AlexeyAB-darknet-darknet_yolo_v3_optimal-30-g92e6e8e_GH0.tar.gz) = 357f8ac423129c53e052b1c3b1223ac764bd4533db030336259da449d9a1add4
> +SIZE (AlexeyAB-darknet-darknet_yolo_v3_optimal-30-g92e6e8e_GH0.tar.gz) = 7394166
> 
> Added: head/math/darknet/files/patch-CMakeLists.txt
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/math/darknet/files/patch-CMakeLists.txt	Sun Mar 15 21:42:43 2020	(r528506)
> @@ -0,0 +1,13 @@
> +--- CMakeLists.txt.orig	2019-12-17 03:49:21 UTC
> ++++ CMakeLists.txt
> +@@ -158,8 +158,8 @@ if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_CXX_COMPILER_ID
> +   string(REGEX REPLACE "-O3" "-Ofast" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
> +   string(REGEX REPLACE "-O0" "-Og" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
> +   string(REGEX REPLACE "-O3" "-Ofast" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
> +-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffp-contract=fast -mavx -mavx2 -msse3 -msse4.1 -msse4.2 -msse4a")
> +-  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ffp-contract=fast -mavx -mavx2 -msse3 -msse4.1 -msse4.2 -msse4a")
> ++  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffp-contract=fast ${FREEBSD_SIMD}")
> ++  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ffp-contract=fast ${FREEBSD_SIMD}")
> + endif()
> + 
> + if(OpenCV_FOUND)
> 

-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20200316/ebabc3f6/attachment.sig>