From fcc13318da06dbec75f46311508db6f9aaeb479e Mon Sep 17 00:00:00 2001
From: Miguel <mcanteras@gmail.com>
Date: Tue, 30 Apr 2019 05:56:26 +0200
Subject: [mlpack] Updated to version 3.1.0 (#6263)

---
 ports/mlpack/CONTROL                   |   2 +-
 ports/mlpack/cmakelists.patch          |  16 +--
 ports/mlpack/meta_info_extractor.patch | 189 ---------------------------------
 ports/mlpack/portfile.cmake            |   5 +-
 4 files changed, 6 insertions(+), 206 deletions(-)
 delete mode 100644 ports/mlpack/meta_info_extractor.patch

diff --git a/ports/mlpack/CONTROL b/ports/mlpack/CONTROL
index 457cb769f..4462dcd27 100644
--- a/ports/mlpack/CONTROL
+++ b/ports/mlpack/CONTROL
@@ -1,5 +1,5 @@
 Source: mlpack
-Version: 3.0.4
+Version: 3.1.0
 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, clapack, boost, armadillo
 
diff --git a/ports/mlpack/cmakelists.patch b/ports/mlpack/cmakelists.patch
index bc251980a..6c39a4293 100644
--- a/ports/mlpack/cmakelists.patch
+++ b/ports/mlpack/cmakelists.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -252,7 +252,7 @@
+@@ -284,7 +284,7 @@
  # script Armadillo uses to find these.
  if (WIN32)
    find_library(LAPACK_LIBRARY
@@ -9,7 +9,7 @@
        PATHS "C:/Program Files/Armadillo"
        PATH_SUFFIXES "examples/lib_win32/")
  
-@@ -261,7 +261,7 @@
+@@ -293,7 +293,7 @@
    endif ()
  
    find_library(BLAS_LIBRARY
@@ -18,17 +18,7 @@
        PATHS "C:/Program Files/Armadillo"
        PATH_SUFFIXES "examples/lib_win32/")
  
-@@ -281,6 +281,9 @@
- # Unfortunately this configuration variable is necessary and will need to be
- # updated as time goes on and new versions are released.
- set(Boost_ADDITIONAL_VERSIONS
-+  "1.69.0" "1.69"
-+  "1.68.0" "1.68"
-+  "1.67.0" "1.67"
-   "1.66.0" "1.66"
-   "1.65.1" "1.65.0" "1.65"
-   "1.64.1" "1.64.0" "1.64"
-@@ -307,19 +310,11 @@
+@@ -392,19 +392,11 @@
      REQUIRED
  )
  
diff --git a/ports/mlpack/meta_info_extractor.patch b/ports/mlpack/meta_info_extractor.patch
deleted file mode 100644
index 3a9fa00dd..000000000
--- a/ports/mlpack/meta_info_extractor.patch
+++ /dev/null
@@ -1,189 +0,0 @@
---- a/src/mlpack/core/cv/meta_info_extractor.hpp
-+++ b/src/mlpack/core/cv/meta_info_extractor.hpp
-@@ -38,50 +38,142 @@
-          bool NumClasses>
- struct TrainForm;
- 
--template<typename PT, typename WT, typename... SignatureParams>
--struct TrainFormBase
--{
--  using PredictionsType = PT;
--  using WeightsType = WT;
--
--  /* A minimum number of parameters that should be inferred */
--  static const size_t MinNumberOfAdditionalArgs = 1;
--
--  template<typename Class, typename RT, typename... Ts>
--  using Type = RT(Class::*)(SignatureParams..., Ts...);
--};
--
--template<typename MT, typename PT>
--struct TrainForm<MT, PT, void, false, false> : public TrainFormBase<PT, void,
--    const MT&, const PT&> {};
--
--template<typename MT, typename PT>
--struct TrainForm<MT, PT, void, true, false> : public TrainFormBase<PT, void,
--    const MT&, const data::DatasetInfo&, const PT&> {};
--
--template<typename MT, typename PT, typename WT>
--struct TrainForm<MT, PT, WT, false, false> : public TrainFormBase<PT, WT,
--    const MT&, const PT&, const WT&> {};
--
--template<typename MT, typename PT, typename WT>
--struct TrainForm<MT, PT, WT, true, false> : public TrainFormBase<PT, WT,
--    const MT&, const data::DatasetInfo&, const PT&, const WT&> {};
--
--template<typename MT, typename PT>
--struct TrainForm<MT, PT, void, false, true> : public TrainFormBase<PT, void,
--    const MT&, const PT&, const size_t> {};
--
--template<typename MT, typename PT>
--struct TrainForm<MT, PT, void, true, true> : public TrainFormBase<PT, void,
--    const MT&, const data::DatasetInfo&, const PT&, const size_t> {};
--
--template<typename MT, typename PT, typename WT>
--struct TrainForm<MT, PT, WT, false, true> : public TrainFormBase<PT, WT,
--    const MT&, const PT&, const size_t, const WT&> {};
--
--template<typename MT, typename PT, typename WT>
--struct TrainForm<MT, PT, WT, true, true> : public TrainFormBase<PT, WT,
--    const MT&, const data::DatasetInfo&, const PT&, const size_t, const WT&> {};
-+#if _MSC_VER <= 1916 // Visual Studio 2017 version 15.9 or older.
-+  // Due to an internal MSVC compiler bug (MSVC ) we can't use two parameter
-+  // packs. So we have to write multiple TrainFormBase forms.
-+  template<typename PT, typename WT, typename T1, typename T2>
-+  struct TrainFormBase4
-+  {
-+    using PredictionsType = PT;
-+    using WeightsType = WT;
-+
-+    /* A minimum number of parameters that should be inferred */
-+    static const size_t MinNumberOfAdditionalArgs = 1;
-+
-+    template<typename Class, typename RT, typename... Ts>
-+    using Type = RT(Class::*)(T1, T2, Ts...);
-+  };
-+
-+  template<typename PT, typename WT, typename T1, typename T2, typename T3>
-+  struct TrainFormBase5
-+  {
-+    using PredictionsType = PT;
-+    using WeightsType = WT;
-+
-+    /* A minimum number of parameters that should be inferred */
-+    static const size_t MinNumberOfAdditionalArgs = 1;
-+
-+    template<typename Class, typename RT, typename... Ts>
-+    using Type = RT(Class::*)(T1, T2, T3, Ts...);
-+  };
-+
-+  template<typename PT, typename WT, typename T1, typename T2, typename T3,
-+      typename T4>
-+  struct TrainFormBase6
-+  {
-+    using PredictionsType = PT;
-+    using WeightsType = WT;
-+
-+    /* A minimum number of parameters that should be inferred */
-+    static const size_t MinNumberOfAdditionalArgs = 1;
-+
-+    template<typename Class, typename RT, typename... Ts>
-+    using Type = RT(Class::*)(T1, T2, T3, T4, Ts...);
-+  };
-+
-+  template<typename PT, typename WT, typename T1, typename T2, typename T3,
-+      typename T4, typename T5>
-+  struct TrainFormBase7
-+  {
-+    using PredictionsType = PT;
-+    using WeightsType = WT;
-+
-+    /* A minimum number of parameters that should be inferred */
-+    static const size_t MinNumberOfAdditionalArgs = 1;
-+
-+    template<typename Class, typename RT, typename... Ts>
-+    using Type = RT(Class::*)(T1, T2, T3, T4, T5, Ts...);
-+  };
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, false, false> : public TrainFormBase4<PT, void,
-+      const MT&, const PT&> {};
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, true, false> : public TrainFormBase5<PT, void,
-+      const MT&, const data::DatasetInfo&, const PT&> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, false, false> : public TrainFormBase5<PT, WT,
-+      const MT&, const PT&, const WT&> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, true, false> : public TrainFormBase6<PT, WT,
-+      const MT&, const data::DatasetInfo&, const PT&, const WT&> {};
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, false, true> : public TrainFormBase5<PT, void,
-+      const MT&, const PT&, const size_t> {};
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, true, true> : public TrainFormBase6<PT, void,
-+      const MT&, const data::DatasetInfo&, const PT&, const size_t> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, false, true> : public TrainFormBase6<PT, WT,
-+      const MT&, const PT&, const size_t, const WT&> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, true, true> : public TrainFormBase7<PT, WT,
-+      const MT&, const data::DatasetInfo&, const PT&,
-+      const size_t, const WT&> {};
-+#else
-+  template<typename PT, typename WT, typename... SignatureParams>
-+  struct TrainFormBase
-+  {
-+    using PredictionsType = PT;
-+    using WeightsType = WT;
-+
-+    /* A minimum number of parameters that should be inferred */
-+    static const size_t MinNumberOfAdditionalArgs = 1;
-+
-+    template<typename Class, typename RT, typename... Ts>
-+    using Type = RT(Class::*)(SignatureParams..., Ts...);
-+  };
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, false, false> : public TrainFormBase<PT, void,
-+      const MT&, const PT&> {};
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, true, false> : public TrainFormBase<PT, void,
-+      const MT&, const data::DatasetInfo&, const PT&> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, false, false> : public TrainFormBase<PT, WT,
-+      const MT&, const PT&, const WT&> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, true, false> : public TrainFormBase<PT, WT,
-+      const MT&, const data::DatasetInfo&, const PT&, const WT&> {};
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, false, true> : public TrainFormBase<PT, void,
-+      const MT&, const PT&, const size_t> {};
-+
-+  template<typename MT, typename PT>
-+  struct TrainForm<MT, PT, void, true, true> : public TrainFormBase<PT, void,
-+      const MT&, const data::DatasetInfo&, const PT&, const size_t> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, false, true> : public TrainFormBase<PT, WT,
-+      const MT&, const PT&, const size_t, const WT&> {};
-+
-+  template<typename MT, typename PT, typename WT>
-+  struct TrainForm<MT, PT, WT, true, true> : public TrainFormBase<PT, WT,
-+      const MT&, const data::DatasetInfo&, const PT&,
-+      const size_t, const WT&> {};
-+#endif
- 
- /* A struct for indication that a right method form can't be found */
- struct NotFoundMethodForm
diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake
index 9bd69ed8b..3c908bdf8 100644
--- a/ports/mlpack/portfile.cmake
+++ b/ports/mlpack/portfile.cmake
@@ -3,11 +3,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mlpack/mlpack
-    REF mlpack-3.0.4
-    SHA512 07730a826efb55a41fce2286de8df15421e7a7189b9cdc4699c6a32e3d4b1964a98e3829a60513994ef747640952229e7a3b744ac0ae324f5e5e57f982a86f66
+    REF mlpack-3.1.0
+    SHA512 dc305a9a2f7232d3957206a346d0ac97ba13b933d5dbef45329002b8380ecc0982621c0b97f6c5ee82d0a26ad53b1cdd7a9b991fb749efc8546394988ac40a5b
     HEAD_REF master
 	PATCHES 
-		meta_info_extractor.patch
 		cmakelists.patch
 )
 
-- 
cgit v1.2.3