Skip to content

Commit d2834d7

Browse files
committed
Merge remote-tracking branch 'origin/develop' into fix/plusequals-assign-opencl
2 parents 29644f6 + 4cf25de commit d2834d7

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

stan/math/prim/functor/operands_and_partials.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ class ops_partials_edge;
5454
* for this specialization must be a `Arithmetic`
5555
*/
5656
template <typename ViewElt, typename Op>
57-
class ops_partials_edge<ViewElt, Op, require_st_arithmetic<Op>> {
58-
public:
57+
struct ops_partials_edge<ViewElt, Op, require_st_arithmetic<Op>> {
5958
using inner_op = std::conditional_t<is_eigen<value_type_t<Op>>::value,
6059
value_type_t<Op>, Op>;
6160
using partials_t = empty_broadcast_array<ViewElt, inner_op>;

stan/math/prim/prob/categorical_logit_glm_lpmf.hpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ namespace math {
2929
* @tparam T_alpha type of the intercept vector
3030
* @tparam T_beta type of the matrix of weights
3131
* @param y a scalar or vector of classes. If it is a scalar it will be
32-
* broadcast - used for all instances. Values should be between 1 and number of
33-
* classes, including endpoints.
32+
* broadcast - used for all instances. Values should be between 1 and number
33+
* of classes, including endpoints.
3434
* @param x design matrix or row vector. If it is a row vector it will be
3535
* broadcast - used for all instances.
3636
* @param alpha intercept vector (in log odds)
@@ -148,8 +148,8 @@ return_type_t<T_x, T_alpha, T_beta> categorical_logit_glm_lpmf(
148148
= beta_y
149149
- (exp_lin.matrix() * beta_val.transpose()).array().colwise()
150150
* inv_sum_exp_lin;
151-
// TODO(Tadej) maybe we can replace previous block with the following line
152-
// when we have newer Eigen partials<0>(ops_partials) = beta_val(y
151+
// TODO(Tadej) maybe we can replace previous block with the following
152+
// line when we have newer Eigen partials<0>(ops_partials) = beta_val(y
153153
// - 1, all) - (exp_lin.matrix() * beta.transpose()).colwise() *
154154
// inv_sum_exp_lin;
155155
}
@@ -183,8 +183,9 @@ return_type_t<T_x, T_alpha, T_beta> categorical_logit_glm_lpmf(
183183
beta_derivative.col(y_seq[i] - 1) += x_val.row(i);
184184
}
185185
}
186-
// TODO(Tadej) maybe we can replace previous loop with the following line
187-
// when we have newer Eigen partials<2>(ops_partials)(Eigen::all, y
186+
// TODO(Tadej) maybe we can replace previous loop with the following
187+
// line when we have newer Eigen partials<2>(ops_partials)(Eigen::all,
188+
// y
188189
// - 1) += x_val.colwise.sum().transpose();
189190

190191
partials<2>(ops_partials) = std::move(beta_derivative);

stan/math/prim/prob/neg_binomial_2_log_glm_lpmf.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ namespace math {
4747
* this can be a vector (of the same length as y, for heteroskedasticity)
4848
* or a scalar.
4949
*
50-
* @param y failures count scalar or vector parameter. If it is a scalar it will
51-
* be broadcast - used for all instances.
50+
* @param y failures count scalar or vector parameter. If it is a scalar it
51+
* will be broadcast - used for all instances.
5252
* @param x design matrix or row vector. If it is a row vector it will be
5353
* broadcast - used for all instances.
5454
* @param alpha intercept (in log odds)

stan/math/prim/prob/ordered_logistic_glm_lpmf.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ namespace stan {
2020
namespace math {
2121

2222
/** \ingroup multivar_dists
23-
* Returns the log PMF of the ordinal regression Generalized Linear Model (GLM).
24-
* This is equivalent to and faster than ordered_logistic_lpmf(y, x * beta,
25-
* cuts).
23+
* Returns the log PMF of the ordinal regression Generalized Linear Model
24+
* (GLM). This is equivalent to and faster than ordered_logistic_lpmf(y, x *
25+
* beta, cuts).
2626
*
2727
* @tparam T_y type of integer vector of classes. It can be either
2828
* `std::vector<int>` or `int`.
@@ -31,8 +31,8 @@ namespace math {
3131
* @tparam T_cuts type of the vector of cutpoints
3232
*
3333
* @param y a scalar or vector of classes. If it is a scalar it will be
34-
* broadcast - used for all instances. Values should be between 1 and number of
35-
* classes, including endpoints.
34+
* broadcast - used for all instances. Values should be between 1 and number
35+
* of classes, including endpoints.
3636
* @param x design matrix or row vector. If it is a row vector it will be
3737
* broadcast - used for all instances.
3838
* @param beta weight vector

0 commit comments

Comments
 (0)