diff --git a/misc/mnn/Makefile b/misc/mnn/Makefile index 973caf4b88bd..880e3ce89689 100644 --- a/misc/mnn/Makefile +++ b/misc/mnn/Makefile @@ -1,68 +1,67 @@ PORTNAME= mnn -DISTVERSION= 1.1.0 -PORTREVISION= 2 +DISTVERSION= 1.2.0 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= Lightweight deep neural network inference engine LICENSE= APACHE20 BROKEN_i386= always_inline function '_mm_set1_ps' requires target feature 'sse', but would be inlined into function 'Vec4' that is compiled without support for 'sse' BUILD_DEPENDS= bash:shells/bash \ flatc:devel/flatbuffers USES= cmake compiler:c++11-lang localbase shebangfix USE_GITHUB= yes GH_ACCOUNT= alibaba GH_PROJECT= MNN SHEBANG_GLOB= *.sh USE_LDCONFIG= yes CXXFLAGS+= -pthread LDFLAGS+= -pthread CFLAGS+= -fPIC # workaround for https://github.com/alibaba/MNN/issues/553 CXXFLAGS+= -fPIC OPTIONS_DEFINE= APPS CONVERTER HARD_FP OPTIONS_DEFAULT= CONVERTER HARD_FP OPTIONS_SUB= yes APPS_DESC= Build ML training, quantization tools APPS_CMAKE_BOOL= MNN_BUILD_QUANTOOLS MNN_BUILD_TOOLS MNN_BUILD_TRAIN CONVERTER_DESC= Build the model converter tool CONVERTER_CMAKE_BOOL= MNN_BUILD_CONVERTER CONVERTER_LIB_DEPENDS= libprotobuf.so:devel/protobuf HARD_FP_DESC= Hard floating point numbers HARD_FP_CMAKE_BOOL= MNN_BUILD_HARD .include .if ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_ARGS+= -DMNN_USE_AVX:BOOL=OFF \ -DMNN_USE_SSE:BOOL=OFF .endif pre-build: # https://github.com/alibaba/MNN/issues/648 @cd ${WRKSRC}/schema && FREEBSD_FLATC=${LOCALBASE}/bin/flatc ./generate.sh do-install-APPS-on: .for f in MNNConvert MNNV2Basic.out mobilenetTest.out backendTest.out testModel.out testModelWithDescrisbe.out getPerformance.out checkInvalidValue.out timeProfile.out quantized.out \ transformer.out train.out rawDataTransform.out dataTransformer.out runTrainDemo.out ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor do-install-CONVERTER-on: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/MNNConvert ${STAGEDIR}${PREFIX}/bin do-test: @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DMNN_BUILD_TEST:BOOL=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ cd ${BUILD_WRKSRC} && ./run_test.out .include diff --git a/misc/mnn/distinfo b/misc/mnn/distinfo index 5a82b9131daf..00de57b88da2 100644 --- a/misc/mnn/distinfo +++ b/misc/mnn/distinfo @@ -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 diff --git a/misc/mnn/files/patch-CMakeLists.txt b/misc/mnn/files/patch-CMakeLists.txt index d690a6beaf55..b817e27b5a62 100644 --- a/misc/mnn/files/patch-CMakeLists.txt +++ b/misc/mnn/files/patch-CMakeLists.txt @@ -1,10 +1,10 @@ ---- 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 ${CMAKE_CURRENT_LIST_DIR}/3rd_party/half ${CMAKE_CURRENT_LIST_DIR}/3rd_party/imageHelper ${CMAKE_CURRENT_LIST_DIR}/3rd_party/OpenCLHeaders/ diff --git a/misc/mnn/files/patch-tools_converter_CMakeLists.txt b/misc/mnn/files/patch-tools_converter_CMakeLists.txt index 4d549b285fa7..c82129bedf8c 100644 --- a/misc/mnn/files/patch-tools_converter_CMakeLists.txt +++ b/misc/mnn/files/patch-tools_converter_CMakeLists.txt @@ -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 $) 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() diff --git a/misc/mnn/files/patch-tools_train_CMakeLists.txt b/misc/mnn/files/patch-tools_train_CMakeLists.txt index aacece0f36a7..94555bc38aec 100644 --- a/misc/mnn/files/patch-tools_train_CMakeLists.txt +++ b/misc/mnn/files/patch-tools_train_CMakeLists.txt @@ -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() diff --git a/misc/mnn/pkg-plist b/misc/mnn/pkg-plist index 28e6c4d4ebec..b6b8563fafbd 100644 --- a/misc/mnn/pkg-plist +++ b/misc/mnn/pkg-plist @@ -1,35 +1,36 @@ %%CONVERTER%%bin/MNNConvert %%APPS%%bin/MNNV2Basic.out %%APPS%%bin/backendTest.out %%APPS%%bin/checkInvalidValue.out %%APPS%%bin/dataTransformer.out %%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/testModelWithDescrisbe.out %%APPS%%bin/timeProfile.out %%APPS%%bin/train.out %%APPS%%bin/transformer.out include/MNN/AutoTime.hpp include/MNN/ErrorCode.hpp include/MNN/expr/Executor.hpp include/MNN/HalideRuntime.h include/MNN/ImageProcess.hpp include/MNN/Interpreter.hpp include/MNN/MNNDefine.h include/MNN/MNNForwardType.h include/MNN/Matrix.h include/MNN/Rect.h 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 %%APPS%%lib/libMNN_Express.so %%CONVERTER%%lib/libMNNConvertDeps.so %%APPS%%lib/libMNNTrain.so