[mlpack] Updated to version 3.1.1 (#6907)

* [mlpack] Updated to version 3.1.0

* [mlpack] Updated to version 3.1.1

3 files changed, 55 insertions, 57 deletions

diff --git a/ports/mlpack/CONTROL b/ports/mlpack/CONTROL
index 75cc21eb4..0902ce894 100644
--- a/ports/mlpack/CONTROL
+++ b/ports/mlpack/CONTROL
@@ -1,5 +1,5 @@
 Source: mlpack
-Version: 3.1.0-1
+Version: 3.1.1
 Description: mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms.
 Build-Depends: openblas (!osx), clapack (!osx), boost, armadillo, ensmallen
 
diff --git a/ports/mlpack/cmakelists.patch b/ports/mlpack/cmakelists.patch
index a4ef8f119..05810f57f 100644
--- a/ports/mlpack/cmakelists.patch
+++ b/ports/mlpack/cmakelists.patch
@@ -1,54 +1,52 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 26dfd6e..5e287d8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -283,25 +283,8 @@ endif()
- # and find LAPACK and BLAS ourselves, using a slightly modified variant of the
- # script Armadillo uses to find these.
- if (WIN32)
--  find_library(LAPACK_LIBRARY
--      NAMES lapack liblapack lapack_win32_MT lapack_win32
--      PATHS "C:/Program Files/Armadillo"
--      PATH_SUFFIXES "examples/lib_win32/")
--
--  if (NOT LAPACK_LIBRARY)
--    message(FATAL_ERROR "Cannot find LAPACK library (.lib)!")
--  endif ()
--
--  find_library(BLAS_LIBRARY
--      NAMES blas libblas blas_win32_MT blas_win32
--      PATHS "C:/Program Files/Armadillo"
--      PATH_SUFFIXES "examples/lib_win32/")
--
--  if (NOT BLAS_LIBRARY)
--    message(FATAL_ERROR "Cannot find BLAS library (.lib)!")
--  endif ()
--
--  # Piggyback LAPACK and BLAS linking into Armadillo link.
-+  find_package(LAPACK)
-+  find_package(BLAS)
-   set(ARMADILLO_LIBRARIES
-        ${ARMADILLO_LIBRARIES} ${BLAS_LIBRARY} ${LAPACK_LIBRARY})
- endif ()
-@@ -392,19 +375,11 @@ find_package(Boost 1.49
-     REQUIRED
- )
- 
--link_directories(${Boost_LIBRARY_DIRS})
--
--# In Visual Studio, automatic linking is performed, so we don't need to worry
--# about it.  Clear the list of libraries to link against and let Visual Studio
--# handle it.
--if (MSVC)
--  link_directories(${Boost_LIBRARY_DIRS})
--  set(Boost_LIBRARIES "")
--endif ()
-+link_directories(${Boost_LIBRARIES})
- 
- set(MLPACK_INCLUDE_DIRS ${MLPACK_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
- set(MLPACK_LIBRARIES ${MLPACK_LIBRARIES} ${Boost_LIBRARIES})
--set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
-+set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARIES})
- 
- # For Boost testing framework (will have no effect on non-testing executables).
- # This specifies to Boost that we are dynamically linking to the Boost test
+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -283,25 +283,8 @@

+ # and find LAPACK and BLAS ourselves, using a slightly modified variant of the

+ # script Armadillo uses to find these.

+ if (WIN32)

+-  find_library(LAPACK_LIBRARY

+-      NAMES lapack liblapack lapack_win32_MT lapack_win32

+-      PATHS "C:/Program Files/Armadillo"

+-      PATH_SUFFIXES "examples/lib_win32/")

+-

+-  if (NOT LAPACK_LIBRARY)

+-    message(FATAL_ERROR "Cannot find LAPACK library (.lib)!")

+-  endif ()

+-

+-  find_library(BLAS_LIBRARY

+-      NAMES blas libblas blas_win32_MT blas_win32

+-      PATHS "C:/Program Files/Armadillo"

+-      PATH_SUFFIXES "examples/lib_win32/")

+-

+-  if (NOT BLAS_LIBRARY)

+-    message(FATAL_ERROR "Cannot find BLAS library (.lib)!")

+-  endif ()

+-

+-  # Piggyback LAPACK and BLAS linking into Armadillo link.

++  find_package(LAPACK)

++  find_package(BLAS)

+   set(ARMADILLO_LIBRARIES

+        ${ARMADILLO_LIBRARIES} ${BLAS_LIBRARY} ${LAPACK_LIBRARY})

+ endif ()

+@@ -395,19 +378,11 @@

+     REQUIRED

+ )

+ 

+-link_directories(${Boost_LIBRARY_DIRS})

+-

+-# In Visual Studio, automatic linking is performed, so we don't need to worry

+-# about it.  Clear the list of libraries to link against and let Visual Studio

+-# handle it.

+-if (MSVC)

+-  link_directories(${Boost_LIBRARY_DIRS})

+-  set(Boost_LIBRARIES "")

+-endif ()

++link_directories(${Boost_LIBRARIES})

+ 

+ set(MLPACK_INCLUDE_DIRS ${MLPACK_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})

+ set(MLPACK_LIBRARIES ${MLPACK_LIBRARIES} ${Boost_LIBRARIES})

+-set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})

++set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARIES})

+ 

+ # For Boost testing framework (will have no effect on non-testing executables).

+ # This specifies to Boost that we are dynamically linking to the Boost test

diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake
index 20cbc882e..0a5bcb6d1 100644
--- a/ports/mlpack/portfile.cmake
+++ b/ports/mlpack/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mlpack/mlpack
-    REF mlpack-3.1.0
-    SHA512 dc305a9a2f7232d3957206a346d0ac97ba13b933d5dbef45329002b8380ecc0982621c0b97f6c5ee82d0a26ad53b1cdd7a9b991fb749efc8546394988ac40a5b
+    REF mlpack-3.1.1
+    SHA512 4acef74da951934b9bd1cabd87b9d6d002c80eb3218f69755277fa654d928aed379a5e63987f32ec162cc005c2952e618d6d528c2311aebb8cd2cc01cab71f86
     HEAD_REF master
     PATCHES
         cmakelists.patch