Date: Mon, 16 Mar 2020 09:48:11 +0100 From: Mathieu Arnold <mat@FreeBSD.org> To: Yuri Victorovich <yuri@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r528506 - in head/math/darknet: . files Message-ID: <20200316084811.xzoqnfqh6a7zoppe@atuin.in.mat.cc> In-Reply-To: <202003152142.02FLgh3C036975@repo.freebsd.org> References: <202003152142.02FLgh3C036975@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--th6wdzrhhmiunag5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > math/darknet: Update 3-446 -> 3_optimal-30 >=20 > Added: > head/math/darknet/files/ > head/math/darknet/files/patch-CMakeLists.txt (contents, props changed) > Modified: > head/math/darknet/Makefile > head/math/darknet/distinfo >=20 > Modified: head/math/darknet/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 @@ > =20 > PORTNAME=3D darknet > DISTVERSIONPREFIX=3D darknet_yolo_v > -DISTVERSION=3D 3-446 > -DISTVERSIONSUFFIX=3D -gf2fc239 > -PORTREVISION=3D 1 > +DISTVERSION=3D 3_optimal-30 > +DISTVERSIONSUFFIX=3D -g92e6e8e So, unless I read this wrong, $ pkg version -t 3.446 3.o.30 > > PORTEPOCH=3D 1 > CATEGORIES=3D math # machine-learning > =20 > @@ -28,6 +27,10 @@ PLIST_FILES=3D bin/darknet \ > =20 > OPTIONS_DEFINE=3D OPENCV > OPTIONS_DEFAULT=3D OPENCV > +OPTIONS_DEFINE_amd64=3D SSE2 SSE3 SSE4 AVX > +OPTIONS_DEFINE_i386=3D SSE2 SSE3 SSE4 AVX > +OPTIONS_DEFAULT_amd64=3D SSE2 > +OPTIONS_DEFAULT_i386=3D SSE2 > # Many secondary functions in DarkNet depend on OpenCV which is a large = dependency. > # Build with OPENCV=3Doff for a self-contained executable which would su= pport > # core NN computations but would not support many visualization, trainin= g and > @@ -37,6 +40,17 @@ OPENCV_USES=3D pkgconfig > OPENCV_CMAKE_BOOL=3D ENABLE_OPENCV > OPENCV_LIB_DEPENDS=3D libopencv_video.so:graphics/opencv \ > libopencv_core.so:graphics/opencv-core > + > +OPTIONS_GROUP=3D SIMD > +OPTIONS_GROUP_SIMD_amd64=3D SSE2 SSE3 SSE4 AVX > +SSE2_DESC=3D Use SSE2 instructions > +SSE2_CMAKE_ON=3D -DFREEBSD_SIMD=3D"-msse2" > +SSE3_DESC=3D Use SSE3 instructions > +SSE3_CMAKE_ON=3D -DFREEBSD_SIMD=3D"-msse3" > +SSE4_DESC=3D Use SSE4 instructions > +SSE4_CMAKE_ON=3D -DFREEBSD_SIMD=3D"-msse4.1 -msse4.2 -msse4a" > +AVX_DESC=3D Use AVX instructions > +AVX_CMAKE_ON=3D -DFREEBSD_SIMD=3D"-mavx -mavx2" > =20 > do-install: # https://github.com/AlexeyAB/darknet/issues/4527 > ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darknet ${STAGEDIR}${PREFIX}/bin >=20 > Modified: head/math/darknet/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 =3D 1576460707 > -SHA256 (AlexeyAB-darknet-darknet_yolo_v3-446-gf2fc239_GH0.tar.gz) =3D db= 38891d52f8d664eeea63d8d4345b6d847a7e068f0e22c3ee9a486962e188dc > -SIZE (AlexeyAB-darknet-darknet_yolo_v3-446-gf2fc239_GH0.tar.gz) =3D 7376= 135 > +TIMESTAMP =3D 1584304739 > +SHA256 (AlexeyAB-darknet-darknet_yolo_v3_optimal-30-g92e6e8e_GH0.tar.gz)= =3D 357f8ac423129c53e052b1c3b1223ac764bd4533db030336259da449d9a1add4 > +SIZE (AlexeyAB-darknet-darknet_yolo_v3_optimal-30-g92e6e8e_GH0.tar.gz) = =3D 7394166 >=20 > Added: head/math/darknet/files/patch-CMakeLists.txt > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /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_C= XX_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_F= LAGS_RELEASE}) > +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffp-contract= =3Dfast -mavx -mavx2 -msse3 -msse4.1 -msse4.2 -msse4a") > +- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ffp-contract=3Df= ast -mavx -mavx2 -msse3 -msse4.1 -msse4.2 -msse4a") > ++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffp-contract= =3Dfast ${FREEBSD_SIMD}") > ++ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ffp-contract=3Df= ast ${FREEBSD_SIMD}") > + endif() > +=20 > + if(OpenCV_FOUND) >=20 --=20 Mathieu Arnold --th6wdzrhhmiunag5 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAl5vPUtfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD zkg1Fw//Q2uLDTbuklWgfSHOogcE7XQH0XXfb19oie4fAGScsUpuW4ydY/gVo4oR yuOBy0iLJhJSO1t3BgtcZPdRzdoq2CXKNxlu4FvykhtQUwz3rjV1BFIKpFCs+KVS H/UGWCYdzbuFlmZ6MPUKpvgWNtFelVlIWvv+8FguYZ5Vhe9l/yB8yOmIizcQcjPE WqCUpQdFGYDuWQjx5xzC6vOtqW4QhHzLCoAMQVjuWRWmKfER97ArwACTDvVy1J8s gjxGNafZjB9uTdU3yTEAn7V6/c2FW5FOFCMvY+5nYDkvmZPRHVq6ckN+xJZegnFK syde/b63eCgv3tLI7dnup8BZ4mFh1CQedL9iQ9cmtsxPqBYyDbUuFiFO/cFjXuZk YjIqXjAcytb2M8Un8i3SJdfYvIrY2cUfvy9PXVybgj7GTKvT0I2z+x+II4vDF5r9 WOtoOYqn/2q9kRsy63kTHvoTnSI5qFD7YUCrTE4oGRyApX8y+yOVTYS/IizFJCfj 0uB2Xa4tPIYg7cXfXMkrgXOAWbuUzuiChOjKWyRz54CrXTDbOQLgCpN8I/1whdRe hKFQFtsvTQFQiMPhWgfzoUAgyqmtA/dWUH2VIBhHul5X1ET1hbR536f6vh2pIRO2 eBqUYzm7DgCYevrnSrgl5MuBpybMyy0CnkZqILBWrXcpztEd7Go= =3v9J -----END PGP SIGNATURE----- --th6wdzrhhmiunag5--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200316084811.xzoqnfqh6a7zoppe>