From nobody Thu Mar 14 17:44:10 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TwZWG2FNTz5DTtC; Thu, 14 Mar 2024 17:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TwZWG1cdrz4GlM; Thu, 14 Mar 2024 17:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710438250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=daeVh6zRlotiK/9EJVP/Bm8IkMXPziBpqIxrjbiP+vE=; b=rYmkTj5arTatf5et04EVRm1E0NGtSrbv5cG9I4IVJrQEXYqI23VKKzWq0KE2VEIEtdnjUn DUIiIZO4ZKT9X8vNzoVhqLGyqXdSj/4B4sYJwyhBF1XQgxEjoVAnZan8L+24Rh532meHqK qdGKiH7iSy7OkH4kNENs5mWXcnNh1FDfv4Z3pQhH40b6B0V2ViNdoF5+TaI4UZOSY0J+op MNfn7+nUZx+TxH3DcuLf4NFxjUm0KLMIvB/M1uYtQk505pSlqrZSRmVJeLD/rpI49H1X1W qKW7MtDR/Oki11TyXz+7NjwbZZvBAM6PRq7+ohuSeSz0rjYcbeBHgexLuJDoCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710438250; a=rsa-sha256; cv=none; b=JTMKL5iPogC/Las/QLDitwTpYsm1ernhvaQBA+MOpy1WtC38OqLzB2J6VFCCzPZ8V/TFo5 LAttdMb8ALyIpnCWifDrs6B6iFzzrT5kJ+8cAbM8GQdEHWLI2LhAJ9vmq4+kkY8aftE4LT ZDmVyPfdyF+mqMqE2mbdfWmvZ8TbJRzdNC3gixrg33pt52qcOqZGRv//WNbSNPhDJwpkbb iTM2vZQwTPDrk8vBPqLL+WrfPltVjN0g76q6WA8eVKPD+3P+2smq51rovUHdN/9MPWRdZp C1IVNao321CsSy4OblDFBnl7AFlmcFtctFpkfEuZFrZ0RLbb6QrGeyX0XxcEtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710438250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=daeVh6zRlotiK/9EJVP/Bm8IkMXPziBpqIxrjbiP+vE=; b=U2e/suXbGHcZ3KGG5HLRAaLtlKg445L2p7X5KnvN3C9jPK1yxye1v04ilntF4WVgIdQ/eB 8a9YOlC+OU49EOHUvWzF5dnEIGYqUiAR1j1OqAQpOf4/j8DmSWt5EWNuQfTqWRSeCR50Ia 7s12/ruLWUo97y6Me4qh1HnENwbp6FTuEfKdgG+s+2SwJdXEaAgMm4FVKnywwtF0WAoYel 6rZgJXFlJO6Nq63jaOVv67c+bfzw4mb6ejmIumJVjpuVKv9+mozb9lI/B8LJsc0iPW7nlx A8XMFBuGvH54FHdqxtDCBm9eCC4oznOVzEiAXv6YH45KOLeePPkoxiakeGslwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TwZWG1DQLzcPY; Thu, 14 Mar 2024 17:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42EHiA2h052437; Thu, 14 Mar 2024 17:44:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42EHiA6f052434; Thu, 14 Mar 2024 17:44:10 GMT (envelope-from git) Date: Thu, 14 Mar 2024 17:44:10 GMT Message-Id: <202403141744.42EHiA6f052434@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 723a3c37a624 - main - misc/mnn: update 2.6.0 =?utf-8?Q?=E2=86=92?= 2.8.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 723a3c37a624473f06a897f24a8f861b98813011 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=723a3c37a624473f06a897f24a8f861b98813011 commit 723a3c37a624473f06a897f24a8f861b98813011 Author: Yuri Victorovich AuthorDate: 2024-03-13 14:45:02 +0000 Commit: Yuri Victorovich CommitDate: 2024-03-14 17:44:03 +0000 misc/mnn: update 2.6.0 → 2.8.1 Reported by: portscout --- misc/mnn/Makefile | 15 +++++++++++---- misc/mnn/distinfo | 6 +++--- misc/mnn/files/patch-tools_train_CMakeLists.txt | 16 ++++++++-------- misc/mnn/pkg-plist | 17 +++++++++++++---- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/misc/mnn/Makefile b/misc/mnn/Makefile index 7697df85dcad..0bd0cd288163 100644 --- a/misc/mnn/Makefile +++ b/misc/mnn/Makefile @@ -1,6 +1,5 @@ PORTNAME= mnn -DISTVERSION= 2.6.0 -PORTREVISION= 1 +DISTVERSION= 2.8.1 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org @@ -53,8 +52,16 @@ CMAKE_ARGS+= -DMNN_USE_AVX:BOOL=OFF \ .endif do-install-APPS-on: -.for f in MNNV2Basic.out mobilenetTest.out backendTest.out testModel.out getPerformance.out checkInvalidValue.out timeProfile.out quantized.out \ - transformer.out train.out rawDataTransform.out dataTransformer.out runTrainDemo.out +.for f in extractForInfer fuseTest \ + MNNDump2Json MNNRevert2Buffer MNNV2Basic.out \ + ModuleBasic.out \ + mobilenetTest.out backendTest.out testModel.out getPerformance.out checkInvalidValue.out \ + mobilenetTest.out \ + OnnxClip \ + SequenceModuleTest.out \ + timeProfile.out quantized.out \ + runTrainDemo.out \ + testModel_expr.out testModelWithDescribe.out testTrain.out timeProfile.out transformer winogradExample.out ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor diff --git a/misc/mnn/distinfo b/misc/mnn/distinfo index 6c2877b4f368..d82aeef7a9cb 100644 --- a/misc/mnn/distinfo +++ b/misc/mnn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688710254 -SHA256 (alibaba-MNN-2.6.0_GH0.tar.gz) = 9195c79a263eed1ecfc29bc4907b5bcf910a5bac436f8ee49f1464eb48d3e0d8 -SIZE (alibaba-MNN-2.6.0_GH0.tar.gz) = 20625817 +TIMESTAMP = 1710359574 +SHA256 (alibaba-MNN-2.8.1_GH0.tar.gz) = 64a1c91cddc3504d2cff5bc8c9fe592c93ae07eb538482768eb4de45fc6fc7ab +SIZE (alibaba-MNN-2.8.1_GH0.tar.gz) = 20980515 diff --git a/misc/mnn/files/patch-tools_train_CMakeLists.txt b/misc/mnn/files/patch-tools_train_CMakeLists.txt index 94555bc38aec..92c7a83d2658 100644 --- a/misc/mnn/files/patch-tools_train_CMakeLists.txt +++ b/misc/mnn/files/patch-tools_train_CMakeLists.txt @@ -1,18 +1,18 @@ ---- tools/train/CMakeLists.txt.orig 2021-06-11 09:17:13 UTC +--- tools/train/CMakeLists.txt.orig 2023-12-29 07:03:26 UTC +++ tools/train/CMakeLists.txt -@@ -30,6 +30,7 @@ endif() - IF(MNN_SEP_BUILD) - add_library(MNNTrain SHARED ${MNN_TRAIN_SRCS}) +@@ -28,6 +28,7 @@ IF(MNN_SEP_BUILD) + add_library(MNNTrainUtils SHARED ${MNN_TRAIN_UTILS_SRCS}) target_link_libraries(MNNTrain MNN MNN_Express) -+ install(TARGETS MNNTrain LIBRARY DESTINATION lib) + target_link_libraries(MNNTrainUtils MNNTrain) ++ install(TARGETS MNNTrain MNNTrainUtils LIBRARY DESTINATION lib) ELSE() add_library(MNNTrain OBJECT ${MNN_TRAIN_SRCS}) - ENDIF() -@@ -56,6 +57,7 @@ list(APPEND MNN_TRAIN_TOOLS dataTransformer.out) + add_library(MNNTrainUtils OBJECT ${MNN_TRAIN_UTILS_SRCS}) +@@ -47,6 +48,7 @@ foreach(TARGET ${MNN_TRAIN_TOOLS}) list(APPEND MNN_TRAIN_TOOLS runTrainDemo.out) foreach(TARGET ${MNN_TRAIN_TOOLS}) target_link_libraries(${TARGET} PRIVATE ${MNN_DEPS}) + install(TARGETS MNNTrain LIBRARY DESTINATION lib) IF(MNN_SEP_BUILD) target_link_libraries(${TARGET} PRIVATE MNNTrain) - ENDIF() + target_link_libraries(${TARGET} PRIVATE MNNTrainUtils) diff --git a/misc/mnn/pkg-plist b/misc/mnn/pkg-plist index 857ebeb0594a..17038024e25d 100644 --- a/misc/mnn/pkg-plist +++ b/misc/mnn/pkg-plist @@ -1,17 +1,25 @@ %%CONVERTER%%bin/MNNConvert +%%APPS%%bin/MNNDump2Json +%%APPS%%bin/MNNRevert2Buffer %%APPS%%bin/MNNV2Basic.out +%%APPS%%bin/ModuleBasic.out +%%APPS%%bin/OnnxClip +%%APPS%%bin/SequenceModuleTest.out %%APPS%%bin/backendTest.out %%APPS%%bin/checkInvalidValue.out -%%APPS%%bin/dataTransformer.out +%%APPS%%bin/extractForInfer +%%APPS%%bin/fuseTest %%APPS%%bin/getPerformance.out %%APPS%%bin/mobilenetTest.out %%APPS%%bin/quantized.out -%%APPS%%bin/rawDataTransform.out %%APPS%%bin/runTrainDemo.out %%APPS%%bin/testModel.out +%%APPS%%bin/testModelWithDescribe.out +%%APPS%%bin/testModel_expr.out +%%APPS%%bin/testTrain.out %%APPS%%bin/timeProfile.out -%%APPS%%bin/train.out -%%APPS%%bin/transformer.out +%%APPS%%bin/transformer +%%APPS%%bin/winogradExample.out include/MNN/AutoTime.hpp include/MNN/ErrorCode.hpp include/MNN/HalideRuntime.h @@ -35,4 +43,5 @@ include/MNN/expr/Scope.hpp lib/libMNN.so %%CONVERTER%%lib/libMNNConvertDeps.so %%APPS%%lib/libMNNTrain.so +%%APPS%%lib/libMNNTrainUtils.so %%APPS%%lib/libMNN_Express.so