sleipnirgroup-jormungandr 0.6.7.dev12__tar.gz → 0.6.7.dev14__tar.gz

{sleipnirgroup_jormungandr-0.6.7.dev12 → sleipnirgroup_jormungandr-0.6.7.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sleipnirgroup-jormungandr
-Version: 0.6.7.dev12
+Version: 0.6.7.dev14
 Summary: Reverse mode autodiff library and NLP solver DSL
 License-Expression: BSD-3-Clause
 License-File: LICENSE.txt

{sleipnirgroup_jormungandr-0.6.7.dev12 → sleipnirgroup_jormungandr-0.6.7.dev14}/include/sleipnir/autodiff/expression.hpp

@@ -31,11 +31,6 @@ inline constexpr bool USE_POOL_ALLOCATOR = true;
 template <typename Scalar>
 struct Expression;
 
-template <typename Scalar>
-constexpr void inc_ref_count(Expression<Scalar>* expr);
-template <typename Scalar>
-constexpr void dec_ref_count(Expression<Scalar>* expr);
-
 /// Typedef for intrusive shared pointer to Expression.
 ///
 /// @tparam Scalar Scalar type.
@@ -63,9 +58,6 @@ struct BinaryMinusExpression;
 template <typename Scalar, ExpressionType T>
 struct BinaryPlusExpression;
 
-template <typename Scalar>
-struct ConstantExpression;
-
 template <typename Scalar, ExpressionType T>
 struct DivExpression;
 
@@ -377,24 +369,6 @@ struct Expression {
   virtual void accumulate_adjoints_expr() const {}
 };
 
-template <typename Scalar>
-ExpressionPtr<Scalar> constant_ptr(Scalar value) {
-  return make_expression_ptr<ConstantExpression<Scalar>>(value);
-}
-
-template <typename Scalar>
-ExpressionPtr<Scalar> cbrt(const ExpressionPtr<Scalar>& x);
-template <typename Scalar>
-ExpressionPtr<Scalar> exp(const ExpressionPtr<Scalar>& x);
-template <typename Scalar>
-ExpressionPtr<Scalar> sign(const ExpressionPtr<Scalar>& x);
-template <typename Scalar>
-ExpressionPtr<Scalar> sin(const ExpressionPtr<Scalar>& x);
-template <typename Scalar>
-ExpressionPtr<Scalar> sinh(const ExpressionPtr<Scalar>& x);
-template <typename Scalar>
-ExpressionPtr<Scalar> sqrt(const ExpressionPtr<Scalar>& x);
-
 /// Derived expression type for binary minus operator.
 ///
 /// @tparam Scalar Scalar type.
@@ -589,6 +563,11 @@ struct ConstantExpression final : Expression<Scalar> {
   std::string_view name() const override { return "constant"; }
 };
 
+template <typename Scalar>
+ExpressionPtr<Scalar> constant_ptr(Scalar value) {
+  return make_expression_ptr<ConstantExpression<Scalar>>(value);
+}
+
 /// Derived expression type for decision variable.
 ///
 /// @tparam Scalar Scalar type.
@@ -1417,11 +1396,11 @@ template <typename Scalar>
 ExpressionPtr<Scalar> hypot(const ExpressionPtr<Scalar>& x,
                             const ExpressionPtr<Scalar>& y);
 
-/// Derived expression type for hypot().
+/// Derived expression type for hypot() with two arguments.
 ///
 /// @tparam Scalar Scalar type.
 template <typename Scalar>
-struct HypotExpression final : Expression<Scalar> {
+struct Hypot2Expression final : Expression<Scalar> {
   /// Binary operator's left operand.
   ExpressionPtr<Scalar> x;
 
@@ -1432,7 +1411,7 @@ struct HypotExpression final : Expression<Scalar> {
   ///
   /// @param x Binary operator's left operand.
   /// @param y Binary operator's right operand.
-  constexpr HypotExpression(ExpressionPtr<Scalar> x, ExpressionPtr<Scalar> y)
+  constexpr Hypot2Expression(ExpressionPtr<Scalar> x, ExpressionPtr<Scalar> y)
       : x{std::move(x)}, y{std::move(y)} {}
 
   void visit_args(
@@ -1451,32 +1430,102 @@ struct HypotExpression final : Expression<Scalar> {
   std::string_view name() const override { return "hypot"; }
 
   void accumulate_adjoints() const override {
-    x->adj += grad_l();
-    y->adj += grad_r();
+    using std::hypot;
+    Scalar norm = hypot(x->val, y->val);
+    x->adj += this->adj * x->val / norm;
+    y->adj += this->adj * y->val / norm;
   }
 
   void accumulate_adjoints_expr() const override {
-    x->adj_expr += grad_expr_l();
-    y->adj_expr += grad_expr_r();
+    auto norm = hypot(x, y);
+    x->adj_expr += this->adj_expr * x / norm;
+    y->adj_expr += this->adj_expr * y / norm;
   }
+};
 
- private:
-  Scalar grad_l() const {
-    using std::hypot;
-    return this->adj * x->val / hypot(x->val, y->val);
+/// hypot() for Expressions.
+///
+/// @tparam Scalar Scalar type.
+/// @param x The x argument.
+/// @param y The y argument.
+template <typename Scalar>
+ExpressionPtr<Scalar> hypot(const ExpressionPtr<Scalar>& x,
+                            const ExpressionPtr<Scalar>& y) {
+  using enum ExpressionType;
+  using std::hypot;
+
+  // Prune expression
+  if (x->is_constant(Scalar(0))) {
+    return abs(y);
+  } else if (y->is_constant(Scalar(0))) {
+    return abs(x);
   }
 
-  Scalar grad_r() const {
+  // Evaluate constant
+  if (x->type() == CONSTANT && y->type() == CONSTANT) {
+    return constant_ptr(hypot(x->val, y->val));
+  }
+
+  return make_expression_ptr<Hypot2Expression<Scalar>>(x, y);
+}
+
+template <typename Scalar>
+ExpressionPtr<Scalar> hypot(const ExpressionPtr<Scalar>& x,
+                            const ExpressionPtr<Scalar>& y,
+                            const ExpressionPtr<Scalar>& z);
+
+/// Derived expression type for hypot() with three arguments.
+///
+/// @tparam Scalar Scalar type.
+template <typename Scalar>
+struct Hypot3Expression final : Expression<Scalar> {
+  /// Ternary operator's first operand.
+  ExpressionPtr<Scalar> x;
+
+  /// Ternary operator's second operand.
+  ExpressionPtr<Scalar> y;
+
+  /// Ternary operator's third operand.
+  ExpressionPtr<Scalar> z;
+
+  /// Constructs a ternary expression (an operator with three arguments).
+  ///
+  /// @param x Ternary operator's first operand.
+  /// @param y Ternary operator's second operand.
+  /// @param z Ternary operator's third operand.
+  constexpr Hypot3Expression(ExpressionPtr<Scalar> x, ExpressionPtr<Scalar> y,
+                             ExpressionPtr<Scalar> z)
+      : x{std::move(x)}, y{std::move(y)}, z{std::move(z)} {}
+
+  void visit_args(
+      function_ref<void(Expression<Scalar>* arg)> func) const override {
+    func(x.get());
+    func(y.get());
+    func(z.get());
+  }
+
+  Scalar value() const override {
     using std::hypot;
-    return this->adj * y->val / hypot(x->val, y->val);
+    return hypot(x->val, y->val, z->val);
   }
 
-  ExpressionPtr<Scalar> grad_expr_l() const {
-    return this->adj_expr * x / hypot(x, y);
+  ExpressionType type() const override { return ExpressionType::NONLINEAR; }
+
+  std::string_view name() const override { return "hypot"; }
+
+  void accumulate_adjoints() const override {
+    using std::hypot;
+    Scalar norm = hypot(x->val, y->val, z->val);
+    x->adj += this->adj * x->val / norm;
+    y->adj += this->adj * y->val / norm;
+    z->adj += this->adj * z->val / norm;
   }
 
-  ExpressionPtr<Scalar> grad_expr_r() const {
-    return this->adj_expr * y / hypot(x, y);
+  void accumulate_adjoints_expr() const override {
+    auto norm = hypot(x, y, z);
+    x->adj_expr += this->adj_expr * x / norm;
+    y->adj_expr += this->adj_expr * y / norm;
+    z->adj_expr += this->adj_expr * z / norm;
   }
 };
 
@@ -1485,25 +1534,29 @@ struct HypotExpression final : Expression<Scalar> {
 /// @tparam Scalar Scalar type.
 /// @param x The x argument.
 /// @param y The y argument.
+/// @param z The z argument.
 template <typename Scalar>
 ExpressionPtr<Scalar> hypot(const ExpressionPtr<Scalar>& x,
-                            const ExpressionPtr<Scalar>& y) {
+                            const ExpressionPtr<Scalar>& y,
+                            const ExpressionPtr<Scalar>& z) {
   using enum ExpressionType;
   using std::hypot;
 
   // Prune expression
   if (x->is_constant(Scalar(0))) {
-    return abs(y);
+    return hypot(y, z);
   } else if (y->is_constant(Scalar(0))) {
-    return abs(x);
+    return hypot(x, z);
+  } else if (z->is_constant(Scalar(0))) {
+    return hypot(x, y);
   }
 
   // Evaluate constant
-  if (x->type() == CONSTANT && y->type() == CONSTANT) {
-    return constant_ptr(hypot(x->val, y->val));
+  if (x->type() == CONSTANT && y->type() == CONSTANT && z->type() == CONSTANT) {
+    return constant_ptr(hypot(x->val, y->val, z->val));
   }
 
-  return make_expression_ptr<HypotExpression<Scalar>>(x, y);
+  return make_expression_ptr<Hypot3Expression<Scalar>>(x, y, z);
 }
 
 /// Derived expression type for is_nonnegative().

{sleipnirgroup_jormungandr-0.6.7.dev12 → sleipnirgroup_jormungandr-0.6.7.dev14}/include/sleipnir/autodiff/variable.hpp

@@ -708,7 +708,7 @@ Variable<Scalar> tanh(const Variable<Scalar>& x) {
 template <typename Scalar>
 Variable<Scalar> hypot(const Variable<Scalar>& x, const Variable<Scalar>& y,
                        const Variable<Scalar>& z) {
-  return Variable{sqrt(pow(x, 2) + pow(y, 2) + pow(z, 2))};
+  return Variable{detail::hypot(x.expr, y.expr, z.expr)};
 }
 
 // The standard form for equality constraints is c(x) = 0, and the standard form

{sleipnirgroup_jormungandr-0.6.7.dev12 → sleipnirgroup_jormungandr-0.6.7.dev14}/python/src/sleipnir/__init__.py

@@ -2,4 +2,4 @@
 
 from ._sleipnir import *
 
-__version__ = "0.6.7.dev12"
+__version__ = "0.6.7.dev14"