misc/mnn: Update 1.1.0 -> 1.2.0

Reported by:	portscout
This commit is contained in:
Yuri Victorovich
2021-06-20 10:46:19 -07:00
parent 19ef893e15
commit 3aee942fbf
6 changed files with 29 additions and 21 deletions

View File

@@ -1,6 +1,5 @@
PORTNAME= mnn
DISTVERSION= 1.1.0
PORTREVISION= 2
DISTVERSION= 1.2.0
CATEGORIES= misc # machine-learning
MAINTAINER= yuri@FreeBSD.org

View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1604696072
SHA256 (alibaba-MNN-1.1.0_GH0.tar.gz) = 51ba1390a73ed042e38cefa03d62502bfa6e808fe2258cf678f67faa7361099a
SIZE (alibaba-MNN-1.1.0_GH0.tar.gz) = 6363974
TIMESTAMP = 1624209262
SHA256 (alibaba-MNN-1.2.0_GH0.tar.gz) = b0e32d28e1b1c64904d6c1f810a48238430cf4ef5e8fdcd2ea4600e52c8a82ef
SIZE (alibaba-MNN-1.2.0_GH0.tar.gz) = 103892968

View File

@@ -1,7 +1,7 @@
--- CMakeLists.txt.orig 2020-09-20 17:36:43 UTC
--- CMakeLists.txt.orig 2021-06-11 09:17:13 UTC
+++ CMakeLists.txt
@@ -268,7 +268,6 @@ include_directories(${CMAKE_CURRENT_LIST_DIR}/include/
${CMAKE_CURRENT_LIST_DIR}/source/
@@ -304,7 +304,6 @@ include_directories(${CMAKE_CURRENT_LIST_DIR}/include/
${CMAKE_CURRENT_LIST_DIR}/codegen/
${CMAKE_CURRENT_LIST_DIR}/schema/current/
${CMAKE_CURRENT_LIST_DIR}/3rd_party/
- ${CMAKE_CURRENT_LIST_DIR}/3rd_party/flatbuffers/include

View File

@@ -1,10 +1,10 @@
--- tools/converter/CMakeLists.txt.orig 2020-05-23 09:34:50 UTC
--- tools/converter/CMakeLists.txt.orig 2021-06-11 09:17:13 UTC
+++ tools/converter/CMakeLists.txt
@@ -40,6 +40,7 @@ IF(MNN_BUILD_CONVERTER)
@@ -43,6 +43,7 @@ IF(MNN_BUILD_CONVERTER)
IF(MNN_BUILD_SHARED_LIBS)
add_library(MNNConvertDeps SHARED ${COMMON_SRC} ${MNN_CONVERTER_BACKENDS_OBJECTS} ${CMAKE_CURRENT_LIST_DIR}/../../3rd_party/flatbuffers/src/util.cpp)
add_library(MNNConvertDeps SHARED ${COMMON_SRC} ${MNN_CONVERTER_BACKENDS_OBJECTS} ${CMAKE_CURRENT_LIST_DIR}/../../3rd_party/flatbuffers/src/util.cpp $<TARGET_OBJECTS:MNNUtils>)
add_dependencies(MNNConvertDeps MNN)
+ install(TARGETS MNNConvertDeps LIBRARY DESTINATION lib)
ELSE()
add_library(MNNConvertDeps STATIC ${COMMON_SRC} ${MNN_CONVERTER_BACKENDS_OBJECTS} ${CMAKE_CURRENT_LIST_DIR}/../../3rd_party/flatbuffers/src/util.cpp)
add_library(MNNConvertDeps STATIC ${COMMON_SRC} ${MNN_CONVERTER_BACKENDS_OBJECTS} ${CMAKE_CURRENT_LIST_DIR}/../../3rd_party/flatbuffers/src/util.cpp)
ENDIF()

View File

@@ -1,10 +1,18 @@
--- tools/train/CMakeLists.txt.orig 2020-05-23 09:17:28 UTC
--- tools/train/CMakeLists.txt.orig 2021-06-11 09:17:13 UTC
+++ tools/train/CMakeLists.txt
@@ -28,6 +28,7 @@ else()
add_library(MNNTrain ${MNN_LIBARY_TYPE} ${GRAD} ${BASIC_INCLUDE} ${PARAMETER} ${OPTIMIZER} ${MODULES} ${DATALOADER} ${TRANSFORMER} ${MODELS} ${DATASETS})
endif()
target_link_libraries(MNNTrain ${MNN_DEPS})
+install(TARGETS MNNTrain LIBRARY DESTINATION lib)
add_executable(transformer.out ${CMAKE_CURRENT_LIST_DIR}/source/exec/transformerExecution.cpp)
target_link_libraries(transformer.out MNNTrain)
@@ -30,6 +30,7 @@ endif()
IF(MNN_SEP_BUILD)
add_library(MNNTrain SHARED ${MNN_TRAIN_SRCS})
target_link_libraries(MNNTrain MNN MNN_Express)
+ install(TARGETS MNNTrain LIBRARY DESTINATION lib)
ELSE()
add_library(MNNTrain OBJECT ${MNN_TRAIN_SRCS})
ENDIF()
@@ -56,6 +57,7 @@ list(APPEND MNN_TRAIN_TOOLS dataTransformer.out)
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()

View File

@@ -27,6 +27,7 @@ include/MNN/Tensor.hpp
include/MNN/expr/Expr.hpp
include/MNN/expr/ExprCreator.hpp
include/MNN/expr/MathOp.hpp
include/MNN/expr/Module.hpp
include/MNN/expr/NeuralNetWorkOp.hpp
include/MNN/expr/Optimizer.hpp
lib/libMNN.so