From 4698cf48f145a73bf3c172217bf0ee65f71ad36f Mon Sep 17 00:00:00 2001 From: Brian Ward Date: Thu, 5 Nov 2026 14:54:35 -0500 Subject: [PATCH 1/2] Add `output transformed_data=...` for writing transformed data as JSON --- make/tests | 1 + src/cmdstan/arguments/arg_output.hpp | 2 + .../arguments/arg_transformed_data_file.hpp | 23 ++++++++++ src/cmdstan/command.hpp | 12 ++++- src/cmdstan/file.hpp | 2 +- .../interface/save_trans_data_json_test.cpp | 46 +++++++++++++++++++ 6 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 src/cmdstan/arguments/arg_transformed_data_file.hpp create mode 100644 src/test/interface/save_trans_data_json_test.cpp diff --git a/make/tests b/make/tests index 4cc2a738de..95394cf4cf 100644 --- a/make/tests +++ b/make/tests @@ -61,6 +61,7 @@ test/interface/datetime_test$(EXE): $(call depends_on_test_models, test/interface/elapsed_time_test$(EXE): $(call depends_on_test_models, test_model) test/interface/fixed_param_sampler_test$(EXE): $(call depends_on_test_models, empty proper) test/interface/generated_quantities_test$(EXE): $(call depends_on_test_models, bern_gq_model bern_extra_model gq_non_scalar test_model) +test/interface/save_trans_data_json_test$(EXE): $(call depends_on_test_models, gq_non_scalar) test/interface/laplace_test$(EXE): $(call depends_on_test_models, multi_normal_model simple_jacobian_model simplex_model) test/interface/log_prob_test$(EXE): $(call depends_on_test_models, bern_log_prob_model bern_gq_model simplex_model) test/interface/metric_test$(EXE): $(call depends_on_test_models, test_model proper) diff --git a/src/cmdstan/arguments/arg_output.hpp b/src/cmdstan/arguments/arg_output.hpp index 4ae1becd3c..0a890400ba 100644 --- a/src/cmdstan/arguments/arg_output.hpp +++ b/src/cmdstan/arguments/arg_output.hpp @@ -2,6 +2,7 @@ #define CMDSTAN_ARGUMENTS_ARG_OUTPUT_HPP #include +#include #include #include #include @@ -27,6 +28,7 @@ class arg_output : public categorical_argument { "Save the CmdStan configuration (parsed arguments + default values) as " "JSON alongside the output files", false)); + _subarguments.push_back(new arg_transformed_data_file()); } }; diff --git a/src/cmdstan/arguments/arg_transformed_data_file.hpp b/src/cmdstan/arguments/arg_transformed_data_file.hpp new file mode 100644 index 0000000000..791f85e218 --- /dev/null +++ b/src/cmdstan/arguments/arg_transformed_data_file.hpp @@ -0,0 +1,23 @@ +#ifndef CMDSTAN_ARGUMENTS_ARG_TRANSFORMED_DATA_FILE_HPP +#define CMDSTAN_ARGUMENTS_ARG_TRANSFORMED_DATA_FILE_HPP + +#include + +namespace cmdstan { + +class arg_transformed_data_file : public string_argument { + public: + arg_transformed_data_file() : string_argument() { + _name = "transformed_data"; + _description + = "Auxiliary output file for the contents of the transformed data " + "block, written as JSON."; + _validity = "File should not already exist"; + _default = "\"\""; + _default_value = ""; + _value = _default_value; + } +}; + +} // namespace cmdstan +#endif diff --git a/src/cmdstan/command.hpp b/src/cmdstan/command.hpp index 363ddb25e6..1870012473 100644 --- a/src/cmdstan/command.hpp +++ b/src/cmdstan/command.hpp @@ -263,6 +263,16 @@ int command(int argc, const char *argv[]) { init_null_writers(metric_json_writers, num_chains); } + // write transformed data file if requested + { + std::string transformed_data_file + = get_arg_val(parser, "output", "transformed_data"); + if (!transformed_data_file.empty()) { + auto td_file = file::safe_create(transformed_data_file, sig_figs); + model.write_transformed_data_json(td_file.get()); + } + } + // Setup initial parameter values - arg "init" // arg is either filename or init radius value std::string init = get_arg_val(parser, "init"); @@ -792,7 +802,7 @@ int command(int argc, const char *argv[]) { } } } // end static HMC - } // ---- sample end ---- // + } // ---- sample end ---- // } else if (user_method->arg("variational")) { // ---- variational start ---- // list_argument *algo = dynamic_cast( diff --git a/src/cmdstan/file.hpp b/src/cmdstan/file.hpp index 0a1fe946db..126a109c15 100644 --- a/src/cmdstan/file.hpp +++ b/src/cmdstan/file.hpp @@ -296,7 +296,7 @@ std::ifstream safe_open(const std::string &fname) { } /** - * Opens input stream for file and sets exception flags. + * Opens output stream for file and sets exception flags. * * @param fname name of file which exists and has read perms. * @param sig_figs number of digits to print diff --git a/src/test/interface/save_trans_data_json_test.cpp b/src/test/interface/save_trans_data_json_test.cpp new file mode 100644 index 0000000000..ec7c9e00fa --- /dev/null +++ b/src/test/interface/save_trans_data_json_test.cpp @@ -0,0 +1,46 @@ +#include +#include +#include + +using cmdstan::test::convert_model_path; +using cmdstan::test::count_matches; +using cmdstan::test::file_exists; +using cmdstan::test::is_valid_JSON; +using cmdstan::test::run_command; +using cmdstan::test::run_command_output; + +class CmdStanTDJson : public testing::Test { + public: + void SetUp() { + gq_non_scalar_model = {"src", "test", "test-models", "gq_non_scalar"}; + output_json = {"test", "transformed_data.json"}; + } + + void TearDown() { std::remove(convert_model_path(output_json).c_str()); } + + std::vector gq_non_scalar_model; + std::vector output_json; +}; + +TEST_F(CmdStanTDJson, save) { + std::stringstream ss; + ss << convert_model_path(gq_non_scalar_model) << " random seed=1234" + << " method=sample output transformed_data=" + << convert_model_path(output_json) << " 2>&1"; + std::string cmd = ss.str(); + run_command_output out = run_command(cmd); + ASSERT_FALSE(out.hasError); + ASSERT_TRUE(file_exists(convert_model_path(output_json))); + + std::fstream result_stream(convert_model_path(output_json)); + std::stringstream result_sstream; + result_sstream << result_stream.rdbuf(); + result_stream.close(); + std::string transformed_data = result_sstream.str(); + ASSERT_TRUE(is_valid_JSON(transformed_data)); + + EXPECT_EQ(count_matches("X", transformed_data), 1); + EXPECT_EQ(count_matches("y", transformed_data), 1); + EXPECT_EQ(count_matches("N", transformed_data), 1); + EXPECT_EQ(count_matches("K", transformed_data), 1); +} From a5d48e2a0eaa35e4a65baf1468f4ae15b3db5a0d Mon Sep 17 00:00:00 2001 From: Stan Jenkins Date: Thu, 5 Nov 2026 20:03:40 -0500 Subject: [PATCH 2/2] [Jenkins] auto-formatting by clang-format version 10.0.0-4ubuntu1 --- src/cmdstan/command.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmdstan/command.hpp b/src/cmdstan/command.hpp index 1870012473..30d304187b 100644 --- a/src/cmdstan/command.hpp +++ b/src/cmdstan/command.hpp @@ -802,7 +802,7 @@ int command(int argc, const char *argv[]) { } } } // end static HMC - } // ---- sample end ---- // + } // ---- sample end ---- // } else if (user_method->arg("variational")) { // ---- variational start ---- // list_argument *algo = dynamic_cast(