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

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

@@ -34,9 +34,10 @@ class MultiQuadFunction
    * @param x Input data.
    * @return f(x).
    */
-  static double Fn(const double x)
+  template<typename ElemType>
+  static ElemType Fn(const ElemType x)
   {
-    return std::pow(1 + x * x, 0.5);
+    return std::sqrt(1 + x * x);
   }
 
   /**
@@ -48,7 +49,7 @@ class MultiQuadFunction
   template<typename InputVecType, typename OutputVecType>
   static void Fn(const InputVecType& x, OutputVecType& y)
   {
-    y = pow((1 + pow(x, 2)), 0.5);
+    y = sqrt((1 + square(x)));
   }
 
   /**
@@ -61,7 +62,8 @@ class MultiQuadFunction
    * @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 x / y;
   }

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

@@ -33,7 +33,8 @@ class Poisson1Function
    * @param x Input data.
    * @return f(x).
    */
-  static double Fn(const double x)
+  template<typename ElemType>
+  static ElemType Fn(const ElemType x)
   {
     return (x - 1) * std::exp(-x);
   }
@@ -57,7 +58,8 @@ class Poisson1Function
    * @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 -std::exp(-x) * (x - 2);
   }

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

@@ -33,9 +33,10 @@ class QuadraticFunction
    * @param x Input data.
    * @return f(x).
    */
-  static double Fn(const double x)
+  template<typename ElemType>
+  static ElemType Fn(const ElemType x)
   {
-    return std::pow(x, 2);
+    return std::pow(x, ElemType(2));
   }
 
   /**
@@ -47,7 +48,7 @@ class QuadraticFunction
   template<typename InputVecType, typename OutputVecType>
   static void Fn(const InputVecType& x, OutputVecType& y)
   {
-    y = pow(x, 2);
+    y = square(x);
   }
 
   /**
@@ -57,7 +58,8 @@ class QuadraticFunction
    * @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 2 * x;
   }

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

@@ -50,9 +50,10 @@ class RectifierFunction
    * @param x Input data.
    * @return f(x).
    */
-  static double Fn(const double x)
+  template<typename ElemType>
+  static ElemType Fn(const ElemType x)
   {
-    return std::max(0.0, x);
+    return std::max(ElemType(0), x);
   }
 
   /**
@@ -64,9 +65,7 @@ class RectifierFunction
   template<typename MatType>
   static void Fn(const MatType& x, MatType& y)
   {
-    y.set_size(size(x));
-    y.zeros();
-    y = max(y, x);
+    y = clamp(x, 0, std::numeric_limits<typename MatType::elem_type>::max());
   }
 
   /**
@@ -76,9 +75,10 @@ class RectifierFunction
    * @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 (double)(x > 0);
+    return ElemType(x > 0);
   }
 
   /**
@@ -89,11 +89,11 @@ class RectifierFunction
    * @param dy The resulting derivatives.
    */
   template<typename InputType, typename OutputType, typename DerivType>
-  static void Deriv(const InputType& x,
-                    const OutputType& /* y */,
+  static void Deriv(const InputType& /* x */,
+                    const OutputType& y,
                     DerivType& dy)
   {
-    dy = ConvTo<DerivType>::From(x > 0);
+    dy = sign(y);
   }
 }; // class RectifierFunction
 

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

@@ -49,9 +49,10 @@ class SILUFunction
    * @param x Input data.
    * @return f(x).
    */
-  static double Fn(const double x)
+  template<typename ElemType>
+  static ElemType Fn(const ElemType x)
   {
-    return x / (1.0 + std::exp(-x));
+    return x / (1 + std::exp(-x));
   }
 
   /**
@@ -63,7 +64,7 @@ class SILUFunction
   template<typename InputVecType, typename OutputVecType>
   static void Fn(const InputVecType &x, OutputVecType &y)
   {
-    y = x / (1.0 + exp(-x));
+    y = x / (1 + exp(-x));
   }
 
   /**
@@ -73,11 +74,12 @@ class SILUFunction
    * @param y Result of Fn(x).
    * @return f'(x)
    */
-  static double Deriv(const double x, const double y)
+  template<typename ElemType>
+  static double Deriv(const ElemType x, const ElemType y)
   {
     // since y = x * sigmoid(x)
-    double sigmoid = y / x; // save an exp
-    return x == 0 ? 0.5 : sigmoid * (1.0 + x * (1.0 - sigmoid));
+    const ElemType sigmoid = y / x; // save an exp
+    return x == 0 ? ElemType(0.5) : sigmoid * (1 + x * (1 - sigmoid));
     // the expression above is indeterminate at 0, even though
     // the expression solely in terms of x is defined (= 0.5)
   }
@@ -97,10 +99,10 @@ class SILUFunction
     // since y = x * sigmoid(x)
     // DerivVecType sigmoid = y / x;
     // dy = sigmoid % (1.0 + x % (1.0 - sigmoid));
-    dy = (y / x) % (1.0 + x - y);
+    dy = (y / x) % (1 + x - y);
     // the expression above is indeterminate at 0, even though
     // the expression solely in terms of x is defined (= 0.5)
-    dy(arma::find(x == 0)).fill(0.5);
+    dy(arma::find(x == 0)).fill(typename InputVecType::elem_type(0.5));
   }
 }; // class SILUFunction
 

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

@@ -48,9 +48,10 @@ class SoftplusFunction
    * @param x Input data.
    * @return f(x).
    */
-  static double Fn(const double x)
+  template<typename ElemType>
+  static ElemType Fn(const ElemType x)
   {
-    const double val = std::log(1 + std::exp(x));
+    const ElemType val = std::log(1 + std::exp(x));
     if (std::isfinite(val))
       return val;
     return x;
@@ -65,7 +66,7 @@ class SoftplusFunction
   template<typename InputType, typename OutputType>
   static void Fn(const InputType& x, OutputType& y)
   {
-    y.set_size(arma::size(x));
+    y.set_size(size(x));
 
     for (size_t i = 0; i < x.n_elem; ++i)
       y(i) = Fn(x(i));
@@ -78,9 +79,10 @@ class SoftplusFunction
    * @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 / (1 + std::exp(-x));
+    return 1 / (1 + std::exp(-x));
   }
 
   /**
@@ -95,7 +97,7 @@ class SoftplusFunction
                     const OutputType& /* y */,
                     DerivType& dy)
   {
-    dy = 1.0 / (1 + exp(-x));
+    dy = 1 / (1 + exp(-x));
   }
 
   /**
@@ -104,9 +106,10 @@ class SoftplusFunction
    * @param y Input data.
    * @return f^{-1}(y)
    */
-  static double Inv(const double y)
+  template<typename ElemType>
+  static ElemType Inv(const ElemType y)
   {
-    const double val = std::log(std::exp(y) - 1);
+    const ElemType val = std::log(std::exp(y) - 1);
     if (std::isfinite(val))
       return val;
     return y;
@@ -121,7 +124,7 @@ class SoftplusFunction
   template<typename InputType, typename OutputType>
   static void Inv(const InputType& y, OutputType& x)
   {
-    x.set_size(arma::size(y));
+    x.set_size(size(y));
 
     for (size_t i = 0; i < y.n_elem; ++i)
       x(i) = Inv(y(i));

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

@@ -9,7 +9,7 @@
  *
  * @code
  * @inproceedings{GlorotAISTATS2010,
- *   title={title={Understanding the difficulty of training deep feedforward
+ *   title={Understanding the difficulty of training deep feedforward
  *   neural networks},
  *   author={Glorot, Xavier and Bengio, Yoshua},
  *   booktitle={Proceedings of AISTATS 2010},
@@ -34,13 +34,7 @@ namespace mlpack {
  *
  * @f{eqnarray*}{
  * f(x) &=& \frac{x}{1 + |x|} \\
- * f'(x) &=& (1 - |f(x)|)^2 \\
- * f(x) &=& \left\{
- *   \begin{array}{lr}
- *     -\frac{x}{1 - x} & : x \le 0 \\
- *     \frac{x}{1 + x} & : x > 0
- *   \end{array}
- * \right.
+ * f'(x) &=& (1 + |f(x)|)^2 \\
  * @f}
  */
 class SoftsignFunction
@@ -52,11 +46,10 @@ class SoftsignFunction
    * @param x Input data.
    * @return f(x).
    */
-  static double Fn(const double x)
+  template<typename ElemType>
+  static ElemType Fn(const ElemType x)
   {
-    if (x < DBL_MAX)
-      return x > -DBL_MAX ? x / (1.0 + std::abs(x)) : -1.0;
-    return 1.0;
+    return x / (1 + std::abs(x));
   }
 
   /**
@@ -68,10 +61,7 @@ class SoftsignFunction
   template<typename InputVecType, typename OutputVecType>
   static void Fn(const InputVecType& x, OutputVecType& y)
   {
-    y.set_size(arma::size(x));
-
-    for (size_t i = 0; i < x.n_elem; ++i)
-      y(i) = Fn(x(i));
+    y = x / (1 + abs(x));
   }
 
   /**
@@ -81,9 +71,10 @@ class SoftsignFunction
    * @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(1.0 + std::abs(x), 2);
+    return 1 / std::pow(1 + std::abs(x), ElemType(2));
   }
 
   /**
@@ -98,7 +89,7 @@ class SoftsignFunction
                     const OutputVecType& /* y */,
                     DerivVecType& dy)
   {
-    dy = 1.0 / pow(1.0 + arma::abs(x), 2);
+    dy = 1 / square(1 + abs(x));
   }
 
   /**
@@ -107,12 +98,13 @@ class SoftsignFunction
    * @param y Input data.
    * @return f^{-1}(y)
    */
-  static double Inv(const double y)
+  template<typename ElemType>
+  static ElemType Inv(const ElemType y)
   {
     if (y > 0)
-      return y < 1 ? -y / (y - 1) : DBL_MAX;
+      return -y / (y - 1);
     else
-      return y > -1 ? y / (1 + y) : -DBL_MAX;
+      return y / (1 + y);
   }
 
   /**
@@ -124,7 +116,7 @@ class SoftsignFunction
   template<typename InputVecType, typename OutputVecType>
   static void Inv(const InputVecType& y, OutputVecType& x)
   {
-    x.set_size(arma::size(y));
+    x.set_size(size(y));
 
     for (size_t i = 0; i < y.n_elem; ++i)
       x(i) = Inv(y(i));

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

@@ -34,9 +34,10 @@ class SplineFunction
    * @param x Input data.
    * @return f(x).
    */
-  static double Fn(const double x)
+  template<typename ElemType>
+  static ElemType Fn(const ElemType x)
   {
-    return std::pow(x, 2) * std::log(1 + x);
+    return std::pow(x, ElemType(2)) * std::log(1 + x);
   }
 
   /**
@@ -48,7 +49,7 @@ class SplineFunction
   template<typename InputVecType, typename OutputVecType>
   static void Fn(const InputVecType& x, OutputVecType& y)
   {
-    y = pow(x, 2) % log(1 + x);
+    y = square(x) % log(1 + x);
   }
 
   /**
@@ -58,9 +59,10 @@ class SplineFunction
    * @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  x != 0 ? 2 * y / x + std::pow(x, 2) / (1 + x) : 0;
+    return (x != 0) ? (2 * y / x + std::pow(x, ElemType(2)) / (1 + x)) : 0;
   }
 
   /**
@@ -75,10 +77,10 @@ class SplineFunction
                     const OutputVecType& y,
                     DerivVecType& dy)
   {
-    dy = 2 * y / x + pow(x, 2) / (1 + x);
+    dy = 2 * y / x + square(x) / (1 + x);
     // the expression above is indeterminate at 0, even though
     // the expression solely in terms of x is defined (= 0)
-    dy(arma::find(x == 0)).zeros();
+    dy(find(x == 0)).zeros();
   }
 }; // class SplineFunction
 

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

@@ -36,9 +36,10 @@ class SwishFunction
    * @param x Input data.
    * @return f(x).
    */
-  static double Fn(const double x)
+  template<typename ElemType>
+  static ElemType Fn(const ElemType x)
   {
-    return x / (1.0 + std::exp(-x));
+    return x / (1 + std::exp(-x));
   }
 
   /**
@@ -51,7 +52,7 @@ class SwishFunction
   static void Fn(const MatType& x, MatType& y,
      const typename std::enable_if_t<IsMatrix<MatType>::value>* = 0)
   {
-    y = x / (1.0 + exp(-x));
+    y = x / (1 + exp(-x));
   }
 
   /**
@@ -64,7 +65,7 @@ class SwishFunction
   static void Fn(const VecType& x, VecType& y,
       const typename std::enable_if_t<IsVector<VecType>::value>* = 0)
   {
-    y.set_size(arma::size(x));
+    y.set_size(size(x));
 
     for (size_t i = 0; i < x.n_elem; ++i)
       y(i) = Fn(x(i));
@@ -77,10 +78,11 @@ class SwishFunction
    * @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)
   {
-    double sigmoid = y / x; // save an exp
-    return x == 0 ? 0.5 : sigmoid * (1.0 + x * (1.0 - sigmoid));
+    const ElemType sigmoid = y / x; // save an exp
+    return (x == 0) ? ElemType(0.5) : sigmoid * (1 + x * (1 - sigmoid));
     // the expression above is indeterminate at 0, even though
     // the expression solely in terms of x is defined (= 0.5)
   }
@@ -97,10 +99,10 @@ class SwishFunction
                     const OutputVecType& y,
                     DerivVecType& dy)
   {
-    dy = (y / x) % (1.0 + x - y);
+    dy = (y / x) % (1 + x - y);
     // the expression above is indeterminate at 0, even though
     // the expression solely in terms of x is defined (= 0.5)
-    dy(arma::find(x == 0)).fill(0.5);
+    dy(find(x == 0)).fill(typename InputVecType::elem_type(0.5));
   }
 }; // class SwishFunction
 

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

@@ -48,7 +48,8 @@ class TanhExpFunction
    * @param x Input data.
    * @return f(x).
    */
-  static double Fn(const double x)
+  template<typename ElemType>
+  static ElemType Fn(const ElemType x)
   {
     return x * std::tanh(std::exp(x));
   }
@@ -62,7 +63,7 @@ class TanhExpFunction
   template<typename InputVecType, typename OutputVecType>
   static void Fn(const InputVecType& x, OutputVecType& y)
   {
-    y = x % arma::tanh(exp(x));
+    y = x % tanh(exp(x));
   }
 
   /**
@@ -72,11 +73,12 @@ class TanhExpFunction
    * @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)
   {
     // leverage both y and x
-    return x == 0 ? std::tanh(1) :
-        y / x + x * std::exp(x) * (1 - std::pow(y / x, 2));
+    return (x == 0) ? std::tanh(1) :
+        y / x + x * std::exp(x) * (1 - std::pow(y / x, ElemType(2)));
   }
 
   /**
@@ -92,10 +94,10 @@ class TanhExpFunction
                     DerivVecType& dy)
   {
     // leverage both y and x
-    dy = y / x + x % exp(x) % (1 - pow(y / x, 2));
+    dy = y / x + x % exp(x) % (1 - square(y / x));
     // the expression above is indeterminate at 0, even though
     // the expression solely in terms of x is defined (= tanh(1))
-    dy(arma::find(x == 0)).fill(std::tanh(1));
+    dy(find(x == 0)).fill(std::tanh(typename InputVecType::elem_type(1)));
   }
 }; // class TanhExpFunction
 

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

@@ -34,7 +34,8 @@ class TanhFunction
    * @param x Input data.
    * @return f(x).
    */
-  static double Fn(const double x)
+  template<typename ElemType>
+  static ElemType Fn(const ElemType x)
   {
     return std::tanh(x);
   }
@@ -48,7 +49,7 @@ class TanhFunction
   template<typename InputVecType, typename OutputVecType>
   static void Fn(const InputVecType& x, OutputVecType& y)
   {
-    y = arma::tanh(x);
+    y = tanh(x);
   }
 
   /**
@@ -58,9 +59,10 @@ class TanhFunction
    * @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 - std::pow(y, 2);
+    return 1 - std::pow(y, ElemType(2));
   }
 
   /**
@@ -75,7 +77,7 @@ class TanhFunction
                     const OutputVecType& y,
                     DerivVecType& dy)
   {
-    dy = 1 - pow(y, 2);
+    dy = 1 - square(y);
   }
 
   /**
@@ -84,7 +86,8 @@ class TanhFunction
    * @param y Input data.
    * @return f^{-1}(x)
    */
-  static double Inv(const double y)
+  template<typename ElemType>
+  static ElemType Inv(const ElemType y)
   {
     return std::atanh(y);
   }
@@ -98,7 +101,7 @@ class TanhFunction
   template<typename InputVecType, typename OutputVecType>
   static void Inv(const InputVecType& y, OutputVecType& x)
   {
-    x = arma::atanh(y);
+    x = atanh(y);
   }
 }; // class TanhFunction
 

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

@@ -28,6 +28,9 @@
 #include "regularizer/regularizer.hpp"
 
 #include "ffn.hpp"
+#include "dag_network.hpp"
 #include "rnn.hpp"
 
+#include "models/models.hpp"
+
 #endif