Skip to content

Commit 06d7216

Browse files
authored
Merge pull request #3371 from stan-dev/feat/eigen-5.0.1
update stan to be compatible with Eigen 5.0.1
2 parents db9851c + 0f80d7d commit 06d7216

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/stan/model/indexing/rvalue.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ inline auto rvalue(EigMat&& x, const char* name, MultiIndex&& idx) {
280280
[](auto&& x_ref, auto&& idx_inner) {
281281
using vec_map = Eigen::Map<const Eigen::Array<int, -1, 1>>;
282282
return x_ref((vec_map(idx_inner.ns_.data(), idx_inner.ns_.size()) - 1),
283-
Eigen::all);
283+
Eigen::indexing::all);
284284
},
285285
stan::math::to_ref(std::forward<EigMat>(x)),
286286
std::forward<MultiIndex>(idx));
@@ -591,7 +591,7 @@ inline auto rvalue(EigMat&& x, const char* name, Idx&& row_idx,
591591
[name](auto&& x_ref, auto&& row_idx_inner, auto&& col_idx_inner) {
592592
using vec_map = Eigen::Map<const Eigen::Array<int, -1, 1>>;
593593
return rvalue(
594-
x_ref(Eigen::all,
594+
x_ref(Eigen::indexing::all,
595595
(vec_map(col_idx_inner.ns_.data(), col_idx_inner.ns_.size())
596596
- 1)),
597597
name, std::forward<decltype(row_idx_inner)>(row_idx_inner));

src/test/unit/services/pathfinder/eight_schools_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ TEST_F(ServicesPathfinderEightSchools, multi) {
124124
EXPECT_GE(param_vals.col(2)(i), 0);
125125
EXPECT_LE(param_vals.col(2)(i), num_paths);
126126
}
127-
auto param_tmp = param_vals(Eigen::all, param_indices);
127+
auto param_tmp = param_vals(Eigen::indexing::all, param_indices);
128128
auto mean_sd_pair = stan::test::get_mean_sd(param_tmp);
129129
auto&& mean_vals = mean_sd_pair.first;
130130
auto&& sd_vals = mean_sd_pair.second;
@@ -448,7 +448,7 @@ TEST_F(ServicesPathfinderEightSchools, single) {
448448
for (auto&& x_i : param_vals.col(2)) {
449449
EXPECT_EQ(x_i, stride_id);
450450
}
451-
auto param_tmp = param_vals(Eigen::all, param_indices);
451+
auto param_tmp = param_vals(Eigen::indexing::all, param_indices);
452452
auto mean_sd_pair = stan::test::get_mean_sd(param_tmp);
453453
auto&& mean_vals = mean_sd_pair.first;
454454
auto&& sd_vals = mean_sd_pair.second;

src/test/unit/services/pathfinder/normal_glm_test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ TEST_F(ServicesPathfinderGLM, single) {
101101
EXPECT_EQ(x_i, stride_id);
102102
}
103103

104-
auto param_tmp = param_vals(Eigen::all, param_indices);
104+
auto param_tmp = param_vals(Eigen::indexing::all, param_indices);
105105
auto mean_sd_pair = stan::test::get_mean_sd(param_tmp);
106106
auto&& mean_vals = mean_sd_pair.first;
107107
auto&& sd_vals = mean_sd_pair.second;
@@ -240,7 +240,7 @@ TEST_F(ServicesPathfinderGLM, multi_null_unique) {
240240
EXPECT_GE(param_vals.col(2)(i), 0);
241241
EXPECT_LE(param_vals.col(2)(i), num_paths);
242242
}
243-
auto param_tmp = param_vals(Eigen::all, param_indices);
243+
auto param_tmp = param_vals(Eigen::indexing::all, param_indices);
244244
auto mean_sd_pair = stan::test::get_mean_sd(param_tmp);
245245
auto&& mean_vals = mean_sd_pair.first;
246246
auto&& sd_vals = mean_sd_pair.second;
@@ -318,7 +318,7 @@ TEST_F(ServicesPathfinderGLM, multi) {
318318
EXPECT_GE(param_vals.col(2)(i), 0);
319319
EXPECT_LE(param_vals.col(2)(i), num_paths);
320320
}
321-
auto param_tmp = param_vals(Eigen::all, param_indices);
321+
auto param_tmp = param_vals(Eigen::indexing::all, param_indices);
322322
auto mean_sd_pair = stan::test::get_mean_sd(param_tmp);
323323
auto&& mean_vals = mean_sd_pair.first;
324324
auto&& sd_vals = mean_sd_pair.second;

0 commit comments

Comments
 (0)