Merge broker-rugnux-live into rc176: rugnux in jfjoch_broker as a live thread during a DECTRIS rotation collection (off by default), the rugnux library without file I/O (results in ProcessResult::outputs, the CLI writes them through JFJochRugnuxOutput), END carrying the merged table, map coefficients and placed model
Branch reviewed ate16db07ff(review: owner's decisions accepted - _maps.mtz instead of .ccp4 in the viewer, -o "" computes everything incl. MR/validation, Ctrl+C/error paths may leave fewer files, the writer links gemmi/zlib) and merged at55184eb09with its review fixes (END size guard, frame drop as in Lite, outputs released before re-runs, pool priority, docs, frontend gating). Conflicts: rugnux/Rugnux.h (kept rc176's host_memory_budget_bytes, output_prefix removed as on the branch), rugnux/RugnuxPipeline.h (MtzTable future + rc176's GPUMerge pointer), MolecularReplacement.h/.cpp (rc176's GPU cost model, packed transform and split functions with the branch's RugnuxModel signature; search_model with rc176's other_budgets, result.model_name). tests/RugnuxLargeTest.cpp: rc176's host-budget test writes its files through WriteRugnuxOutputs now that the library writes none. Generated code (broker/gen, frontend client, Python client docs, Redoc) regenerated from the merged jfjoch_api.yaml with update_version.sh (version unchanged). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PXc1zD1yxHqaR1DGdCTHL4
This commit is contained in:
commit
78c2a69267
130 files changed
+7612
-1010
No files matched your search
@@ -21,6 +21,7 @@
|
||||
#include "../common/IndexingSettings.h"
|
||||
#include "../reader/JFJochHDF5Reader.h"
|
||||
#include "../rugnux/Rugnux.h"
|
||||
#include "../rugnux/RugnuxOutputFiles.h"
|
||||
|
||||
namespace {
|
||||
// Start-up hook: report once whether the large datasets are available, so it is obvious why
|
||||
@@ -161,14 +162,15 @@ TEST_CASE("Rugnux_HostBudgetChangesOnlyTheSchedule", "[large]") {
|
||||
config.two_pass_rotation = true;
|
||||
config.rotation_postrefine_geometry = true;
|
||||
config.run_scaling = true;
|
||||
config.write_process_h5 = false;
|
||||
config.output_prefix = prefix;
|
||||
config.host_memory_budget_bytes = budget;
|
||||
|
||||
Rugnux process(reader, experiment, *dataset->pixel_mask, config);
|
||||
ProcessResult result;
|
||||
REQUIRE_NOTHROW(result = process.Run());
|
||||
reader.Close();
|
||||
// The library writes nothing: the files are the CLI's, written from the result
|
||||
Logger logger("Rugnux_HostBudgetChangesOnlyTheSchedule");
|
||||
WriteRugnuxOutputs(result, prefix, config.provenance, config.nthreads, logger);
|
||||
return result;
|
||||
};
|
||||
const std::filesystem::path dir = std::filesystem::temp_directory_path() / "rugnux_host_budget_test";
|
||||
|
||||
Reference in new issue
Block a user