misc/mxnet: Update 1.7.0 -> 1.8.0

PR: 256029
freebsd · May 21, 2021 · add1329 · add1329
1 parent 729fb57
commit add1329
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/misc/mxnet/Makefile b/misc/mxnet/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mxnet
-DISTVERSION=	1.7.0
-PORTREVISION=	2
+DISTVERSION=	1.8.0
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org

diff --git a/misc/mxnet/distinfo b/misc/mxnet/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1598541817
-SHA256 (apache-incubator-mxnet-1.7.0_GH0.tar.gz) = 4440289341b588063fea5d2911e7520a7d87dd7e42ba4a052f752d52e7e35664
-SIZE (apache-incubator-mxnet-1.7.0_GH0.tar.gz) = 22293420
+TIMESTAMP = 1621514118
+SHA256 (apache-incubator-mxnet-1.8.0_GH0.tar.gz) = 976e0193622378b9174d6ff95b8d1e5369e66945c5345a13c642748b51eb9758
+SIZE (apache-incubator-mxnet-1.8.0_GH0.tar.gz) = 23246903
 SHA256 (apache-incubator-tvm-9bd2c7b_GH0.tar.gz) = 1e9a69d8ac686b526a0d66241e017b8e9b9ee4f2e687b32f437527926d929d7f
 SIZE (apache-incubator-tvm-9bd2c7b_GH0.tar.gz) = 2852339
 SHA256 (dmlc-dlpack-3efc489_GH0.tar.gz) = e8a3fc92d24eab985a73539b7478da84ebc12cfb33f654d915671748fd3d7d98

diff --git a/misc/mxnet/files/patch-CMakeLists.txt b/misc/mxnet/files/patch-CMakeLists.txt
@@ -1,31 +1,31 @@
---- CMakeLists.txt.orig	2020-07-15 07:03:28 UTC
+--- CMakeLists.txt.orig	2021-01-16 20:50:48 UTC
 +++ CMakeLists.txt
-@@ -464,6 +464,7 @@ if(USE_JEMALLOC)
+@@ -479,6 +479,7 @@ if(USE_JEMALLOC)
    endif()
  endif()
 
 +if (ENABLE_TESTING)
  include(CTest)
  set(GTEST_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/googletest/googletest")
  set(GTEST_INCLUDE_DIR ${GTEST_ROOT}/include)
-@@ -474,6 +475,7 @@ set(GTEST_LIBRARY gtest)
+@@ -489,6 +490,7 @@ set(GTEST_LIBRARY gtest)
 
  add_subdirectory(${GTEST_ROOT})
  find_package(GTest REQUIRED)
 +endif()
 
  # cudnn detection
  if(USE_CUDNN)
-@@ -865,7 +867,7 @@ install(TARGETS ${MXNET_INSTALL_TARGETS}
- #       https://cmake.org/cmake/help/v3.0/module/GNUInstallDirs.html
-
+@@ -898,7 +900,7 @@ install(TARGETS ${MXNET_INSTALL_TARGETS}
+   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/dmlc-core/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 +#install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/dmlc-core/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- if(USE_MKLDNN)
-   install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/mkldnn/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- endif()
-@@ -913,7 +915,9 @@ endif()
+ 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}/3rdparty/tvm/nnvm/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+@@ -943,7 +945,9 @@ endif()
  if(BUILD_CPP_EXAMPLES)
    add_subdirectory(example/image-classification/predict-cpp)
  endif()