Files
Jungfraujoch/common/IndexingSettings.cpp
T
leonarski_fandClaude Opus 5 7e47afe47f
Build Packages / build:viewer-tgz:cpu (push) Successful in 20m26s
Build Packages / build:viewer-tgz:cuda (push) Successful in 21m30s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 22m36s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 24m4s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 28m10s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 28m12s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 28m23s
Build Packages / XDS test (durin plugin) (push) Successful in 11m21s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 20m56s
Build Packages / build:rpm (rocky9) (push) Successful in 21m10s
Build Packages / Generate python client (push) Successful in 40s
Build Packages / Build documentation (push) Successful in 1m34s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (rocky8) (push) Successful in 25m28s
Build Packages / DIALS test (push) Successful in 21m15s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 21m26s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 25m51s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 10m53s
Build Packages / XDS test (neggia plugin) (push) Successful in 9m41s
Build Packages / Unit tests (push) Successful in 2h21m29s
Build Packages / build:windows:nocuda (push) Successful in 1m15s
Build Packages / build:windows:cuda (push) Successful in 28m0s
rugnux: parallelise candidate-cell refinement, and stop repeating work in the tail
Three independent changes to the CPU-bound parts of an offline rotation run, none
of which alters a result.

Candidate-cell refinement now splits across threads. RefineCandidateCells already
took a (block, nblocks) partition, but the only call site passed nblocks=1, so the
whole first pass of a two-pass rotation run sat on one thread per scheme - two
threads, unchanged at every -N, for a third of the run. A block touches only its
own scores(j) and cells rows and holds its own scratch, so the split is exact.
The budget is a new IndexingSettings::RefineThreads, left at 1 by default and set
only where few indexer threads exist: raising it unconditionally would
oversubscribe the paths that already run one indexer per image across all workers.

The mmCIF writer built a std::ostringstream per formatted number, twelve per
reflection. snprintf gives the same digits for 0.535 -> 0.220 s per file.

The space-group search built the same orbit mapping twice per candidate point
group - once for the merge chi^2 and once for the systematic-error b, an
apply_to_hkl and Canonicalize per observation per operator each time. Build it
once and hand it to both.

18 Mpx rotation set 24.6 -> 18.7 s, 2.5 Mpx 13.0 -> 10.7 s, and the 37-crystal
battery 13m55s -> 10m47s with no failures, the same 34/37 space groups, and
statistics unchanged on 30 of 37 (the rest drift within the run-to-run spread the
binary already had, which a control build with the split disabled reproduces).

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-08-03 07:30:33 +02:00

238 lines
7.3 KiB
C++

// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#include "IndexingSettings.h"
#include "JFJochException.h"
#include "CUDAWrapper.h"
#include <cmath>
#define check_max(param, val, max) if ((val) > (max)) throw JFJochException(JFJochExceptionCategory::InputParameterAboveMax, param)
#define check_min(param, val, min) if ((val) < (min)) throw JFJochException(JFJochExceptionCategory::InputParameterBelowMin, param)
#define check_finite(param, val) if (!std::isfinite(val)) throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, param)
IndexingSettings::IndexingSettings() {
if (get_gpu_count() > 0)
algorithm = IndexingAlgorithmEnum::FFBIDX;
else
algorithm = IndexingAlgorithmEnum::None;
}
IndexingSettings &IndexingSettings::ViableCellMinSpots(int64_t input) {
check_min("ViableCellMinSpots", input, 6);
viable_cell_min_spots = input;
return *this;
}
int64_t IndexingSettings::GetViableCellMinSpots() const {
return viable_cell_min_spots;
}
IndexingSettings &IndexingSettings::Algorithm(IndexingAlgorithmEnum input) {
switch (input) {
case IndexingAlgorithmEnum::Auto:
case IndexingAlgorithmEnum::FFBIDX:
case IndexingAlgorithmEnum::FFT:
case IndexingAlgorithmEnum::FFTW:
case IndexingAlgorithmEnum::None:
algorithm = input;
break;
default:
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
"Invalid value for indexing algorithm enum parameter");
}
return *this;
}
IndexingSettings &IndexingSettings::FFT_MaxUnitCell_A(float input) {
check_finite("FFT indexing max unit cell (A)", input);
check_min("FFT indexing max unit cell (A)", input, 50);
check_max("FFT indexing max unit cell (A)", input, 500);
fft_max_unit_cell_A = input;
return *this;
}
IndexingSettings &IndexingSettings::FFT_MinUnitCell_A(float input) {
check_finite("FFT indexing min unit cell (A)", input);
check_min("FFT indexing min unit cell (A)", input, 5);
check_max("FFT indexing min unit cell (A)", input, 40);
fft_min_unit_cell_A = input;
return *this;
}
IndexingSettings & IndexingSettings::FFT_MaxAngle_deg(float input) {
check_finite("FFT indexing max angle (deg)", input);
check_min("FFT indexing max angle (deg)", input, 0);
check_max("FFT indexing max angle (deg)", input, 180);
fft_max_angle_deg = input;
return *this;
}
IndexingSettings & IndexingSettings::FFT_MinAngle_deg(float input) {
check_finite("FFT indexing min angle (deg)", input);
check_min("FFT indexing min angle (deg)", input, 0);
check_max("FFT indexing min angle (deg)", input, 180);
fft_min_angle_deg = input;
return *this;
}
float IndexingSettings::GetFFT_MinAngle_deg() const {
return fft_min_angle_deg;
}
float IndexingSettings::GetFFT_MaxAngle_deg() const {
return fft_max_angle_deg;
}
IndexingSettings &IndexingSettings::FFT_NumVectors(int64_t input) {
check_min("FFT indexing number of search vectors", input, 128);
fft_num_vectors = input;
return *this;
}
IndexingSettings &IndexingSettings::FFT_HighResolution_A(float input) {
check_finite("FFT indexing high resolution (A)", input);
check_min("FFT indexing high resolution (A)", input, 0.5);
check_max("FFT indexing high resolution (A)", input, 6.0);
fft_high_resolution_A = input;
return *this;
}
IndexingAlgorithmEnum IndexingSettings::GetAlgorithm() const {
return algorithm;
}
float IndexingSettings::GetFFT_MaxUnitCell_A() const {
return fft_max_unit_cell_A;
}
float IndexingSettings::GetFFT_MinUnitCell_A() const {
return fft_min_unit_cell_A;
}
int64_t IndexingSettings::GetFFT_NumVectors() const {
return fft_num_vectors;
}
float IndexingSettings::GetFFT_HighResolution_A() const {
return fft_high_resolution_A;
}
IndexingSettings &IndexingSettings::Tolerance(float input) {
check_min("Indexing tolerance", input, 0.0);
check_max("Indexing tolerance", input, 0.5);
indexing_tolerance = input;
return *this;
}
float IndexingSettings::GetTolerance() const {
return indexing_tolerance;
}
int64_t IndexingSettings::GetIndexingThreads() const {
return indexing_threads;
}
IndexingSettings &IndexingSettings::IndexingThreads(int64_t input) {
check_min("Indexing thread count", input, 1);
check_max("Indexing thread count", input, 64);
indexing_threads = input;
return *this;
}
int64_t IndexingSettings::GetRefineThreads() const {
return refine_threads;
}
IndexingSettings &IndexingSettings::RefineThreads(int64_t input) {
check_min("Candidate-cell refinement thread count", input, 1);
check_max("Candidate-cell refinement thread count", input, 64);
refine_threads = input;
return *this;
}
IndexingSettings &IndexingSettings::UnitCellDistTolerance(float input) {
check_min("Relative unit cell distance tolerance vs. reference", input, 0.0001);
check_max("Relative unit cell distance tolerance vs. reference", input, 0.2001);
unit_cell_dist_tolerance_vs_reference = input;
return *this;
}
float IndexingSettings::GetUnitCellDistTolerance() const {
return unit_cell_dist_tolerance_vs_reference;
}
float IndexingSettings::GetUnitCellAngleTolerance_deg() const {
return unit_cell_angle_tolerance_deg;
}
GeomRefinementAlgorithmEnum IndexingSettings::GetGeomRefinementAlgorithm() const {
return refinement;
}
IndexingSettings &IndexingSettings::GeomRefinementAlgorithm(GeomRefinementAlgorithmEnum input) {
refinement = input;
return *this;
}
IndexingSettings & IndexingSettings::IndexIceRings(bool input) {
index_ice_rings = input;
return *this;
}
IndexingSettings & IndexingSettings::RotationIndexing(bool input) {
enable_rotation_indexing = input;
return*this;
}
IndexingSettings & IndexingSettings::RotationIndexingMinAngularRange_deg(float input) {
check_finite("Rotation indexing minimum angular range (deg.)", input);
check_min("Rotation indexing minimum angular range (deg.)", input, 1.0);
rotation_indexing_min_angular_range_deg = input;
return *this;
}
IndexingSettings & IndexingSettings::RotationIndexingAngularStride_deg(float input) {
check_finite("Rotation indexing angular stride (deg.)", input);
check_min("Rotation indexing angular stride (deg.)", input, 0.0);
rotation_indexing_angular_stride_deg = input;
return *this;
}
bool IndexingSettings::GetRotationIndexing() const {
return enable_rotation_indexing;
}
float IndexingSettings::GetRotationIndexingMinAngularRange_deg() const {
return rotation_indexing_min_angular_range_deg;
}
float IndexingSettings::GetRotationIndexingAngularStride_deg() const {
return rotation_indexing_angular_stride_deg;
}
bool IndexingSettings::GetIndexIceRings() const {
return index_ice_rings;
}
bool IndexingSettings::GetBlockingBehavior() const {
return blocking_behavior;
}
IndexingSettings &IndexingSettings::BlockingBehavior(bool input) {
blocking_behavior = input;
return *this;
}
int64_t IndexingSettings::GetMaxExtraLattices() const {
return max_extra_lattices;
}
IndexingSettings &IndexingSettings::MaxExtraLattices(int64_t input) {
check_min("Max extra lattices", input, 0);
check_max("Max extra lattices", input, 10);
max_extra_lattices = input;
return *this;
}