git: 723a3c37a624 - main - misc/mnn: update 2.6.0 → 2.8.1

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=723a3c37a624473f06a897f24a8f861b98813011

commit 723a3c37a624473f06a897f24a8f861b98813011
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-03-13 14:45:02 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
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