sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-12 23:31:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc/{,py-}mxnet: Update 1.8.0 -> 1.9.0

Browse source 
Reported by:	portscout
This commit is contained in:
Yuri Victorovich 2021-12-23 10:43:04 -08:00
parent c20bc52eb6
commit f6a64f1498
5 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
misc/mxnet/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= mxnet PORTNAME= mxnet
DISTVERSION= 1.8.0 DISTVERSION= 1.9.0
CATEGORIES= misc # machine-learning CATEGORIES= misc # machine-learning
MAINTAINER= yuri@FreeBSD.org MAINTAINER= yuri@FreeBSD.org
@ -7,8 +7,7 @@ COMMENT= Apache MXNet: Ultra-scalable deep learning framework
LICENSE= APACHE20 LICENSE= APACHE20
BUILD_DEPENDS= googletest>0:devel/googletest \ BUILD_DEPENDS= googletest>0:devel/googletest
${LOCALBASE}/include/dnnl.h:math/onednn
LIB_DEPENDS= libdmlc.so:devel/dmlc-core \ LIB_DEPENDS= libdmlc.so:devel/dmlc-core \
liblapack.so:math/lapack \ liblapack.so:math/lapack \
libopenblas.so:math/openblas libopenblas.so:math/openblas
@ -17,8 +16,9 @@ USES= cmake compiler:c++11-lang localbase:ldflags
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= apache GH_ACCOUNT= apache
GH_PROJECT= incubator-mxnet GH_PROJECT= incubator-mxnet
GH_TUPLE= apache:incubator-tvm:9bd2c7b:tvm/3rdparty/tvm \ GH_TUPLE= apache:tvm:efdac94:tvm/3rdparty/tvm \
dmlc:dlpack:3efc489:dlpack/3rdparty/dlpack dmlc:dlpack:3efc489:dlpack/3rdparty/dlpack \
oneapi-src:oneDNN:f40443c:onednn/3rdparty/mkldnn # same as BUILD_DEPENDS=${LOCALBASE}/include/dnnl.h:math/onednn
USE_LDCONFIG= yes USE_LDCONFIG= yes
CMAKE_OFF= USE_CUDA USE_CUDNN USE_MKLDNN USE_NCCL ENABLE_CUDA_RTC \ CMAKE_OFF= USE_CUDA USE_CUDNN USE_MKLDNN USE_NCCL ENABLE_CUDA_RTC \
@ -45,7 +45,7 @@ OPENCV_LIB_DEPENDS= libopencv_core.so:graphics/opencv \
CMAKE_OFF+= USE_SSE CMAKE_OFF+= USE_SSE
.endif .endif
post-patch: xpost-patch:
@${RM} ${WRKSRC}/include/mkldnn/* @${RM} ${WRKSRC}/include/mkldnn/*
.for h in dnnl.h dnnl.hpp mkldnn.h mkldnn.hpp mkldnn_dnnl_mangling.h mkldnn_types.h mkldnn_version.h .for h in dnnl.h dnnl.hpp mkldnn.h mkldnn.hpp mkldnn_dnnl_mangling.h mkldnn_types.h mkldnn_version.h
@${LN} -s ${LOCALBASE}/include/${h} ${WRKSRC}/include/mkldnn/${h} @${LN} -s ${LOCALBASE}/include/${h} ${WRKSRC}/include/mkldnn/${h}

12
misc/mxnet/distinfo
View file

@ -1,7 +1,9 @@
TIMESTAMP = 1621514118 TIMESTAMP = 1639937058
SHA256 (apache-incubator-mxnet-1.8.0_GH0.tar.gz) = 976e0193622378b9174d6ff95b8d1e5369e66945c5345a13c642748b51eb9758 SHA256 (apache-incubator-mxnet-1.9.0_GH0.tar.gz) = e97ca4d9398a79a9270acc67679c34309a0e4e170718e5aca2929e1832e1b557
SIZE (apache-incubator-mxnet-1.8.0_GH0.tar.gz) = 23246903 SIZE (apache-incubator-mxnet-1.9.0_GH0.tar.gz) = 23379190
SHA256 (apache-incubator-tvm-9bd2c7b_GH0.tar.gz) = 1e9a69d8ac686b526a0d66241e017b8e9b9ee4f2e687b32f437527926d929d7f SHA256 (apache-tvm-efdac94_GH0.tar.gz) = 753338c7eca85e1a7e7a02f3acf40ec13a046b9581dafc94c77c3ad986204983
SIZE (apache-incubator-tvm-9bd2c7b_GH0.tar.gz) = 2852339 SIZE (apache-tvm-efdac94_GH0.tar.gz) = 3889616
SHA256 (dmlc-dlpack-3efc489_GH0.tar.gz) = e8a3fc92d24eab985a73539b7478da84ebc12cfb33f654d915671748fd3d7d98 SHA256 (dmlc-dlpack-3efc489_GH0.tar.gz) = e8a3fc92d24eab985a73539b7478da84ebc12cfb33f654d915671748fd3d7d98
SIZE (dmlc-dlpack-3efc489_GH0.tar.gz) = 39598 SIZE (dmlc-dlpack-3efc489_GH0.tar.gz) = 39598
SHA256 (oneapi-src-oneDNN-f40443c_GH0.tar.gz) = a1c62ae792773ebc0fb581d0953e88bb7d6d4297682d79b7a7fa4ca79a2cfe19
SIZE (oneapi-src-oneDNN-f40443c_GH0.tar.gz) = 9700567

23
misc/mxnet/files/patch-CMakeLists.txt
View file

@ -1,6 +1,15 @@
--- CMakeLists.txt.orig 2021-01-16 20:50:48 UTC --- CMakeLists.txt.orig 2021-11-04 20:30:01 UTC
+++ CMakeLists.txt +++ CMakeLists.txt
@@ -479,6 +479,7 @@ if(USE_JEMALLOC) @@ -7,7 +7,7 @@ if(CMAKE_CROSSCOMPILING)
endif()
project(mxnet C CXX)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14) # workaround for https://github.com/apache/incubator-mxnet/issues/20784
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS ON)
@@ -511,6 +511,7 @@ if(USE_JEMALLOC)
endif() endif()
endif() endif()
@ -8,7 +17,7 @@
include(CTest) include(CTest)
set(GTEST_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/googletest/googletest") set(GTEST_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/googletest/googletest")
set(GTEST_INCLUDE_DIR ${GTEST_ROOT}/include) set(GTEST_INCLUDE_DIR ${GTEST_ROOT}/include)
@@ -489,6 +490,7 @@ set(GTEST_LIBRARY gtest) @@ -521,6 +522,7 @@ set(GTEST_LIBRARY gtest)
add_subdirectory(${GTEST_ROOT}) add_subdirectory(${GTEST_ROOT})
find_package(GTest REQUIRED) find_package(GTest REQUIRED)
@ -16,7 +25,7 @@
# cudnn detection # cudnn detection
if(USE_CUDNN) if(USE_CUDNN)
@@ -898,7 +900,7 @@ install(TARGETS ${MXNET_INSTALL_TARGETS} @@ -974,7 +976,7 @@ install(TARGETS ${MXNET_INSTALL_TARGETS}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/dlpack/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/dlpack/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
@ -25,10 +34,10 @@
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/mshadow/mshadow/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mshadow) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/mshadow/mshadow/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mshadow)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/mxnet/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mxnet) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/mxnet/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mxnet)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/tvm/nnvm/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/tvm/nnvm/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
@@ -943,7 +945,9 @@ endif() @@ -1020,7 +1022,9 @@ if(USE_CPP_PACKAGE)
if(BUILD_CPP_EXAMPLES) endif()
add_subdirectory(example/image-classification/predict-cpp)
endif() endif()
+if(ENABLE_TESTING) +if(ENABLE_TESTING)
add_subdirectory(tests) add_subdirectory(tests)
+endif() +endif()

2
misc/py-mxnet/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= mxnet PORTNAME= mxnet
DISTVERSION= 1.8.0 DISTVERSION= 1.9.0
CATEGORIES= misc # machine-learning CATEGORIES= misc # machine-learning
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

6
misc/py-mxnet/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1621665791 TIMESTAMP = 1640284445
SHA256 (apache-incubator-mxnet-1.8.0_GH0.tar.gz) = 976e0193622378b9174d6ff95b8d1e5369e66945c5345a13c642748b51eb9758 SHA256 (apache-incubator-mxnet-1.9.0_GH0.tar.gz) = e97ca4d9398a79a9270acc67679c34309a0e4e170718e5aca2929e1832e1b557
SIZE (apache-incubator-mxnet-1.8.0_GH0.tar.gz) = 23246903 SIZE (apache-incubator-mxnet-1.9.0_GH0.tar.gz) = 23379190