Build Packages / Create release (push) Successful in 17s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 4m41s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 20m49s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 13m6s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 23m44s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 7m28s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 11m50s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 14m9s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 16m25s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 15m42s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 20m50s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 20m36s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 22m18s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 23m29s
Build Packages / Generate python client (push) Successful in 30s
Build Packages / Build documentation (push) Successful in 1m10s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 21m38s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 17m8s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 23m10s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 19m16s
Build Packages / Unit tests (push) Successful in 2h8m4s
Build Packages / Validation Battery (push) Successful in 40m53s
* Rugnux: Processes serial crystallography data from XFELs - SACLA (MPCCD), PAL-XFEL and European XFEL (CXI), LCLS (XTC) and SwissFEL Alvra (JUNGFRAU with a CrystFEL module geometry) - with several files or Jungfraujoch master files merged in one run (`rugnux *_master.h5`). * Rugnux: Stills processing takes a known unit cell and space group as a starting point, finds the beam centre (and, with a cell, the detector distance) from the images, detects the saturation level in other facilities' files and refines the placement of individual detector panels. * Rugnux: The stills report gives R_split and CC1/2 from frame half-sets, comparable with CrystFEL. * jfjoch_viewer: Opens the same XFEL file formats. * Validation: A stills battery checks Rugnux against deposited structures from SACLA, PAL-XFEL, LCLS, European XFEL and SwissFEL. * Rugnux: More reliable convergence of rotation scaling, and live molecular replacement starts as soon as the model is uploaded. * jfjoch_broker: Initialize clears the previous dataset's bearer tokens, image buffer and live Rugnux status, and a slow CUDA JIT cache is reported at start. Reviewed-on: #88 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
109 lines
4.3 KiB
C++
109 lines
4.3 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <cstdint>
|
|
#include <chrono>
|
|
#include <iostream>
|
|
#include <mutex>
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include <spdlog/spdlog.h>
|
|
#include <spdlog/fmt/fmt.h>
|
|
|
|
namespace spdlog {
|
|
class logger;
|
|
}
|
|
|
|
class LogBufferSink;
|
|
|
|
class Logger {
|
|
std::shared_ptr<spdlog::logger> spdlog_logger;
|
|
std::shared_ptr<LogBufferSink> buffer; // only on a Buffered() logger
|
|
explicit Logger(std::shared_ptr<LogBufferSink> sink);
|
|
|
|
std::string service;
|
|
std::string hostname;
|
|
public:
|
|
Logger(const std::string &service_name, const std::string &file_name = "");
|
|
void ErrorException(const std::exception &e);
|
|
|
|
void Info(const std::string& msg) { spdlog_logger->info(msg); }
|
|
void Warning(const std::string& msg) { spdlog_logger->warn(msg); }
|
|
void Error(const std::string& msg) { spdlog_logger->error(msg); }
|
|
void Debug(const std::string& msg) { spdlog_logger->debug(msg); }
|
|
|
|
template<typename... Args>
|
|
void Info(fmt::format_string<Args...> fmt, Args &&... args) {
|
|
spdlog_logger->info(fmt, std::forward<Args>(args)...);
|
|
}
|
|
|
|
template<typename... Args>
|
|
void Error(fmt::format_string<Args...> fmt, Args &&... args) {
|
|
spdlog_logger->error(fmt, std::forward<Args>(args)...);
|
|
}
|
|
|
|
template<typename... Args>
|
|
void Debug(fmt::format_string<Args...> fmt, Args &&... args) {
|
|
spdlog_logger->debug(fmt, std::forward<Args>(args)...);
|
|
}
|
|
|
|
template<typename... Args>
|
|
void Warning(fmt::format_string<Args...> fmt, Args &&... args) {
|
|
spdlog_logger->warn(fmt, std::forward<Args>(args)...);
|
|
}
|
|
|
|
Logger& Verbose(bool input);
|
|
|
|
// Every Logger made after this call writes to `sink` alone instead of the console, keeps every
|
|
// level down to debug (the sink decides what it shows), and skips the version line each Logger
|
|
// otherwise opens with. For a program that owns its terminal: rugnux sends the whole log to a file
|
|
// next to its outputs and shows only warnings and errors among its own step lines.
|
|
static void RouteAll(spdlog::sink_ptr sink);
|
|
|
|
// Every Logger named `service` made after this call keeps only lines of `level` and above. For a program
|
|
// that runs a library whose log is not its own: the broker keeps rugnux's processing log out of its
|
|
// journal. Set at start-up, before any thread logs.
|
|
static void ServiceLevel(const std::string &service, spdlog::level::level_enum level);
|
|
|
|
// A logger that keeps its lines instead of printing them, for work run beside other work that
|
|
// logs: ReplayInto hands them to `to` afterwards, in order and as one block, so the two do not
|
|
// interleave.
|
|
static Logger Buffered();
|
|
void ReplayInto(Logger &to) const;
|
|
};
|
|
|
|
// An NVTX range named `name`, so a timed section shows up by name in an Nsight Systems trace. A start/end
|
|
// pair, not a push/pop, so a range may end on another thread and ranges on parallel threads may overlap.
|
|
// Without a profiler attached both calls return at once; without CUDA they do nothing.
|
|
uint64_t NvtxRangeStart(const std::string &name);
|
|
void NvtxRangeEnd(uint64_t id);
|
|
|
|
// Times one section of a run: logs "TIMING <section> <seconds>" at debug level when the section ends -
|
|
// at Stop(), or when the mark goes out of scope, whichever comes first. rugnux keeps debug lines off the
|
|
// terminal and in <prefix>_log.txt; tools/rugnux_timing.py turns them into a table. The section is also
|
|
// an NVTX range of the same name.
|
|
class TimingMark {
|
|
Logger &logger;
|
|
std::string section;
|
|
std::chrono::steady_clock::time_point start = std::chrono::steady_clock::now();
|
|
uint64_t nvtx_range = NvtxRangeStart(section);
|
|
bool stopped = false;
|
|
public:
|
|
TimingMark(Logger &in_logger, std::string in_section)
|
|
: logger(in_logger), section(std::move(in_section)) {}
|
|
TimingMark(const TimingMark &) = delete;
|
|
TimingMark &operator=(const TimingMark &) = delete;
|
|
~TimingMark() { Stop(); }
|
|
void Stop() {
|
|
if (stopped)
|
|
return;
|
|
stopped = true;
|
|
NvtxRangeEnd(nvtx_range);
|
|
logger.Debug("TIMING {} {:.3f}", section,
|
|
std::chrono::duration<double>(std::chrono::steady_clock::now() - start).count());
|
|
}
|
|
};
|