More template and expression test tweaks

Author: WardBrian

stan/math/prim/constraint/offset_multiplier_constrain.hpp

@@ -9,6 +9,7 @@
 #include <stan/math/prim/fun/size.hpp>
 #include <stan/math/prim/fun/sum.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
+#include <stan/math/prim/fun/eval.hpp>
 #include <stan/math/prim/functor/apply.hpp>
 #include <cmath>
 
@@ -58,7 +59,7 @@ inline auto offset_multiplier_constrain(const T& x, const M& mu,
   check_finite("offset_multiplier_constrain", "offset", value_of_rec(mu_ref));
   check_positive_finite("offset_multiplier_constrain", "multiplier",
                         value_of_rec(sigma_ref));
-  return fma(sigma_ref, x, mu_ref);
+  return stan::math::eval(fma(sigma_ref, x, mu_ref));
 }
 
 /**
@@ -114,7 +115,7 @@ inline auto offset_multiplier_constrain(const T& x, const M& mu, const S& sigma,
   } else {
     lp += sum(log(sigma_ref));
   }
-  return fma(sigma_ref, x, mu_ref);
+  return stan::math::eval(fma(sigma_ref, x, mu_ref));
 }
 
 /**

stan/math/prim/constraint/offset_multiplier_free.hpp

@@ -5,6 +5,7 @@
 #include <stan/math/prim/err.hpp>
 #include <stan/math/prim/constraint/identity_free.hpp>
 #include <stan/math/prim/fun/to_ref.hpp>
+#include <stan/math/prim/fun/eval.hpp>
 #include <stan/math/prim/fun/value_of.hpp>
 #include <cmath>
 
@@ -55,7 +56,7 @@ inline auto offset_multiplier_free(const T& y, const M& mu, const S& sigma) {
   check_finite("offset_multiplier_constrain", "offset", value_of(mu_ref));
   check_positive_finite("offset_multiplier_constrain", "multiplier",
                         value_of(sigma_ref));
-  return divide(subtract(y, mu_ref), sigma_ref);
+  return stan::math::eval(divide(subtract(y, mu_ref), sigma_ref));
 }
 
 /**

stan/math/prim/fun/read_corr_L.hpp

@@ -89,6 +89,8 @@ Eigen::Matrix<value_type_t<T>, Eigen::Dynamic, Eigen::Dynamic> read_corr_L(
  *
  * @tparam T type of the array (must be derived from \c Eigen::ArrayBase and
  * have one compile-time dimension equal to 1)
+ * @tparam Lp A scalar type for the lp argument. The scalar type of T should be
+ * convertable to this.
  * @param CPCs The (K choose 2) canonical partial correlations in
  * (-1, 1).
  * @param K Dimensionality of correlation matrix.
@@ -97,9 +99,10 @@ Eigen::Matrix<value_type_t<T>, Eigen::Dynamic, Eigen::Dynamic> read_corr_L(
  * @return Cholesky factor of correlation matrix for specified
  * partial correlations.
  */
-template <typename T, require_eigen_vector_t<T>* = nullptr>
+template <typename T, typename Lp, require_eigen_vector_t<T>* = nullptr,
+          require_convertible_t<value_type_t<T>, Lp>* = nullptr>
 Eigen::Matrix<value_type_t<T>, Eigen::Dynamic, Eigen::Dynamic> read_corr_L(
-    const T& CPCs, size_t K, value_type_t<T>& log_prob) {
+    const T& CPCs, size_t K, Lp& log_prob) {
   using T_scalar = value_type_t<T>;
   if (K == 0) {
     return {};

stan/math/prim/fun/read_corr_matrix.hpp

@@ -44,16 +44,20 @@ read_corr_matrix(const T_CPCs& CPCs, size_t K) {
  *
  * @tparam T_CPCs type of the array (must be derived from \c Eigen::ArrayBase
  * and have one compile-time dimension equal to 1)
+ * @tparam Lp A scalar type for the lp argument. The scalar type of T_CPCs should be
+ * convertable to this.
  * @param CPCs The (K choose 2) canonical partial correlations in
  * (-1, 1).
  * @param K Dimensionality of correlation matrix.
  * @param log_prob Reference to variable to increment with the log
  * Jacobian determinant.
  * @return Correlation matrix for specified partial correlations.
  */
-template <typename T_CPCs, require_eigen_vector_t<T_CPCs>* = nullptr>
+template <typename T_CPCs, typename Lp,
+          require_eigen_vector_t<T_CPCs>* = nullptr,
+          require_convertible_t<value_type_t<T_CPCs>, Lp>* = nullptr>
 Eigen::Matrix<value_type_t<T_CPCs>, Eigen::Dynamic, Eigen::Dynamic>
-read_corr_matrix(const T_CPCs& CPCs, size_t K, value_type_t<T_CPCs>& log_prob) {
+read_corr_matrix(const T_CPCs& CPCs, size_t K, Lp& log_prob) {
   if (K == 0) {
     return {};
   }

test/sig_utils.py

@@ -91,6 +91,7 @@ def get_cpp_type(stan_type):
     "lkj_corr_lpdf": [1, None],
     "log_diff_exp": [3, None],
     "log_inv_logit_diff": [1.2, 0.4],
+    "lub_free": [0.5, 0.1, 0.9],
     "mdivide_left_spd": [pos_definite, None],
     "multinomial_lpmf": [None, simplex],
     "multinomial_rng": [simplex, None, None],
@@ -116,6 +117,7 @@ def get_cpp_type(stan_type):
     "positive_ordered_free": [1.0],
     "ordered_constrain": [None, scalar_return_type],
     "ordered_free": [1.0],
+    "offset_multiplier_free": [10, None, None],
     "simplex_constrain": [None, scalar_return_type],
     "simplex_free": [simplex],
     "std_normal_log_qf": [-0.1],