Files
leonarski_f 4809c1622c
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 16m43s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 28m46s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 32m5s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 39m44s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 5m7s
Build Packages / Create release (push) Successful in 8s
Build Packages / Build documentation (push) Successful in 49s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 22m30s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 31m54s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 11m29s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 23m51s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 26m7s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 29m38s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 28m6s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 29m44s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 33m22s
Build Packages / Generate python client (push) Successful in 47s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 34m6s
Build Packages / Unit tests (push) Successful in 1h2m47s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 35m59s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 34m8s
Build Packages / Validation Battery (push) Successful in 38m31s
v1.0.0-rc.187 (#98)
* Rugnux: Refinement several times faster, one protocol on the CPU and the GPU, parts of it on the Apple GPU; its random draws are the same on every platform.
* Rugnux: Refinement follows common practice: the free set decides only the restraint weights and the displacement model (isotropic, TLS or anisotropic, by Hamilton's test), everything else is decided on the working set; lower R-free for placed and predicted models.
* Rugnux: Restraint dictionaries via `--restraints` (or among the inputs) and more built-in ligands; a model whose space group is a subgroup of the data's is refined in its own group; reflections plus a model select `--mode refine` on their own.
* Rugnux: `-C` fixes the crystal system on the axes as typed; `-S` alone fixes the space group only, the cell is still found and reduced; a space group or cell stored in the input file is ignored, with a line in the log.
* Rugnux: More reliable multi-sweep merging; `--mode scale` merges several stills runs as one; `_plot.txt` and the report name each input; a second crystal form is reported for stills given a cell.
* jfjoch_broker (experimental): Live Rugnux on FPGA detectors (JUNGFRAU) takes the same path as a DECTRIS stream, rotation and serial alike, model step included, with analysis threads per GPU; frames waiting for the analysis can be viewed; no host stage drops a frame - a source faster than the analysis is held at the card.
* jfjoch_broker: Summation of more than 256 frames per image is split between the card and the host (`summation_mode` is then `hybrid`), and live Rugnux runs on such collections; pedestal runs take a receiver of their own.
* jfjoch_broker (experimental): `stills_downsample` analyses 1 of every N serial images (chosen by a hash; the first 2000 all; the others written without analysis; reset to 1 by `/initialize`); `max_spot_count` left out means 250 for per-image indexing and up to 1000 for live stills; the live status gives the merge before the model work, the fitted resolution and the anomalous peak height of each unexplained blob.
* jfjoch_broker: Without a `pcie` entry the broker runs on a mock of the card instead of the HLS simulation; its spot, ROI and azimuthal results are zero then.
* Web frontend: Redesigned Rugnux live page; Vite 8, TypeScript 6, Mol* 5.13 and dependency security updates.
* Tools: `jfjoch_fpga_stills_test` measures live stills on the cards with a stored dataset; `jfjoch_fpga_test` loses the HLS-simulation option.
* Other: FFTW no longer fetched or linked (the CPU FFT indexer keeps the name `FFTW`); PCIe driver now GPL-2.0-or-later and third-party notices complete; several crash fixes.

Reviewed-on: #98
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-11-19 20:49:28 +01:00

127 lines
4.1 KiB
C++

// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#include "spdlog/sinks/daily_file_sink.h"
#include "spdlog/sinks/stdout_color_sinks.h"
#include "spdlog/sinks/base_sink.h"
#include "spdlog/fmt/bin_to_hex.h"
#include <map>
#include <set>
#include "Logger.h"
#include "GitInfo.h"
#ifdef JFJOCH_USE_NVTX
#include <nvtx3/nvToolsExt.h>
uint64_t NvtxRangeStart(const std::string &name) {
return nvtxRangeStartA(name.c_str());
}
void NvtxRangeEnd(uint64_t id) {
nvtxRangeEnd(id);
}
#else
uint64_t NvtxRangeStart(const std::string &) {
return 0;
}
void NvtxRangeEnd(uint64_t) {}
#endif
namespace {
spdlog::sink_ptr routed_sink; // set once, at start-up, before any thread logs
std::map<std::string, spdlog::level::level_enum> service_levels; // the same
}
void Logger::RouteAll(spdlog::sink_ptr sink) {
routed_sink = std::move(sink);
}
void Logger::ServiceLevel(const std::string &service, spdlog::level::level_enum level) {
service_levels[service] = level;
}
Logger::Logger(const std::string &service_name, const std::string &file_name) {
if (routed_sink) {
spdlog_logger = std::make_shared<spdlog::logger>(service_name, routed_sink);
spdlog_logger->set_level(spdlog::level::debug);
return;
}
std::string variant = "";
#ifdef JFJOCH_USE_CUDA
variant += "C";
#endif
variant += "F";
std::vector<spdlog::sink_ptr> sinks;
sinks.push_back(std::make_shared<spdlog::sinks::stdout_color_sink_mt>());
if (!file_name.empty())
sinks.push_back(std::make_shared<spdlog::sinks::daily_file_sink_mt>(file_name, 23, 59));
spdlog_logger = std::make_shared<spdlog::logger>(service_name, std::begin(sinks), std::end(sinks));
if (const auto it = service_levels.find(service_name); it != service_levels.end())
spdlog_logger->set_level(it->second);
{
// The version line goes out once per service: a run makes many loggers of one service (every FFT indexer
// is one). Function-local, as a static Logger (jfjoch_writer's) is made before this file's own statics.
static std::mutex version_mutex;
static std::set<std::string> version_logged;
std::unique_lock ul(version_mutex);
if (!version_logged.insert(service_name).second)
return;
}
if (jfjoch_git_sha1().empty())
spdlog_logger->info("Version {} {}", jfjoch_version(), variant);
else
spdlog_logger->info("Version {} (git {} {}) {}",
jfjoch_version(),
jfjoch_git_sha1().substr(0, 6),
jfjoch_git_date(),
variant);
}
class LogBufferSink : public spdlog::sinks::base_sink<std::mutex> {
public:
struct Line {
spdlog::log_clock::time_point time;
spdlog::level::level_enum level;
std::string text;
};
std::vector<Line> lines;
protected:
void sink_it_(const spdlog::details::log_msg &msg) override {
lines.push_back({msg.time, msg.level, std::string(msg.payload.data(), msg.payload.size())});
}
void flush_() override {}
};
Logger::Logger(std::shared_ptr<LogBufferSink> sink) : buffer(std::move(sink)) {
spdlog_logger = std::make_shared<spdlog::logger>("buffer", buffer);
spdlog_logger->set_level(spdlog::level::trace); // the logger it is replayed into filters
}
Logger Logger::Buffered() {
return Logger(std::make_shared<LogBufferSink>());
}
// Called once the work that logged is finished, so nothing is still writing to the buffer. Each line
// keeps the time it was logged at, not the time of the replay, so a timestamped log still shows when
// the work happened.
void Logger::ReplayInto(Logger &to) const {
for (const auto &l : buffer->lines)
to.spdlog_logger->log(l.time, spdlog::source_loc{}, l.level, l.text);
}
void Logger::ErrorException(const std::exception &e) {
spdlog_logger->error(e.what());
}
Logger &Logger::Verbose(bool input) {
if (input)
spdlog_logger->set_level(spdlog::level::debug);
else
spdlog_logger->set_level(spdlog::level::info);
return *this;
}