mlpack 4.6.2__cp313-cp313-win_amd64.whl → 4.7.0__cp313-cp313-win_amd64.whl

mlpack/include/mlpack/core/tree/binary_space_tree/rp_tree_mean_split_impl.hpp

@@ -94,12 +94,12 @@ bool RPTreeMeanSplit<BoundType, MatType>::GetDotMedian(
   for (size_t k = 0; k < samples.n_elem; ++k)
     values[k] = dot(data.col(samples[k]), direction);
 
-  const ElemType maximum = arma::max(values);
+  const ElemType maximum = max(values);
   const ElemType minimum = min(values);
   if (minimum == maximum)
     return false;
 
-  splitVal = arma::median(values);
+  splitVal = median(values);
 
   if (splitVal == maximum)
     splitVal = minimum;
@@ -111,29 +111,29 @@ template<typename BoundType, typename MatType>
 bool RPTreeMeanSplit<BoundType, MatType>::GetMeanMedian(
     const MatType& data,
     const arma::uvec& samples,
-    arma::Col<ElemType>& mean,
+    arma::Col<ElemType>& meanCol,
     ElemType& splitVal)
 {
   arma::Col<ElemType> values(samples.n_elem);
 
-  mean = arma::mean(data.cols(samples), 1);
+  meanCol = mean(data.cols(samples), 1);
 
   arma::Col<ElemType> tmp(data.n_rows);
 
   for (size_t k = 0; k < samples.n_elem; ++k)
   {
     tmp = data.col(samples[k]);
-    tmp -= mean;
+    tmp -= meanCol;
 
     values[k] = dot(tmp, tmp);
   }
 
-  const ElemType maximum = arma::max(values);
+  const ElemType maximum = max(values);
   const ElemType minimum = min(values);
   if (minimum == maximum)
     return false;
 
-  splitVal = arma::median(values);
+  splitVal = median(values);
 
   if (splitVal == maximum)
     splitVal = minimum;

mlpack/include/mlpack/core/tree/cellbound.hpp

@@ -143,10 +143,10 @@ class CellBound
   ElemType& MinWidth() { return minWidth; }
 
   //! Get the distance metric associated with this bound.
-  [[deprecated("Will be removed in 5.0.0; use Distance()")]]
+  [[deprecated("Will be removed in mlpack 5.0.0; use Distance()")]]
   const DistanceType& Metric() const { return distance; }
   //! Modify the distance metric associated with this bound.
-  [[deprecated("Will be removed in 5.0.0; use Distance()")]]
+  [[deprecated("Will be removed in mlpack 5.0.0; use Distance()")]]
   DistanceType& Metric() { return distance; }
 
   //! Get the distance metric associated with this bound.

mlpack/include/mlpack/core/tree/cosine_tree/cosine_tree_impl.hpp

@@ -33,7 +33,7 @@ inline CosineTree<MatType>::CosineTree(const MatType& dataset) :
   for (size_t i = 0; i < numColumns; ++i)
   {
     indices[i] = i;
-    double l2Norm = (double) arma::norm(dataset.col(i), 2);
+    double l2Norm = (double) norm(dataset.col(i), 2);
     l2NormsSquared(i) = l2Norm * l2Norm;
   }
 
@@ -92,7 +92,7 @@ inline CosineTree<MatType>::CosineTree(const MatType& dataset,
 
   // Define root node of the tree and add it to the queue.
   CosineTree root(dataset);
-  VecType tempVector = arma::zeros<VecType>(dataset.n_rows);
+  VecType tempVector = VecType(dataset.n_rows, GetFillType<VecType>::zeros);
   root.L2Error(-1.0); // We don't know what the error is.
   root.BasisVector(tempVector);
   treeQueue.push_back(&root);
@@ -412,8 +412,8 @@ inline void CosineTree<MatType>::ModifiedGramSchmidt(
   }
 
   // Normalize the modified centroid vector.
-  if (arma::norm(newBasisVector, 2))
-    newBasisVector /= arma::norm(newBasisVector, 2);
+  if (norm(newBasisVector, 2))
+    newBasisVector /= norm(newBasisVector, 2);
 }
 
 template<typename MatType>
@@ -475,7 +475,7 @@ inline double CosineTree<MatType>::MonteCarloError(
     }
 
     // Calculate the Frobenius norm squared of the projected vector.
-    double frobProjection = arma::norm(projection, "frob");
+    double frobProjection = norm(projection, "frob");
     double frobProjectionSquared = frobProjection * frobProjection;
 
     // Calculate the weighted projection magnitude.
@@ -483,8 +483,8 @@ inline double CosineTree<MatType>::MonteCarloError(
   }
 
   // Compute mean and standard deviation of the weighted samples.
-  double mu = arma::mean(weightedMagnitudes);
-  double sigma = arma::stddev(weightedMagnitudes);
+  double mu = mean(weightedMagnitudes);
+  double sigma = stddev(weightedMagnitudes);
 
   if (!sigma)
   {
@@ -536,7 +536,7 @@ inline void CosineTree<MatType>::CosineNodeSplit()
 
   // Compute maximum and minimum cosine values.
   double cosineMax, cosineMin;
-  cosineMax = arma::max(cosines % (cosines < 1));
+  cosineMax = max(cosines % (cosines < 1));
   cosineMin = min(cosines);
 
   std::vector<size_t> leftIndices, rightIndices;
@@ -670,8 +670,8 @@ inline void CosineTree<MatType>::CalculateCosines(
     else
     {
       cosines(i) =
-          std::abs(arma::norm_dot(dataset->col(indices[splitPointIndex]),
-                                  dataset->col(indices[i])));
+          std::abs(norm_dot(dataset->col(indices[splitPointIndex]),
+                            dataset->col(indices[i])));
     }
   }
 }

mlpack/include/mlpack/core/tree/octree/octree.hpp

@@ -402,6 +402,16 @@ class Octree
       const VecType& point,
       typename std::enable_if_t<IsVector<VecType>::value>* = 0) const;
 
+  //! Return the index of the beginning point of this subset.
+  size_t Begin() const { return begin; }
+  //! Modify the index of the beginning point of this subset.
+  size_t& Begin() { return begin; }
+
+  //! Return the number of points in this subset.
+  size_t Count() const { return count; }
+  //! Modify the number of points in this subset.
+  size_t& Count() { return count; }
+
   //! Store the center of the bounding region in the given vector.
   template<typename VecType>
   void Center(VecType& center) const { bound.Center(center); }

mlpack/include/mlpack/core/tree/octree/octree_impl.hpp

@@ -288,8 +288,13 @@ Octree<DistanceType, StatisticType, MatType>::Octree(
   // Calculate empirical center of data.
   bound |= dataset->cols(begin, begin + count - 1);
 
-  // Now split the node.
-  SplitNode(center, width, maxLeafSize);
+  ElemType maxWidth = 0.0;
+  for (size_t i = 0; i < bound.Dim(); ++i)
+    if (bound[i].Hi() - bound[i].Lo() > maxWidth)
+      maxWidth = bound[i].Hi() - bound[i].Lo();
+
+  if (maxWidth != 0.0)
+    SplitNode(center, width, maxLeafSize);
 
   // Calculate the distance from the empirical center of this node to the
   // empirical center of the parent.
@@ -323,8 +328,13 @@ Octree<DistanceType, StatisticType, MatType>::Octree(
   // Calculate empirical center of data.
   bound |= dataset->cols(begin, begin + count - 1);
 
-  // Now split the node.
-  SplitNode(center, width, oldFromNew, maxLeafSize);
+  ElemType maxWidth = 0.0;
+  for (size_t i = 0; i < bound.Dim(); ++i)
+    if (bound[i].Hi() - bound[i].Lo() > maxWidth)
+      maxWidth = bound[i].Hi() - bound[i].Lo();
+
+  if (maxWidth != 0.0)
+    SplitNode(center, width, oldFromNew, maxLeafSize);
 
   // Calculate the distance from the empirical center of this node to the
   // empirical center of the parent.

mlpack/include/mlpack/core/util/arma_traits.hpp

@@ -12,6 +12,16 @@
 #ifndef MLPACK_CORE_UTIL_ARMA_TRAITS_HPP
 #define MLPACK_CORE_UTIL_ARMA_TRAITS_HPP
 
+// Get whether or not the given type is any non-field Armadillo type
+// This includes sparse, dense, and cube types
+template<typename T>
+struct IsArma
+{
+  constexpr static bool value = arma::is_arma_type<T>::value ||
+                                arma::is_arma_cube_type<T>::value ||
+                                arma::is_arma_sparse_type<T>::value;
+};
+
 // Structs have public members by default (that's why they are chosen over
 // classes).
 
@@ -154,6 +164,15 @@ struct GetRowType<arma::SpMat<eT>>
   using type = arma::SpRow<eT>;
 };
 
+template<typename MatType, typename T = void>
+struct GetURowType;
+
+template<typename MatType>
+struct GetURowType<MatType, std::enable_if_t<IsArma<MatType>::value>>
+{
+  using type = arma::Row<arma::uword>;
+};
+
 // Get the column vector type corresponding to a given MatType.
 
 template<typename MatType>
@@ -162,8 +181,11 @@ struct GetColType
   using type = arma::Col<typename MatType::elem_type>;
 };
 
+template<typename MatType, typename T = void>
+struct GetUColType;
+
 template<typename MatType>
-struct GetUColType
+struct GetUColType<MatType, std::enable_if_t<IsArma<MatType>::value>>
 {
   using type = arma::Col<arma::uword>;
 };
@@ -239,16 +261,6 @@ struct GetCubeType<arma::Mat<eT>>
   using type = arma::Cube<eT>;
 };
 
-#if defined(MLPACK_HAS_COOT)
-
-template<typename eT>
-struct GetCubeType<coot::Mat<eT>>
-{
-  using type = coot::Cube<eT>;
-};
-
-#endif
-
 // Get the sparse matrix type corresponding to a given MatType.
 
 template<typename MatType>
@@ -356,35 +368,10 @@ struct IsDense<arma::Mat<eT>>
   constexpr static bool value = true;
 };
 
-// Get whether or not the given type is any non-field Armadillo type
-// This includes sparse, dense, and cube types
 template<typename T>
-struct IsArma
+struct IsSparse
 {
-  constexpr static bool value = arma::is_arma_type<T>::value ||
-                                arma::is_arma_cube_type<T>::value ||
-                                arma::is_arma_sparse_type<T>::value;
+  constexpr static bool value = arma::is_arma_sparse_type<T>::value;
 };
 
-#if defined(MLPACK_HAS_COOT)
-
-// Get whether or not the given type is any Bandicoot type
-// This includes dense and cube types
-template<typename T>
-struct IsCoot
-{
-  constexpr static bool value = coot::is_coot_type<T>::value ||
-                                coot::is_coot_cube_type<T>::value;
-};
-
-#else
-
-template<typename T>
-struct IsCoot
-{
-  constexpr static bool value = false;
-};
-
-#endif
-
 #endif

mlpack/include/mlpack/core/util/coot_traits.hpp

@@ -0,0 +1,97 @@
+/**
+ * @file core/util/coot_traits.hpp
+ * @author Ryan Curtin
+ * @author Omar Shrit
+ *
+ * Some traits used for template metaprogramming (SFINAE) with Bandicoot types.
+ *
+ * mlpack is free software; you may redistribute it and/or modify it under the
+ * terms of the 3-clause BSD license.  You should have received a copy of the
+ * 3-clause BSD license along with mlpack.  If not, see
+ * http://www.opensource.org/licenses/BSD-3-Clause for more information.
+ */
+#ifndef MLPACK_CORE_UTIL_COOT_TRAITS_HPP
+#define MLPACK_CORE_UTIL_COOT_TRAITS_HPP
+
+#if defined(MLPACK_HAS_COOT)
+
+// Get whether or not the given type is any Bandicoot type
+// This includes dense and cube types
+template<typename T>
+struct IsCoot
+{
+  constexpr static bool value = coot::is_coot_type<T>::value ||
+                                coot::is_coot_cube_type<T>::value;
+};
+
+template<typename eT>
+struct GetCubeType<coot::Mat<eT>>
+{
+  using type = coot::Cube<eT>;
+};
+
+template<typename eT>
+struct GetDenseMatType<coot::Cube<eT>>
+{
+  using type = coot::Mat<eT>;
+};
+
+template<typename MatType>
+struct GetURowType<MatType, std::enable_if_t<IsCoot<MatType>::value>>
+{
+  using type = coot::Row<coot::uword>;
+};
+
+template<typename MatType>
+struct GetUColType<MatType, std::enable_if_t<IsCoot<MatType>::value>>
+{
+  using type = coot::Col<coot::uword>;
+};
+
+template<typename eT>
+struct IsVector<coot::Col<eT> >
+{
+  static const bool value = true;
+};
+
+template<typename eT>
+struct IsVector<coot::Row<eT> >
+{
+  static const bool value = true;
+};
+
+template<typename eT>
+struct IsVector<coot::subview_col<eT> >
+{
+  static const bool value = true;
+};
+
+template<typename eT>
+struct IsVector<coot::subview_row<eT> >
+{
+  static const bool value = true;
+};
+
+template<typename eT>
+struct IsMatrix<coot::Mat<eT> >
+{
+  static const bool value = true;
+};
+
+template<typename eT>
+struct IsCube<coot::Cube<eT> >
+{
+  static const bool value = true;
+};
+
+#else
+
+template<typename T>
+struct IsCoot
+{
+  constexpr static bool value = false;
+};
+
+#endif // defined(MLPACK_HAS_COOT)
+
+#endif

mlpack/include/mlpack/core/util/forward.hpp

@@ -30,7 +30,6 @@ class Timers;
 #include "params.hpp"
 
 namespace mlpack {
-namespace data {
 
 class IncrementPolicy;
 
@@ -44,7 +43,6 @@ using DatasetInfo = DatasetMapper<IncrementPolicy, std::string>;
 // DatasetInfo.
 void CheckCategoricalParam(util::Params& p, const std::string& paramName);
 
-} // namespace data
 } // namespace mlpack
 
 #endif

mlpack/include/mlpack/core/util/param.hpp

@@ -757,10 +757,10 @@
  *      here---it will cause problems.
  * @param ALIAS One-character string representing the alias of the parameter.
  */
-#define TUPLE_TYPE std::tuple<mlpack::data::DatasetInfo, arma::mat>
+#define TUPLE_TYPE std::tuple<mlpack::DatasetInfo, arma::mat>
 #define PARAM_MATRIX_AND_INFO_IN(ID, DESC, ALIAS) \
     PARAM(TUPLE_TYPE, ID, DESC, ALIAS, \
-        "std::tuple<mlpack::data::DatasetInfo, arma::mat>", false, true, true, \
+        "std::tuple<mlpack::DatasetInfo, arma::mat>", false, true, true, \
         TUPLE_TYPE())
 
 /**
@@ -789,10 +789,10 @@
  *      here---it will cause problems.
  * @param ALIAS One-character string representing the alias of the parameter.
  */
-#define TUPLE_TYPE std::tuple<mlpack::data::DatasetInfo, arma::mat>
+#define TUPLE_TYPE std::tuple<mlpack::DatasetInfo, arma::mat>
 #define PARAM_MATRIX_AND_INFO_IN_REQ(ID, DESC, ALIAS) \
     PARAM(TUPLE_TYPE, ID, DESC, ALIAS, \
-        "std::tuple<mlpack::data::DatasetInfo, arma::mat>", true, true, true, \
+        "std::tuple<mlpack::DatasetInfo, arma::mat>", true, true, true, \
         TUPLE_TYPE())
 
 /**

mlpack/include/mlpack/core/util/params_impl.hpp

@@ -286,11 +286,11 @@ inline void Params::CheckInputMatrices()
     {
       CheckInputMatrix(Get<arma::rowvec>(paramName), paramName);
     }
-    else if (paramType == "std::tuple<mlpack::data::DatasetInfo, arma::mat>")
+    else if (paramType == "std::tuple<mlpack::DatasetInfo, arma::mat>")
     {
       // Note that CheckCategoricalParam() is a utility function that must be
       // defined after DatasetInfo is fully defined.
-      data::CheckCategoricalParam(*this, paramName);
+      CheckCategoricalParam(*this, paramName);
     }
   }
 }

mlpack/include/mlpack/core/util/using.hpp

@@ -18,16 +18,24 @@
 #define MLPACK_CORE_UTIL_USING_HPP
 
 #include "arma_traits.hpp"
+#include "coot_traits.hpp"
 
 namespace mlpack {
 
 #ifdef MLPACK_HAS_COOT
 
 /* using for bandicoot namespace*/
-using coot::exp;
+using coot::accu;
+using coot::all;
+using coot::conv_to;
 using coot::dot;
+using coot::exp;
+using coot::find;
+using coot::find_nan;
+using coot::find_nonfinite;
 using coot::join_cols;
 using coot::join_rows;
+using coot::linspace;
 using coot::log;
 using coot::min;
 using coot::max;
@@ -41,21 +49,38 @@ using coot::randn;
 using coot::randu;
 using coot::repmat;
 using coot::sign;
+using coot::size;
+using coot::sort_index;
 using coot::sqrt;
 using coot::square;
 using coot::sum;
 using coot::trans;
 using coot::vectorise;
 using coot::zeros;
+#else
+
+// Only use arma::conv_to if Bandicoot is not available: Bandicoot's conv_to
+// supports Armadillo types too.
+using arma::conv_to;
 
 #endif
 
 /* using for armadillo namespace */
-using arma::exp;
+using arma::accu;
+using arma::all;
 using arma::dot;
+using arma::exp;
+using arma::find;
+#if ARMA_VERSION_MAJOR > 11 || \
+    (ARMA_VERSION_MAJOR == 11 && ARMA_VERSION_MINOR >= 4)
+using arma::find_nan;
+#endif
+using arma::find_nonfinite;
 using arma::join_cols;
 using arma::join_rows;
+using arma::linspace;
 using arma::log;
+using arma::linspace;
 using arma::min;
 using arma::max;
 using arma::mean;
@@ -68,6 +93,8 @@ using arma::randn;
 using arma::randu;
 using arma::repmat;
 using arma::sign;
+using arma::size;
+using arma::sort_index;
 using arma::sqrt;
 using arma::square;
 using arma::sum;

mlpack/include/mlpack/core/util/version.hpp

@@ -15,10 +15,12 @@
 #include <string>
 
 // The version of mlpack.  If this is a git repository, this will be a version
-// with higher number than the most recent release.
+// with higher number than the most recent release, and the MLPACK_PRERELEASE
+// macro will be defined.
 #define MLPACK_VERSION_MAJOR 4
-#define MLPACK_VERSION_MINOR 6
-#define MLPACK_VERSION_PATCH 2
+#define MLPACK_VERSION_MINOR 7
+#define MLPACK_VERSION_PATCH 0
+//#define MLPACK_PRERELEASE
 
 // The name of the version (for use by --version).
 namespace mlpack {

mlpack/include/mlpack/core/util/version_impl.hpp

@@ -20,16 +20,13 @@ namespace util {
 // name.
 inline std::string GetVersion()
 {
-#ifndef MLPACK_GIT_VERSION
   std::stringstream o;
   o << "mlpack " << MLPACK_VERSION_MAJOR << "." << MLPACK_VERSION_MINOR
       << "." << MLPACK_VERSION_PATCH;
+  #if defined(MLPACK_PRERELEASE)
+  o << " (prerelease)";
+  #endif
   return o.str();
-#else
-  // This file is generated by CMake as necessary and contains just a return
-  // statement with the git revision in it.
-  #include "gitversion.hpp"
-#endif
 }
 
 } // namespace util

mlpack/include/mlpack/methods/adaboost/adaboost_classify_main.cpp

@@ -84,7 +84,7 @@ void BINDING_FUNCTION(util::Params& params, util::Timers& timers)
   timers.Stop("adaboost_classification");
 
   Row<size_t> results;
-  data::RevertLabels(predictedLabels, m->Mappings(), results);
+  RevertLabels(predictedLabels, m->Mappings(), results);
 
   params.Get<arma::Row<size_t>>("predictions") = std::move(results);
 }

mlpack/include/mlpack/methods/adaboost/adaboost_main.cpp

@@ -108,7 +108,7 @@ BINDING_EXAMPLE(
 BINDING_SEE_ALSO("AdaBoost on Wikipedia", "https://en.wikipedia.org/wiki/"
     "AdaBoost");
 BINDING_SEE_ALSO("Improved boosting algorithms using confidence-rated "
-    "predictions (pdf)", "http://rob.schapire.net/papers/SchapireSi98.pdf");
+    "predictions (pdf)", "http://www.schapire.net/papers/SchapireSi98.pdf");
 BINDING_SEE_ALSO("Perceptron", "#perceptron");
 BINDING_SEE_ALSO("Decision Trees", "#decision_tree");
 BINDING_SEE_ALSO("AdaBoost C++ class documentation",
@@ -202,7 +202,7 @@ void BINDING_FUNCTION(util::Params& params, util::Timers& timers)
     Row<size_t> labels;
 
     // Normalize the labels.
-    data::NormalizeLabels(labelsIn, labels, m->Mappings());
+    NormalizeLabels(labelsIn, labels, m->Mappings());
 
     // Get other training parameters.
     const double tolerance = params.Get<double>("tolerance");
@@ -253,7 +253,7 @@ void BINDING_FUNCTION(util::Params& params, util::Timers& timers)
     }
 
     Row<size_t> results;
-    data::RevertLabels(predictedLabels, m->Mappings(), results);
+    RevertLabels(predictedLabels, m->Mappings(), results);
 
     // Save the predicted labels.
     if (params.Has("predictions"))

mlpack/include/mlpack/methods/adaboost/adaboost_train_main.cpp

@@ -84,7 +84,7 @@ BINDING_EXAMPLE(
 BINDING_SEE_ALSO("AdaBoost on Wikipedia", "https://en.wikipedia.org/wiki/"
     "AdaBoost");
 BINDING_SEE_ALSO("Improved boosting algorithms using confidence-rated "
-    "predictions (pdf)", "http://rob.schapire.net/papers/SchapireSi98.pdf");
+    "predictions (pdf)", "http://www.schapire.net/papers/SchapireSi98.pdf");
 BINDING_SEE_ALSO("Perceptron", "#perceptron");
 BINDING_SEE_ALSO("Decision Trees", "#decision_tree");
 BINDING_SEE_ALSO("AdaBoost C++ class documentation",
@@ -157,7 +157,7 @@ void BINDING_FUNCTION(util::Params& params, util::Timers& timers)
   Row<size_t> labels;
 
   // Normalize the labels.
-  data::NormalizeLabels(labelsIn, labels, m->Mappings());
+  NormalizeLabels(labelsIn, labels, m->Mappings());
 
   // Get other training parameters.
   const double tolerance = params.Get<double>("tolerance");

mlpack/include/mlpack/methods/ann/activation_functions/activation_functions.hpp

@@ -35,6 +35,7 @@
 #include "elliot_function.hpp"
 #include "gaussian_function.hpp"
 #include "gelu_function.hpp"
+#include "gelu_exact_function.hpp"
 #include "hard_sigmoid_function.hpp"
 #include "hard_swish_function.hpp"
 #include "identity_function.hpp"

mlpack/include/mlpack/methods/ann/activation_functions/bipolar_sigmoid_function.hpp

@@ -34,7 +34,8 @@ class BipolarSigmoidFunction
    * @param x Input data.
    * @return f(x).
    */
-  static double Fn(const double x)
+  template<typename ElemType>
+  static ElemType Fn(const ElemType x)
   {
     return (1 - std::exp(-x)) / (1 + std::exp(-x));
   }
@@ -58,9 +59,10 @@ class BipolarSigmoidFunction
    * @param y Result of Fn(x).
    * @return f'(x)
    */
-  static double Deriv(const double /* x */, const double y)
+  template<typename ElemType>
+  static ElemType Deriv(const ElemType /* x */, const ElemType y)
   {
-    return (1.0 - std::pow(y, 2)) / 2.0;
+    return (1 - std::pow(y, ElemType(2))) / 2;
   }
 
   /**
@@ -75,7 +77,7 @@ class BipolarSigmoidFunction
                     const OutputVecType& y,
                     DerivVecType& dy)
   {
-    dy = (1.0 - pow(y, 2)) / 2.0;
+    dy = (1 - square(y)) / 2;
   }
 }; // class BipolarSigmoidFunction