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

103 lines
5.5 KiB
C++

// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
// The density of a model's atoms on a grid, on the GPU (CUDA builds only): gemmi's
// DensityCalculator::put_model_density_on_grid() without the symmetrize - ONE copy of the content. The
// rigid body (RigidBodyGPU.cu) and the model's structure factors (ModelStructureFactorsGPU.cu) both grid
// with it, and compose the crystal's symmetry in reciprocal space (SymmetryComposition, RigidBodyRefine.h).
//
// A gather, not a scatter: the grid is cut into bricks of BRICK^3 points, each brick is one block, and
// every point adds, in model order, each atom whose box holds it and whose radius reaches it. Nothing is
// summed with a floating-point atomic. The arithmetic is the CPU walk's (UseDensityBoxesByPlane and
// AtomDensity, ModelGrid.cpp; ModelDensityMetal.metal spells out the same), so the grid is
// PutModelDensityOnGrid()'s before its symmetrize, bit for bit, for the same atoms and centres -
// tests/ModelDensityGPUTest.cpp holds it to that.
#include <cstddef>
#include <vector>
#include <cuda_runtime.h>
#include "../indexing/CUDAMemHelpers.h"
// One atom's density on a grid, as PutModelDensityOnGrid() (ModelGrid.cpp) sets it up: gemmi's
// precalculated five-Gaussian sum and the radius it cuts the sum at.
struct ModelDensityAtom {
float a[5];
float b[5][6]; // isotropic: b[k][0] multiplies r^2; anisotropic: the matrix, u11 u22 u33 u12 u13 u23
float occ;
float radius;
float max_r2; // the radius squared, as PutModelDensityOnGrid() rounds it: float(radius^2) in double
int aniso;
};
// The grid the density is put on, u fastest: index = u + nu * (v + nv * w).
struct ModelDensityGrid {
int nu = 0, nv = 0, nw = 0;
double orth[9] = {}, frac[9] = {}; // the cell's, row-major
};
class ModelDensityGPU {
public:
// The bytes an instance of this capacity reserves on the device.
static size_t DeviceBytes(size_t max_atoms, size_t max_pairs, size_t max_bricks);
static size_t Bricks(int nu, int nv, int nw);
// The most gather bricks the 2 d + 1 points of an atom's box can fall in along an axis of n points.
static size_t AxisBrickBound(int d, int n);
// gemmi's box around each atom (MakeAtomBox, ModelGrid.cpp): the points within ceil(radius / spacing)
// of the nearest one along each axis, three per atom.
static std::vector<int> Boxes(const ModelDensityGrid &grid, const std::vector<ModelDensityAtom> &atoms);
static void Boxes(const ModelDensityGrid &grid, const ModelDensityAtom *atoms, size_t n, int *box);
// (brick, atom) pairs of the gather over at most.
static size_t PairBound(const ModelDensityGrid &grid, const std::vector<ModelDensityAtom> &atoms);
static size_t PairBound(const ModelDensityGrid &grid, const int *box, size_t n);
// Whether the gather reproduces gemmi's box walk on this grid: every atom's box narrower than the cell,
// so that no point is reached by two images of one atom.
static bool Supports(const ModelDensityGrid &grid, const std::vector<ModelDensityAtom> &atoms);
static bool Supports(const ModelDensityGrid &grid, const int *box, size_t n);
// alloc: the buffers' allocator - the stream-ordered pool, or synchronous for an owner whose buffers may be asked for
// while a probe pass runs beside it (RigidBodyGPU).
ModelDensityGPU(cudaStream_t stream, size_t max_atoms, size_t max_pairs, size_t max_bricks,
CudaAlloc alloc = CudaAlloc::Pooled);
// The grid and the atoms' densities. Throws if they are over the capacity or if !Supports(). The atoms are
// read until the call returns; from pinned memory (PinnedVector) they go up by DMA.
void SetAtoms(const ModelDensityGrid &grid, const std::vector<ModelDensityAtom> &atoms);
void SetAtoms(const ModelDensityGrid &grid, const ModelDensityAtom *atoms, size_t n);
// The density into d_grid (nu * nv * nw floats, every point written). d_pos: each atom's centre in
// grid units - its fractional position times the grid size, as the CPU's DensityBox holds it, not
// wrapped into the cell - in the order SetAtoms() got them; w is not read. Queued on the stream, nothing
// waited for: the pairs are built in buffers of a fixed shape, so this records into a CUDA graph.
void Compute(const float4 *d_pos, float *d_grid);
// The densities and the boxes of the atoms last set, on the device, for a kernel that walks the same boxes.
const ModelDensityAtom *DeviceAtoms() const { return atoms; }
const int *DeviceBoxes() const { return box; }
// What the gather kernel needs of the grid.
struct Geometry {
int nu, nv, nw;
// gemmi's orth_n, orth * diag(1/nu, 1/nv, 1/nw), upper triangular, in single precision
float m00, m01, m02, m11, m12, m22;
};
private:
cudaStream_t stream;
size_t max_atoms, max_pairs, max_bricks;
Geometry geom{};
int n_atoms = 0;
CudaDevicePtr<ModelDensityAtom> atoms;
CudaDevicePtr<int> box;
CudaHostPtr<int> host_box; // the boxes' staging buffer, pinned
// per brick its atoms counted, where its segment starts (max_bricks + 1: the last entry the total) and how
// far it is filled; per pair the atom as the fill placed it, its rank in the brick, and in model order
CudaDevicePtr<int> brick_count, brick_start, brick_fill, unordered, rank, pair_atom;
CudaDevicePtr<char> cub_temp;
size_t cub_bytes = 0;
};