Skip to content

Commit e88ca19

Browse files
committed
[Jenkins] auto-formatting by clang-format version 10.0.0-4ubuntu1
1 parent e484fa1 commit e88ca19

File tree

7 files changed

+63
-54
lines changed

7 files changed

+63
-54
lines changed

src/stan/callbacks/multi_stream_writer.hpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,28 +46,22 @@ class multi_stream_writer {
4646
*/
4747
template <typename T>
4848
void operator()(T&& x) {
49-
stan::math::for_each([&](auto&& output) {
50-
output(x);
51-
}, output_);
49+
stan::math::for_each([&](auto&& output) { output(x); }, output_);
5250
}
5351
void operator()() {
54-
stan::math::for_each([](auto&& output) {
55-
output();
56-
}, output_);
52+
stan::math::for_each([](auto&& output) { output(); }, output_);
5753
}
5854

5955
/**
6056
* Get the underlying stream
6157
*/
6258
inline auto& get_stream() noexcept { return output_; }
6359

64-
6560
private:
6661
/**
6762
* Output stream
6863
*/
6964
std::tuple<std::reference_wrapper<Streams>...> output_;
70-
7165
};
7266

7367
} // namespace callbacks

src/stan/callbacks/unique_stream_writer.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ class unique_stream_writer final : public writer {
113113
return;
114114
*output_ << comment_prefix_ << message << std::endl;
115115
}
116-
using Stream = std::decay_t<Stream>;
116+
using Stream = std::decay_t<Stream>;
117+
117118
private:
118119
/**
119120
* Comma formatter for writing Eigen matrices

src/stan/services/pathfinder/multi.hpp

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ namespace internal {
4747
template <bool DoAll = false, typename ConstrainFun, typename Model,
4848
typename ElboEst, typename RNG, typename ParamWriter>
4949
inline void gen_pathfinder_draw(ConstrainFun&& constrain_fun, Model&& model,
50-
ElboEst&& elbo_est, const Eigen::Index path_num, Eigen::Index base_idx,
50+
ElboEst&& elbo_est, const Eigen::Index path_num,
51+
Eigen::Index base_idx,
5152
const Eigen::Index path_sample_idx, RNG&& rng,
5253
ParamWriter&& param_writer) {
5354
// FIX THESE
@@ -81,8 +82,8 @@ template <typename Writer>
8182
struct concurrent_writer {
8283
std::reference_wrapper<Writer> writer;
8384
std::reference_wrapper<std::mutex> mut_;
84-
explicit concurrent_writer(std::mutex& mut, Writer& writer) :
85-
writer(writer), mut_(mut) {}
85+
explicit concurrent_writer(std::mutex& mut, Writer& writer)
86+
: writer(writer), mut_(mut) {}
8687
template <typename T>
8788
void operator()(T&& t) {
8889
std::lock_guard<std::mutex> lock(mut_.get());
@@ -203,37 +204,41 @@ inline int pathfinder_lbfgs_multi(
203204
auto pathfinder_ret
204205
= stan::services::pathfinder::pathfinder_lbfgs_single<true>(
205206
model, *(init[iter]), random_seed, stride_id + iter,
206-
init_radius, history_size, init_alpha, tol_obj, tol_rel_obj,
207-
tol_grad, tol_rel_grad, tol_param, num_iterations,
208-
num_elbo_draws, num_draws, save_iterations, refresh,
209-
interrupt, logger, init_writers[iter],
210-
single_path_parameter_writer[iter],
211-
single_path_diagnostic_writer[iter], calculate_lp, psis_resample);
207+
init_radius, history_size, init_alpha, tol_obj,
208+
tol_rel_obj, tol_grad, tol_rel_grad, tol_param,
209+
num_iterations, num_elbo_draws, num_draws,
210+
save_iterations, refresh, interrupt, logger,
211+
init_writers[iter], single_path_parameter_writer[iter],
212+
single_path_diagnostic_writer[iter], calculate_lp,
213+
psis_resample);
212214
if (unlikely(std::get<0>(pathfinder_ret) != error_codes::OK)) {
213215
logger.error(std::string("Pathfinder iteration: ")
214-
+ std::to_string(iter) + " failed.");
216+
+ std::to_string(iter) + " failed.");
215217
return;
216218
}
217219
lp_calls += std::get<2>(pathfinder_ret);
218220
elbo_estimates.push_back(std::move(std::get<1>(pathfinder_ret)));
219221
} else {
220222
// For no psis, have single write to both single and multi writers
221-
using multi_writer = stan::callbacks::multi_stream_writer<SingleParamWriter, internal::concurrent_writer<ParamWriter>>;
222-
internal::concurrent_writer safe_write{write_mutex, parameter_writer};
223+
using multi_writer = stan::callbacks::multi_stream_writer<
224+
SingleParamWriter, internal::concurrent_writer<ParamWriter>>;
225+
internal::concurrent_writer safe_write{write_mutex,
226+
parameter_writer};
223227
multi_writer multi_param_writer(
224228
single_path_parameter_writer[iter], safe_write);
225229
auto pathfinder_ret
226230
= stan::services::pathfinder::pathfinder_lbfgs_single<true>(
227231
model, *(init[iter]), random_seed, stride_id + iter,
228-
init_radius, history_size, init_alpha, tol_obj, tol_rel_obj,
229-
tol_grad, tol_rel_grad, tol_param, num_iterations,
230-
num_elbo_draws, num_draws, save_iterations, refresh,
231-
interrupt, logger, init_writers[iter],
232-
multi_param_writer,
233-
single_path_diagnostic_writer[iter], calculate_lp, psis_resample);
232+
init_radius, history_size, init_alpha, tol_obj,
233+
tol_rel_obj, tol_grad, tol_rel_grad, tol_param,
234+
num_iterations, num_elbo_draws, num_draws,
235+
save_iterations, refresh, interrupt, logger,
236+
init_writers[iter], multi_param_writer,
237+
single_path_diagnostic_writer[iter], calculate_lp,
238+
psis_resample);
234239
if (unlikely(std::get<0>(pathfinder_ret) != error_codes::OK)) {
235240
logger.error(std::string("Pathfinder iteration: ")
236-
+ std::to_string(iter) + " failed.");
241+
+ std::to_string(iter) + " failed.");
237242
return;
238243
}
239244
lp_calls += std::get<2>(pathfinder_ret);
@@ -277,8 +282,9 @@ inline int pathfinder_lbfgs_multi(
277282
Eigen::Index path_num = std::floor(draw_idx / num_draws);
278283
auto path_sample_idx = draw_idx % num_draws;
279284
auto&& elbo_est = elbo_estimates[path_num];
280-
internal::gen_pathfinder_draw(constrain_fun, model, elbo_est, path_num, path_num,
281-
path_sample_idx, rng, parameter_writer);
285+
internal::gen_pathfinder_draw(constrain_fun, model, elbo_est, path_num,
286+
path_num, path_sample_idx, rng,
287+
parameter_writer);
282288
}
283289
const auto end_psis_time = std::chrono::steady_clock::now();
284290
psis_delta_time

src/stan/services/pathfinder/single.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,8 @@ inline auto pathfinder_lbfgs_single(
871871
return internal::ret_pathfinder<ReturnLpSamples>(
872872
error_codes::OK, std::move(est_draws), num_evals + est_draws.fn_calls);
873873
} else {
874-
Eigen::Matrix<double, 1, Eigen::Dynamic> constrained_draws_vec(names.size());
874+
Eigen::Matrix<double, 1, Eigen::Dynamic> constrained_draws_vec(
875+
names.size());
875876
constrained_draws_vec(2) = stride_id - (ReturnLpSamples ? 1 : 0);
876877
Eigen::Array<double, Eigen::Dynamic, 1> lp_ratio;
877878
auto&& elbo_draws = elbo_best.repeat_draws;

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ class ServicesPathfinderEightSchools : public testing::Test {
5858
stan_model model;
5959
};
6060

61-
constexpr std::array param_indices{0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
62-
14, 15, 16, 17, 18, 19, 20};
61+
constexpr std::array param_indices{0, 1, 3, 4, 5, 6, 7, 8, 9, 10,
62+
11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
6363

6464
auto init_init_context() { return stan::io::empty_var_context(); }
6565

@@ -237,7 +237,8 @@ TEST_F(ServicesPathfinderEightSchools, single) {
237237
r_constrainted_draws_mat.col(i) = constrained_draws2;
238238
}
239239
}
240-
Eigen::RowVectorXd mean_r_vals = r_constrainted_draws_mat.rowwise().mean().transpose();
240+
Eigen::RowVectorXd mean_r_vals
241+
= r_constrainted_draws_mat.rowwise().mean().transpose();
241242
Eigen::RowVectorXd sd_r_vals
242243
= (((r_constrainted_draws_mat.colwise() - mean_r_vals.transpose())
243244
.array()

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ TEST_F(ServicesPathfinderGLM, single) {
8989
std::vector<std::tuple<Eigen::VectorXd, Eigen::VectorXd>> input_iters;
9090

9191
int rc = stan::services::pathfinder::pathfinder_lbfgs_single(
92-
model, init_context, seed, stride_id, init_radius, history_size, init_alpha,
93-
tol_obj, tol_rel_obj, tol_grad, tol_rel_grad, tol_param, num_iterations,
94-
num_elbo_draws, num_draws, save_iterations, refresh, callback, logger,
95-
init, parameter, diagnostics);
92+
model, init_context, seed, stride_id, init_radius, history_size,
93+
init_alpha, tol_obj, tol_rel_obj, tol_grad, tol_rel_grad, tol_param,
94+
num_iterations, num_elbo_draws, num_draws, save_iterations, refresh,
95+
callback, logger, init, parameter, diagnostics);
9696
ASSERT_EQ(rc, 0);
9797

9898
Eigen::IOFormat CommaInitFmt(Eigen::StreamPrecision, 0, ", ", ", ", "\n", "",
@@ -156,10 +156,10 @@ TEST_F(ServicesPathfinderGLM, single_noreturnlp) {
156156
std::vector<std::tuple<Eigen::VectorXd, Eigen::VectorXd>> input_iters;
157157

158158
int rc = stan::services::pathfinder::pathfinder_lbfgs_single(
159-
model, init_context, seed, stride_id, init_radius, history_size, init_alpha,
160-
tol_obj, tol_rel_obj, tol_grad, tol_rel_grad, tol_param, num_iterations,
161-
num_elbo_draws, num_draws, save_iterations, refresh, callback, logger,
162-
init, parameter, diagnostics, calculate_lp);
159+
model, init_context, seed, stride_id, init_radius, history_size,
160+
init_alpha, tol_obj, tol_rel_obj, tol_grad, tol_rel_grad, tol_param,
161+
num_iterations, num_elbo_draws, num_draws, save_iterations, refresh,
162+
callback, logger, init, parameter, diagnostics, calculate_lp);
163163
ASSERT_EQ(rc, 0);
164164
Eigen::MatrixXd param_vals = parameter.get_eigen_state_values();
165165
EXPECT_EQ(11, param_vals.cols());
@@ -354,7 +354,8 @@ TEST_F(ServicesPathfinderGLM, multi_noresample_noreturnlp) {
354354
Eigen::IOFormat CommaInitFmt(Eigen::StreamPrecision, 0, ", ", ", ", "\n", "",
355355
"", "");
356356
EXPECT_EQ(param_vals.cols(), 11);
357-
EXPECT_EQ(param_vals.rows(), 8000); // They can be in any order and any number
357+
EXPECT_EQ(param_vals.rows(),
358+
8000); // They can be in any order and any number
358359
for (Eigen::Index i = 0; i < num_multi_draws; i++) {
359360
EXPECT_GE(param_vals.col(2)(i), 0);
360361
EXPECT_LE(param_vals.col(2)(i), num_paths - 1);
@@ -479,7 +480,8 @@ TEST_F(ServicesPathfinderGLM, multi_noresample_returnlp) {
479480

480481
Eigen::MatrixXd param_vals = parameter.get_eigen_state_values();
481482
EXPECT_EQ(param_vals.cols(), 11);
482-
EXPECT_EQ(param_vals.rows(), 8000); // They can be in any order and any number
483+
EXPECT_EQ(param_vals.rows(),
484+
8000); // They can be in any order and any number
483485
for (Eigen::Index i = 0; i < num_paths * num_draws; i++) {
484486
EXPECT_GE(param_vals.col(2)(i), 0);
485487
EXPECT_LE(param_vals.col(2)(i), num_paths - 1);

src/test/unit/services/pathfinder/util.hpp

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,12 @@ class in_memory_writer : public stan::callbacks::stream_writer {
192192
return param_vals;
193193
}
194194
inline auto get_values() const {
195-
Eigen::MatrixXd param_vals(values_[0].cols(), values_.size() * values_[0].rows());
195+
Eigen::MatrixXd param_vals(values_[0].cols(),
196+
values_.size() * values_[0].rows());
196197
for (size_t i = 0; i < values_.size(); ++i) {
197-
param_vals.block(0, i * values_[i].rows(), values_[i].cols(), values_[i].rows()) = values_[i].transpose();
198+
param_vals.block(0, i * values_[i].rows(), values_[i].cols(),
199+
values_[i].rows())
200+
= values_[i].transpose();
198201
}
199202
return param_vals;
200203
}
@@ -524,14 +527,15 @@ template <typename T1>
524527
inline auto get_mean_sd(T1&& param_vals) {
525528
Eigen::RowVectorXd mean_vals = param_vals.colwise().mean().eval();
526529
Eigen::RowVectorXd sd_vals = (((param_vals.rowwise() - mean_vals)
527-
.array()
528-
.square()
529-
.matrix()
530-
.colwise()
531-
.sum()
532-
.array()
533-
/ (param_vals.rows() - 1))
534-
.sqrt()).eval();
530+
.array()
531+
.square()
532+
.matrix()
533+
.colwise()
534+
.sum()
535+
.array()
536+
/ (param_vals.rows() - 1))
537+
.sqrt())
538+
.eval();
535539
return std::make_pair(mean_vals, sd_vals);
536540
}
537541
} // namespace test

0 commit comments

Comments
 (0)