Skip to content

Removes code that uses forward_as #3357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WardBrian merged 2 commits into from
Oct 3, 2025
+63 −65
Merged

Removes code that uses forward_as #3357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be34493
removes code that uses forward_as
SteveBronder Oct 3, 2025
0f8931c
[Jenkins] auto-formatting by clang-format version 10.0.0-4ubuntu1
stan-buildbot Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/stan/model/indexing/assign.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,10 +882,12 @@ inline void assign(T&& x, U&& y, const char* name, const Idx1& idx1,
const Idxs&... idxs) {
int x_idx_size = rvalue_index_size(idx1, x.size());
// If there is a reverse min_max index or negative max index
if (std::is_same<std::decay_t<Idx1>, index_min_max>::value
|| std::is_same<std::decay_t<Idx1>, index_max>::value) {
constexpr bool is_idx1_minmax_or_max
= std::is_same<std::decay_t<Idx1>, index_min_max>::value
|| std::is_same<std::decay_t<Idx1>, index_max>::value;
if constexpr (is_idx1_minmax_or_max) {
if (x_idx_size == 0) {
if (std::is_same<std::decay_t<Idx1>, index_min_max>::value) {
if constexpr (std::is_same<std::decay_t<Idx1>, index_min_max>::value) {
stan::math::check_size_match("array[negative_min_max, ...] assign",
name, 0, "right hand side", y.size());
} else {
Expand All @@ -900,7 +902,7 @@ inline void assign(T&& x, U&& y, const char* name, const Idx1& idx1,
for (size_t n = 0; n < y.size(); ++n) {
size_t i = rvalue_at(n, idx1);
stan::math::check_range("array[multi, ...] assign", name, x.size(), i);
if (std::is_rvalue_reference<U&&>::value) {
if constexpr (std::is_rvalue_reference<U&&>::value) {
assign(x[i - 1], std::move(y[n]), name, idxs...);
} else {
assign(x[i - 1], y[n], name, idxs...);
Expand Down
2 changes: 1 addition & 1 deletion src/stan/model/indexing/assign_cl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ inline void assign(ExprLhs&& expr_lhs, const ScalRhs& scal_rhs,
expr_lhs.val_op(), row_index.n_ - 1, col_index.n_ - 1, 1, 1);
decltype(auto) lhs_adj = math::block_zero_based(
expr_lhs.adj(), row_index.n_ - 1, col_index.n_ - 1, 1, 1);
if (!is_constant<ScalRhs>::value) {
if constexpr (!is_constant<ScalRhs>::value) {
math::adjoint_of(scal_rhs) += math::from_matrix_cl<double>(lhs_adj);
}
math::results(lhs_adj, lhs_val)
Expand Down
32 changes: 10 additions & 22 deletions src/stan/model/indexing/assign_varmat.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ inline void assign(VarVec&& x, const U& y, const char* name, index_uni idx) {
x.vi_->val_.coeffRef(coeff_idx) = stan::math::value_of(y);
stan::math::reverse_pass_callback([x, y, coeff_idx, prev_val]() mutable {
x.vi_->val_.coeffRef(coeff_idx) = prev_val;
if (!is_constant<U>::value) {
if constexpr (!is_constant<U>::value) {
math::adjoint_of(y) += x.adj().coeffRef(coeff_idx);
}
x.adj().coeffRef(coeff_idx) = 0.0;
Expand Down Expand Up @@ -138,7 +138,7 @@ inline void assign(Vec1&& x, const Vec2& y, const char* name,
}
}

if (!is_constant<Vec2>::value) {
if constexpr (!is_constant<Vec2>::value) {
stan::math::reverse_pass_callback([x, y, x_idx, prev_vals]() mutable {
for (Eigen::Index i = 0; i < x_idx.size(); ++i) {
if (likely(x_idx[i] != -1)) {
Expand All @@ -149,10 +149,7 @@ inline void assign(Vec1&& x, const Vec2& y, const char* name,
}
for (Eigen::Index i = 0; i < x_idx.size(); ++i) {
if (likely(x_idx[i] != -1)) {
math::forward_as<math::promote_scalar_t<math::var, Vec2>>(y)
.adj()
.coeffRef(i)
+= prev_vals.coeff(i);
y.adj().coeffRef(i) += prev_vals.coeff(i);
}
}
});
Expand Down Expand Up @@ -196,7 +193,7 @@ inline void assign(Mat&& x, const U& y, const char* name, index_uni row_idx,
stan::math::reverse_pass_callback(
[x, y, row_idx_val, col_idx_val, prev_val]() mutable {
x.vi_->val_.coeffRef(row_idx_val, col_idx_val) = prev_val;
if (!is_constant<U>::value) {
if constexpr (!is_constant<U>::value) {
math::adjoint_of(y) += x.adj().coeff(row_idx_val, col_idx_val);
}
x.adj().coeffRef(row_idx_val, col_idx_val) = 0.0;
Expand Down Expand Up @@ -255,7 +252,7 @@ inline void assign(Mat1&& x, const Vec& y, const char* name, index_uni row_idx,
x.vi_->val_.coeffRef(row_idx_val, x_idx[i]) = y_val_idx.coeff(i);
}
}
if (!is_constant<Vec>::value) {
if constexpr (!is_constant<Vec>::value) {
stan::math::reverse_pass_callback(
[x, y, row_idx_val, x_idx, prev_val]() mutable {
for (size_t i = 0; i < x_idx.size(); ++i) {
Expand All @@ -267,10 +264,7 @@ inline void assign(Mat1&& x, const Vec& y, const char* name, index_uni row_idx,
}
for (size_t i = 0; i < x_idx.size(); ++i) {
if (likely(x_idx[i] != -1)) {
math::forward_as<math::promote_scalar_t<math::var, Vec>>(y)
.adj()
.coeffRef(i)
+= prev_val.coeff(i);
y.adj().coeffRef(i) += prev_val.coeff(i);
}
}
});
Expand Down Expand Up @@ -338,7 +332,7 @@ inline void assign(Mat1&& x, const Mat2& y, const char* name,
}
}

if (!is_constant<Mat2>::value) {
if constexpr (!is_constant<Mat2>::value) {
stan::math::reverse_pass_callback([x, y, prev_vals, x_idx]() mutable {
for (size_t i = 0; i < x_idx.size(); ++i) {
if (likely(x_idx[i] != -1)) {
Expand All @@ -349,10 +343,7 @@ inline void assign(Mat1&& x, const Mat2& y, const char* name,
}
for (size_t i = 0; i < x_idx.size(); ++i) {
if (likely(x_idx[i] != -1)) {
math::forward_as<math::promote_scalar_t<math::var, Mat2>>(y)
.adj()
.row(i)
+= prev_vals.row(i);
y.adj().row(i) += prev_vals.row(i);
}
}
});
Expand Down Expand Up @@ -442,7 +433,7 @@ inline void assign(Mat1&& x, const Mat2& y, const char* name,
}
}
}
if (!is_constant<Mat2>::value) {
if constexpr (!is_constant<Mat2>::value) {
stan::math::reverse_pass_callback(
[x, y, prev_vals, x_col_idx, x_row_idx]() mutable {
for (int j = 0; j < x_col_idx.size(); ++j) {
Expand All @@ -462,10 +453,7 @@ inline void assign(Mat1&& x, const Mat2& y, const char* name,
if (likely(x_col_idx[j] != -1)) {
for (int i = 0; i < x_row_idx.size(); ++i) {
if (likely(x_row_idx[i] != -1)) {
math::forward_as<math::promote_scalar_t<math::var, Mat2>>(y)
.adj()
.coeffRef(i, j)
+= prev_vals.coeff(i, j);
y.adj().coeffRef(i, j) += prev_vals.coeff(i, j);
}
}
}
Expand Down
17 changes: 11 additions & 6 deletions src/stan/model/indexing/rvalue.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,16 +788,21 @@ inline auto rvalue(StdVec&& v, const char* name, const Idx1& idx1,
stan::math::check_greater_or_equal("array[..., ...] indexing", "size",
index_size, 0);
std::vector<inner_type> result(index_size);
if ((std::is_same<std::decay_t<Idx1>, index_min_max>::value
|| std::is_same<std::decay_t<Idx1>, index_max>::value)
&& index_size == 0) {
return result;
constexpr bool is_idx1_minmax_or_max
= std::is_same<std::decay_t<Idx1>, index_min_max>::value
|| std::is_same<std::decay_t<Idx1>, index_max>::value;
if constexpr (is_idx1_minmax_or_max) {
if (index_size == 0) {
return result;
}
}
for (int i = 0; i < index_size; ++i) {
const int n = rvalue_at(i, idx1);
math::check_range("array[..., ...] index", name, v.size(), n);
if ((!std::is_same<std::decay_t<Idx1>, index_multi>::value)
&& std::is_rvalue_reference<StdVec>::value) {
constexpr bool is_rvalue_multi_idx
= (!std::is_same<std::decay_t<Idx1>, index_multi>::value)
&& std::is_rvalue_reference<StdVec>::value;
if constexpr (is_rvalue_multi_idx) {
result[i] = rvalue(std::move(v[n - 1]), name, idxs...);
} else {
result[i] = rvalue(v[n - 1], name, idxs...);
Expand Down
19 changes: 11 additions & 8 deletions src/stan/model/model_base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,14 +325,16 @@ class model_base : public prob_grad {
template <bool propto, bool jacobian, typename T>
inline T log_prob(Eigen::Matrix<T, -1, 1>& params_r,
std::ostream* msgs) const {
if (propto && jacobian)
if constexpr (propto && jacobian) {
return log_prob_propto_jacobian(params_r, msgs);
else if (propto && !jacobian)
} else if constexpr (propto && !jacobian) {
return log_prob_propto(params_r, msgs);
else if (!propto && jacobian)
} else if constexpr (!propto && jacobian) {
return log_prob_jacobian(params_r, msgs);
else // if (!propto && !jacobian)
} else {
// if (!propto && !jacobian)
return log_prob(params_r, msgs);
}
}

/**
Expand Down Expand Up @@ -570,14 +572,15 @@ class model_base : public prob_grad {
template <bool propto, bool jacobian, typename T>
inline T log_prob(std::vector<T>& params_r, std::vector<int>& params_i,
std::ostream* msgs) const {
if (propto && jacobian)
if constexpr (propto && jacobian) {
return log_prob_propto_jacobian(params_r, params_i, msgs);
else if (propto && !jacobian)
} else if constexpr (propto && !jacobian) {
return log_prob_propto(params_r, params_i, msgs);
else if (!propto && jacobian)
} else if constexpr (!propto && jacobian) {
return log_prob_jacobian(params_r, params_i, msgs);
else // if (!propto && !jacobian)
} else { // if (!propto && !jacobian)
return log_prob(params_r, params_i, msgs);
}
}

/**
Expand Down
20 changes: 10 additions & 10 deletions src/test/unit/model/indexing/assign_varmat_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void test_nil_vec() {
EXPECT_MATRIX_EQ(x.val(), stan::math::value_of(y));
stan::math::sum(x).grad();
auto check_all = [](int i) { return true; };
if (stan::is_var<RhsScalar>::value) {
if constexpr (stan::is_var<RhsScalar>::value) {
EXPECT_MATRIX_EQ(x.val(), stan::math::value_of(y));
check_adjs(check_all, x, "lhs", 1);
check_adjs(check_all, y, "rhs", 1);
Expand Down Expand Up @@ -205,14 +205,14 @@ void test_omni_vec() {
EXPECT_FLOAT_EQ(y_val[3], x.val()[3]);
EXPECT_FLOAT_EQ(y_val[4], x.val()[4]);
sum(x).grad();
if (stan::is_var<RhsScalar>::value) {
if constexpr (stan::is_var<RhsScalar>::value) {
EXPECT_MATRIX_EQ(x.val(), y_val);
EXPECT_MATRIX_EQ(x_copy.val(), x_val);
} else {
EXPECT_MATRIX_EQ(x.val(), x_val);
}
auto check_i = [](int i) { return true; };
if (stan::is_var<RhsScalar>::value) {
if constexpr (stan::is_var<RhsScalar>::value) {
check_adjs(check_i, x, "lhs", 1.0);
} else {
check_adjs(check_i, x, "lhs", 0.0);
Expand Down Expand Up @@ -963,15 +963,15 @@ void omni_matrix_test() {
Eigen::MatrixXd x_val = x.val();
auto y = conditionally_generate_linear_var_matrix<RhsScalar>(5, 5, 10);
assign(x, y, "", index_omni());
if (stan::is_var<RhsScalar>::value) {
if constexpr (stan::is_var<RhsScalar>::value) {
EXPECT_MATRIX_EQ(value_of(y), x.val());
} else {
EXPECT_MATRIX_EQ(value_of(y), x.val());
EXPECT_MATRIX_EQ(value_of(y), x_copy.val());
}
sum(x).grad();
auto check_all = [](int /* i */) { return true; };
if (stan::is_var<RhsScalar>::value) {
if constexpr (stan::is_var<RhsScalar>::value) {
EXPECT_MATRIX_EQ(x.val(), value_of(y));
check_adjs(check_all, check_all, x, "lhs");
check_adjs(check_all, check_all, y, "rhs");
Expand Down Expand Up @@ -1009,15 +1009,15 @@ void omni_omni_matrix_test() {
stan::math::var lp = sum(x_copy);
lp.adj() = 1;
assign(x, y, "", index_omni(), index_omni());
if (stan::is_var<RhsScalar>::value) {
if constexpr (stan::is_var<RhsScalar>::value) {
EXPECT_MATRIX_EQ(value_of(y), x.val());
} else {
EXPECT_MATRIX_EQ(value_of(y), x.val());
EXPECT_MATRIX_EQ(value_of(y), x_copy.val());
}
sum(x).grad();
auto check_all = [](int /* i */) { return true; };
if (stan::is_var<RhsScalar>::value) {
if constexpr (stan::is_var<RhsScalar>::value) {
EXPECT_MATRIX_EQ(x.val(), value_of(y));
check_adjs(check_all, check_all, x, "lhs");
check_adjs(check_all, check_all, y, "rhs");
Expand Down Expand Up @@ -1494,7 +1494,7 @@ void nil_matrix() {
EXPECT_MATRIX_EQ(stan::math::value_of(y), x.val());
sum(x).grad();
auto check_all = [](int /* i */) { return true; };
if (stan::is_var<RhsScalar>::value) {
if constexpr (stan::is_var<RhsScalar>::value) {
EXPECT_MATRIX_EQ(x.val(), stan::math::value_of(y));
check_adjs(check_all, check_all, x, "lhs");
check_adjs(check_all, check_all, y, "rhs");
Expand Down Expand Up @@ -1550,8 +1550,8 @@ inline void assign_tester(T1&& x, const I1& idx1, const I2& idx2) {
stan::math::sum(stan::math::add(x1, x2)).grad();
// Since this just moves the pointer x1 omni is diff than
// multi
if (!std::is_same<I1, index_omni>::value
&& !std::is_same<I2, index_omni>::value) {
if constexpr (!std::is_same<I1, index_omni>::value
&& !std::is_same<I2, index_omni>::value) {
EXPECT_MATRIX_EQ(x1.val(), x2.val());
EXPECT_MATRIX_EQ(x1.adj(), x2.adj());
EXPECT_MATRIX_EQ(y.adj(),
Expand Down
28 changes: 14 additions & 14 deletions src/test/unit/model/model_base_crtp_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,21 @@ struct mock_model : public stan::model::model_base_crtp<mock_model> {

template <bool propto, bool jacobian, typename T>
T log_prob(Eigen::Matrix<T, -1, 1>& params_r, std::ostream* msgs) const {
if (std::is_same<T, double>::value) {
if (!propto && !jacobian)
if constexpr (std::is_same<T, double>::value) {
if constexpr (!propto && !jacobian)
return 1;
else if (!propto && jacobian)
else if constexpr (!propto && jacobian)
return 3;
else if (propto && !jacobian)
else if constexpr (propto && !jacobian)
return 5;
else
return 7;
} else {
if (!propto && !jacobian)
if constexpr (!propto && !jacobian)
return 2;
else if (!propto && jacobian)
else if constexpr (!propto && jacobian)
return 4;
else if (propto && !jacobian)
else if constexpr (propto && !jacobian)
return 6;
else
return 8;
Expand All @@ -69,21 +69,21 @@ struct mock_model : public stan::model::model_base_crtp<mock_model> {
template <bool propto, bool jacobian, typename T>
T log_prob(std::vector<T>& params_r, std::vector<int>& params_i,
std::ostream* msgs) const {
if (std::is_same<T, double>::value) {
if (!propto && !jacobian)
if constexpr (std::is_same<T, double>::value) {
if constexpr (!propto && !jacobian)
return 1;
else if (!propto && jacobian)
else if constexpr (!propto && jacobian)
return 3;
else if (propto && !jacobian)
else if constexpr (propto && !jacobian)
return 5;
else
return 7;
} else {
if (!propto && !jacobian)
if constexpr (!propto && !jacobian)
return 2;
else if (!propto && jacobian)
else if constexpr (!propto && jacobian)
return 4;
else if (propto && !jacobian)
else if constexpr (propto && !jacobian)
return 6;
else
return 8;
Expand Down