math/mlpack: Update 3.4.2 -> 4.0.0

freebsd · Nov 16, 2022 · d3cc6e8 · d3cc6e8
1 parent b6a2e48
commit d3cc6e8
Show file tree

Hide file tree

Showing 5 changed files with 382 additions and 363 deletions.
diff --git a/math/mlpack/Makefile b/math/mlpack/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mlpack
-DISTVERSION=	3.4.2
-PORTREVISION=	3
+DISTVERSION=	4.0.0
 CATEGORIES=	math # machine-learning
 MASTER_SITES=	https://mlpack.org/files/
 
@@ -12,18 +11,20 @@ LICENSE=	BSD3CLAUSE
 
 BROKEN_i386=	undefined symbol: __atomic_load
 
-BUILD_DEPENDS=	ensmallen>0:math/ensmallen \
+BUILD_DEPENDS=	cereal>0:devel/cereal \
+		ensmallen>0:math/ensmallen \
 		${LOCALBASE}/include/stb/stb_image.h:devel/stb
 LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs \
 		libboost_unit_test_framework.so:devel/boost-libs \
 		libboost_serialization.so:devel/boost-libs \
 		libarmadillo.so:math/armadillo
 
-USES=		cmake compiler:c++14-lang pkgconfig
+USES=		cmake:testing compiler:c++14-lang pkgconfig
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DSTB_IMAGE_INCLUDE_DIR=${LOCALBASE}/include/stb
 CMAKE_OFF=	BUILD_PYTHON_BINDINGS BUILD_TESTS
+CMAKE_TESTING_ON=	BUILD_TESTS
 
 BINARY_ALIAS=	git=false
 
@@ -33,12 +34,6 @@ OPTIONS_SUB=		yes
 
 EXECUTABLES_DESC=	Build command-line executables
 EXECUTABLES_CMAKE_BOOL=	BUILD_CLI_EXECUTABLES
-
-do-test: # 'clean' target below is a workaround for: https://github.com/mlpack/mlpack/issues/2300
-	@cd ${BUILD_WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} clean && \
-		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
+EXECUTABLES_VARS_OFF=	NO_ARCH=yes
 
 .include <bsd.port.mk>
diff --git a/math/mlpack/distinfo b/math/mlpack/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619318150
-SHA256 (mlpack-3.4.2.tar.gz) = 9e5c4af5c276c86a0dcc553289f6fe7b1b340d61c1e59844b53da0debedbb171
-SIZE (mlpack-3.4.2.tar.gz) = 5782921
+TIMESTAMP = 1668503967
+SHA256 (mlpack-4.0.0.tar.gz) = 041d9eee96445667d2f7b970d2a799592027f1f8818cd96a65dcce1ac0745773
+SIZE (mlpack-4.0.0.tar.gz) = 5895954
diff --git a/math/mlpack/files/patch-CMakeLists.txt b/math/mlpack/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2021-04-25 03:10:15 UTC
+--- CMakeLists.txt.orig	2022-10-24 13:40:50 UTC
 +++ CMakeLists.txt
-@@ -534,7 +534,7 @@ endif ()
+@@ -420,7 +420,7 @@ endif ()
 
  # Determine whether or not this is a git repository, so that we can set the
  # version number if necessary.

diff --git a/math/mlpack/files/patch-src_mlpack_tests_CMakeLists.txt b/math/mlpack/files/patch-src_mlpack_tests_CMakeLists.txt
@@ -0,0 +1,13 @@
+- workaround for https://github.com/mlpack/mlpack/issues/3314
+
+--- src/mlpack/tests/CMakeLists.txt.orig	2022-11-15 09:59:36 UTC
++++ src/mlpack/tests/CMakeLists.txt
+@@ -4,7 +4,7 @@ message("YURI: in tests")
+
+ # mlpack test executable.
+ add_executable(mlpack_test
+-  EXCLUDE_FROM_ALL
++  #EXCLUDE_FROM_ALL
+   ${MLPACK_TEST_SRCS}
+
+   # Tests for neural network code (and reinforcement learning code).