Skip to content
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.

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

Feature/3181 json hmc tuning params #3230

Merged
merged 36 commits into from
Sep 21, 2023
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
20935f3
Merge branch 'develop' of https://github.com/stan-dev/stan into develop
mitzimorris Jul 19, 2023
128d6e7
Merge branch 'develop' of https://github.com/stan-dev/stan into develop
mitzimorris Sep 1, 2023
6c8f149
checkpointing
mitzimorris Sep 8, 2023
6de523b
checkpointing
mitzimorris Sep 8, 2023
f82b32a
checkpointing - metric file written via 1 unit test
mitzimorris Sep 8, 2023
b1340f3
checkpointing
mitzimorris Sep 11, 2023
e37f161
checkpointing, unit tests for dense and diagonal passing
mitzimorris Sep 11, 2023
4dbddb5
checkpointing
mitzimorris Sep 12, 2023
8c956d5
checkpointing - all unit tests passing
mitzimorris Sep 13, 2023
88b210a
Merge commit 'c5a75e77d36f70aaeb567c97be6c9b2e8f2a51e2' into HEAD
yashikno Sep 13, 2023
48eb484
[Jenkins] auto-formatting by clang-format version 10.0.0-4ubuntu1
stan-buildbot Sep 13, 2023
502b9ac
Merge branch 'feature/3181-json-hmc-tuning-params' of https://github.…
mitzimorris Sep 13, 2023
c8e616c
structured writer - compiler error
mitzimorris Sep 15, 2023
1423a7a
Merge commit '2df2382a07310ca57b5e5d12d4921f9eff69d66a' into HEAD
yashikno Sep 15, 2023
2183f66
[Jenkins] auto-formatting by clang-format version 10.0.0-4ubuntu1
stan-buildbot Sep 15, 2023
56d725d
Merge branch 'feature/3181-json-hmc-tuning-params' of https://github.…
mitzimorris Sep 16, 2023
bb1ff9d
unit tests passing
mitzimorris Sep 16, 2023
402fb02
[Jenkins] auto-formatting by clang-format version 10.0.0-4ubuntu1
stan-buildbot Sep 16, 2023
705089c
Merge branch 'feature/3181-json-hmc-tuning-params' of https://github.…
mitzimorris Sep 16, 2023
6501a4e
lint fix
mitzimorris Sep 16, 2023
6a46670
clean up doc comments
mitzimorris Sep 17, 2023
f34363c
[Jenkins] auto-formatting by clang-format version 10.0.0-4ubuntu1
stan-buildbot Sep 17, 2023
66e1e5f
Merge branch 'feature/3181-json-hmc-tuning-params' of https://github.…
mitzimorris Sep 17, 2023
9ec019b
code cleanup
mitzimorris Sep 17, 2023
7ccd590
remove metric_writer from util/mcmc_writer
mitzimorris Sep 19, 2023
d99cea2
changes per code review
mitzimorris Sep 19, 2023
ce9e7d2
Merge commit '98a6b5592e0268c8cbed914050ef93e55b55d517' into HEAD
yashikno Sep 19, 2023
0606e09
[Jenkins] auto-formatting by clang-format version 10.0.0-4ubuntu1
stan-buildbot Sep 19, 2023
5759e15
Merge branch 'feature/3181-json-hmc-tuning-params' of https://github.…
mitzimorris Sep 19, 2023
e4f62f0
Merge branch 'feature/3181-json-hmc-tuning-params' of https://github.…
mitzimorris Sep 19, 2023
b429ef8
code cleanup
mitzimorris Sep 19, 2023
86c14b3
Merge branch 'feature/3181-json-hmc-tuning-params' of https://github.…
mitzimorris Sep 19, 2023
af33766
remove unneeded signatures for multi-chain hmc_nuts
mitzimorris Sep 19, 2023
da64fdc
Merge branch 'feature/3181-json-hmc-tuning-params' of https://github.…
mitzimorris Sep 20, 2023
dd455a9
Revert "remove unneeded signatures for multi-chain hmc_nuts"
mitzimorris Sep 20, 2023
c9ed01d
Merge branch 'feature/3181-json-hmc-tuning-params' of https://github.…
mitzimorris Sep 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/stan/mcmc/hmc/base_hmc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <stan/callbacks/logger.hpp>
#include <stan/callbacks/writer.hpp>
#include <stan/callbacks/json_writer.hpp>
#include <stan/mcmc/base_mcmc.hpp>
#include <stan/mcmc/hmc/hamiltonians/ps_point.hpp>
#include <boost/random/uniform_01.hpp>
Expand Down Expand Up @@ -63,6 +64,18 @@ class base_hmc : public base_mcmc {
write_sampler_metric(writer);
}

/**
* write stepsize and elements of mass matrix as a JSON object
*/
template <typename Stream, typename Deleter = std::default_delete<Stream>>
void write_sampler_state_json(
callbacks::json_writer<Stream, Deleter>& json_writer) {
json_writer.begin_record();
json_writer.write("stepsize", get_nominal_stepsize());
json_writer.write("inv_metric", z_.inv_e_metric_);
json_writer.end_record();
}
WardBrian marked this conversation as resolved.
Show resolved Hide resolved

void get_sampler_diagnostic_names(std::vector<std::string>& model_names,
std::vector<std::string>& names) {
z_.get_param_names(model_names, names);
Expand Down Expand Up @@ -183,7 +196,7 @@ class base_hmc : public base_mcmc {

protected:
typename Hamiltonian<Model, BaseRNG>::PointType z_;
Integrator<Hamiltonian<Model, BaseRNG> > integrator_;
Integrator<Hamiltonian<Model, BaseRNG>> integrator_;
Hamiltonian<Model, BaseRNG> hamiltonian_;

BaseRNG& rand_int_;
Expand Down
24 changes: 19 additions & 5 deletions src/stan/mcmc/hmc/hamiltonians/unit_e_point.hpp
mitzimorris marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef STAN_MCMC_HMC_HAMILTONIANS_UNIT_E_POINT_HPP
#define STAN_MCMC_HMC_HAMILTONIANS_UNIT_E_POINT_HPP

#include <stan/callbacks/writer.hpp>
#include <stan/mcmc/hmc/hamiltonians/ps_point.hpp>

namespace stan {
Expand All @@ -11,12 +12,25 @@ namespace mcmc {
*/
class unit_e_point : public ps_point {
public:
explicit unit_e_point(int n) : ps_point(n) {}
};
/**
* Vector of diagonal elements of inverse mass matrix.
*/
Eigen::VectorXd inv_e_metric_;

/**
* Construct a diag point in n-dimensional phase space
* with vector of ones for diagonal elements of inverse mass matrix.
*
* @param n number of dimensions
*/
explicit unit_e_point(int n) : ps_point(n), inv_e_metric_(n) {
inv_e_metric_.setOnes();
}

inline void write_metric(stan::callbacks::writer& writer) {
writer("No free parameters for unit metric");
}
inline void write_metric(stan::callbacks::writer& writer) {
writer("No free parameters for unit metric");
}
};

} // namespace mcmc
} // namespace stan
Expand Down
15 changes: 12 additions & 3 deletions src/stan/services/sample/fixed_param.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define STAN_SERVICES_SAMPLE_FIXED_PARAM_HPP

#include <stan/callbacks/interrupt.hpp>
#include <stan/callbacks/json_writer.hpp>
#include <stan/callbacks/logger.hpp>
#include <stan/callbacks/writer.hpp>
#include <stan/math/prim.hpp>
Expand All @@ -13,6 +14,7 @@
#include <stan/services/util/initialize.hpp>
#include <chrono>
#include <vector>
#include <iostream>
mitzimorris marked this conversation as resolved.
Show resolved Hide resolved

namespace stan {
namespace services {
Expand Down Expand Up @@ -63,7 +65,9 @@ int fixed_param(Model& model, const stan::io::var_context& init,
}

stan::mcmc::fixed_param_sampler sampler;
util::mcmc_writer writer(sample_writer, diagnostic_writer, logger);
callbacks::json_writer<std::ofstream> dummy_metric_writer;
services::util::mcmc_writer<std::ofstream> writer(
sample_writer, diagnostic_writer, dummy_metric_writer, logger);
Eigen::VectorXd cont_params(cont_vector.size());
for (size_t i = 0; i < cont_vector.size(); i++)
cont_params[i] = cont_vector[i];
Expand Down Expand Up @@ -136,11 +140,13 @@ int fixed_param(Model& model, const std::size_t num_chains,
}
std::vector<boost::ecuyer1988> rngs;
std::vector<Eigen::VectorXd> cont_vectors;
std::vector<util::mcmc_writer> writers;
std::vector<callbacks::json_writer<std::ofstream>> dummy_metric_writers;
std::vector<util::mcmc_writer<std::ofstream>> writers;
std::vector<stan::mcmc::sample> samples;
std::vector<stan::mcmc::fixed_param_sampler> samplers(num_chains);
rngs.reserve(num_chains);
cont_vectors.reserve(num_chains);
dummy_metric_writers.reserve(num_chains);
writers.reserve(num_chains);
samples.reserve(num_chains);
for (int i = 0; i < num_chains; ++i) {
Expand All @@ -150,7 +156,10 @@ int fixed_param(Model& model, const std::size_t num_chains,
cont_vectors.push_back(
Eigen::Map<Eigen::VectorXd>(cont_vector.data(), cont_vector.size()));
samples.emplace_back(cont_vectors[i], 0, 0);
writers.emplace_back(sample_writers[i], diagnostic_writers[i], logger);
dummy_metric_writers.emplace_back(
stan::callbacks::json_writer<std::ofstream>());
writers.emplace_back(sample_writers[i], diagnostic_writers[i],
dummy_metric_writers[i], logger);
// Headers
writers[i].write_sample_names(samples[i], samplers[i], model);
writers[i].write_diagnostic_names(samples[i], samplers[i], model);
Expand Down