Skip to content

Commit 0a2f7fd

Browse files
WardBrianWardBrian
committed
Revert "first correction" merge errors
This reverts commit 79ae69a.
1 parent d957b6c commit 0a2f7fd

File tree

865 files changed

+4753
-3230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

865 files changed

+4753
-3230
lines changed

‎stan/math/fwd/fun/hypergeometric_1F0.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ namespace math {
3131
template <typename Ta, typename Tz, typename FvarT = return_type_t<Ta, Tz>,
3232
require_all_stan_scalar_t<Ta, Tz>* = nullptr,
3333
require_any_fvar_t<Ta, Tz>* = nullptr>
34-
FvarT hypergeometric_1F0(const Ta& a, const Tz& z) {
34+
inline FvarT hypergeometric_1F0(const Ta& a, const Tz& z) {
3535
partials_type_t<Ta> a_val = value_of(a);
3636
partials_type_t<Tz> z_val = value_of(z);
3737
FvarT rtn = FvarT(hypergeometric_1F0(a_val, z_val), 0.0);
3838
if constexpr (is_autodiff_v<Ta>) {
39-
rtn.d_ += forward_as<FvarT>(a).d() * -rtn.val() * log1m(z_val);
39+
rtn.d_ += a.d() * -rtn.val() * log1m(z_val);
4040
}
4141
if constexpr (is_autodiff_v<Tz>) {
42-
rtn.d_ += forward_as<FvarT>(z).d() * rtn.val() * a_val * inv(1 - z_val);
42+
rtn.d_ += z.d() * rtn.val() * a_val * inv(1 - z_val);
4343
}
4444
return rtn;
4545
}

‎stan/math/fwd/fun/hypergeometric_2F1.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@ inline return_type_t<Ta1, Ta2, Tb, Tz> hypergeometric_2F1(const Ta1& a1,
4646
typename fvar_t::Scalar grad = 0;
4747

4848
if constexpr (is_autodiff_v<Ta1>) {
49-
grad += forward_as<fvar_t>(a1).d() * std::get<0>(grad_tuple);
49+
grad += a1.d() * std::get<0>(grad_tuple);
5050
}
5151
if constexpr (is_autodiff_v<Ta2>) {
52-
grad += forward_as<fvar_t>(a2).d() * std::get<1>(grad_tuple);
52+
grad += a2.d() * std::get<1>(grad_tuple);
5353
}
5454
if constexpr (is_autodiff_v<Tb>) {
55-
grad += forward_as<fvar_t>(b).d() * std::get<2>(grad_tuple);
55+
grad += b.d() * std::get<2>(grad_tuple);
5656
}
5757
if constexpr (is_autodiff_v<Tz>) {
58-
grad += forward_as<fvar_t>(z).d() * std::get<3>(grad_tuple);
58+
grad += z.d() * std::get<3>(grad_tuple);
5959
}
6060

6161
return fvar_t(hypergeometric_2F1(a1_val, a2_val, b_val, z_val), grad);

‎stan/math/fwd/fun/inv_inc_beta.hpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ inline fvar<partials_return_t<T1, T2, T3>> inv_inc_beta(const T1& a,
6363
+ log(hypergeometric_3F2(da_a, da_b, w)) - 2 * lgamma(ap1));
6464
auto da3 = inc_beta(a_val, b_val, w) * exp(lbeta_ab)
6565
* (log_w - digamma(a_val) + digamma_apb);
66-
inv_d_ += forward_as<fvar<T_return>>(a).d_ * da1 * (da2 - da3);
66+
inv_d_ += a.d_ * da1 * (da2 - da3);
6767
}
6868

6969
if constexpr (is_fvar<T2>::value) {
@@ -76,12 +76,11 @@ inline fvar<partials_return_t<T1, T2, T3>> inv_inc_beta(const T1& a,
7676
auto db3 = inc_beta(b_val, a_val, one_m_w) * exp(lbeta_ab)
7777
* (log1m_w - digamma(b_val) + digamma_apb);
7878

79-
inv_d_ += forward_as<fvar<T_return>>(b).d_ * db1 * (exp(db2) - db3);
79+
inv_d_ += b.d_ * db1 * (exp(db2) - db3);
8080
}
8181

8282
if constexpr (is_fvar<T3>::value) {
83-
inv_d_ += forward_as<fvar<T_return>>(p).d_
84-
* exp(one_m_b * log1m_w + one_m_a * log_w + lbeta_ab);
83+
inv_d_ += p.d_ * exp(one_m_b * log1m_w + one_m_a * log_w + lbeta_ab);
8584
}
8685

8786
return fvar<T_return>(w, inv_d_);

‎stan/math/fwd/fun/polar.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ inline std::complex<fvar<T>> polar(const fvar<T>& r, U theta) {
4444
* Returns complex number with specified magnitude and phase angle.
4545
*
4646
* @tparam T autodiff value type for phase angle
47-
+* * @tparam U arithmetic type for magnitude
47+
* * @tparam U arithmetic type for magnitude
4848
* @param[in] r magnitude
4949
* @param[in] theta phase angle
5050
* @return complex number with magnitude and phase angle

‎stan/math/fwd/functor/gradient.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ namespace math {
3737
* @param[out] grad_fx Gradient of function at argument
3838
*/
3939
template <typename T, typename F>
40-
void gradient(const F& f, const Eigen::Matrix<T, Eigen::Dynamic, 1>& x, T& fx,
41-
Eigen::Matrix<T, Eigen::Dynamic, 1>& grad_fx) {
40+
inline void gradient(const F& f, const Eigen::Matrix<T, Eigen::Dynamic, 1>& x,
41+
T& fx, Eigen::Matrix<T, Eigen::Dynamic, 1>& grad_fx) {
4242
Eigen::Matrix<fvar<T>, Eigen::Dynamic, 1> x_fvar(x.size());
4343
grad_fx.resize(x.size());
4444
for (int i = 0; i < x.size(); ++i) {

‎stan/math/fwd/functor/hessian.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ namespace math {
3838
* @param[out] H Hessian of function at argument
3939
*/
4040
template <typename T, typename F>
41-
void hessian(const F& f, const Eigen::Matrix<T, Eigen::Dynamic, 1>& x, T& fx,
42-
Eigen::Matrix<T, Eigen::Dynamic, 1>& grad,
43-
Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic>& H) {
41+
inline void hessian(const F& f, const Eigen::Matrix<T, Eigen::Dynamic, 1>& x,
42+
T& fx, Eigen::Matrix<T, Eigen::Dynamic, 1>& grad,
43+
Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic>& H) {
4444
H.resize(x.size(), x.size());
4545
grad.resize(x.size());
4646
// size 0 separate because nothing to loop over in main body

‎stan/math/fwd/functor/integrate_1d.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ inline return_type_t<T_a, T_b, Args...> integrate_1d_impl(
4848
if constexpr (is_fvar<T_a>::value || is_fvar<T_b>::value) {
4949
auto val_args = std::make_tuple(value_of(args)...);
5050
if constexpr (is_fvar<T_a>::value) {
51-
ret.d_ += math::forward_as<FvarT>(a).d_
51+
ret.d_ += a.d_
5252
* math::apply(
5353
[&](auto &&... tuple_args) {
5454
return -f(a_val, 0.0, msgs, tuple_args...);
5555
},
5656
val_args);
5757
}
5858
if constexpr (is_fvar<T_b>::value) {
59-
ret.d_ += math::forward_as<FvarT>(b).d_
59+
ret.d_ += b.d_
6060
* math::apply(
6161
[&](auto &&... tuple_args) {
6262
return f(b_val, 0.0, msgs, tuple_args...);

‎stan/math/fwd/functor/jacobian.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ namespace stan {
88
namespace math {
99

1010
template <typename T, typename F>
11-
void jacobian(const F& f, const Eigen::Matrix<T, Eigen::Dynamic, 1>& x,
12-
Eigen::Matrix<T, Eigen::Dynamic, 1>& fx,
13-
Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic>& J) {
11+
inline void jacobian(const F& f, const Eigen::Matrix<T, Eigen::Dynamic, 1>& x,
12+
Eigen::Matrix<T, Eigen::Dynamic, 1>& fx,
13+
Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic>& J) {
1414
using Eigen::Dynamic;
1515
using Eigen::Matrix;
1616
Matrix<fvar<T>, Dynamic, 1> x_fvar(x.size());

‎stan/math/memory/stack_alloc.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace math {
2626
* @tparam Type of object to which pointer points.
2727
*/
2828
template <typename T>
29-
bool is_aligned(T* ptr, unsigned int bytes_aligned) {
29+
inline bool is_aligned(T* ptr, unsigned int bytes_aligned) {
3030
return (reinterpret_cast<uintptr_t>(ptr) % bytes_aligned) == 0U;
3131
}
3232

‎stan/math/mix/functor/hessian_times_vector.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ inline void hessian_times_vector(
3838
template <typename T, typename F, typename EigVec,
3939
require_eigen_vector_t<EigVec>* = nullptr,
4040
require_stan_scalar_t<T>* = nullptr>
41-
void hessian_times_vector(const F& f,
42-
const Eigen::Matrix<T, Eigen::Dynamic, 1>& x,
43-
const EigVec& v, T& fx,
44-
Eigen::Matrix<T, Eigen::Dynamic, 1>& Hv) {
41+
inline void hessian_times_vector(const F& f,
42+
const Eigen::Matrix<T, Eigen::Dynamic, 1>& x,
43+
const EigVec& v, T& fx,
44+
Eigen::Matrix<T, Eigen::Dynamic, 1>& Hv) {
4545
using Eigen::Matrix;
4646
Matrix<T, Eigen::Dynamic, 1> grad;
4747
Matrix<T, Eigen::Dynamic, Eigen::Dynamic> H;

0 commit comments

Comments
 (0)