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
* 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>
99 lines
4.7 KiB
C++
99 lines
4.7 KiB
C++
// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "RefinementNewtonGPU.h"
|
|
|
|
#include "RefinementRestraints.h"
|
|
|
|
size_t RestraintNormalMatrixGPU::DeviceBytes(const RestraintSet &set, size_t n_atoms,
|
|
const std::vector<int> &block_atoms, int iterations) {
|
|
size_t entries = 0, rows = 0, params = 0, inverse = 0;
|
|
for (const RestraintRecord &r : set.records) // as At() lays out J
|
|
switch (static_cast<RestraintKind>(r.kind)) {
|
|
case RestraintKind::Plane:
|
|
entries += static_cast<size_t>(r.atom[1]) * r.atom[1];
|
|
rows += r.atom[1];
|
|
break;
|
|
case RestraintKind::Angle:
|
|
entries += 3;
|
|
rows++;
|
|
break;
|
|
case RestraintKind::Torsion:
|
|
case RestraintKind::Chiral:
|
|
case RestraintKind::NcsDistance:
|
|
entries += 4;
|
|
rows++;
|
|
break;
|
|
default:
|
|
entries += 2;
|
|
rows++;
|
|
break;
|
|
}
|
|
for (int a : block_atoms) {
|
|
params += a;
|
|
inverse += static_cast<size_t>(3 * a) * (3 * a + 1) / 2;
|
|
}
|
|
const size_t n = 3 * params;
|
|
return n_atoms * 4 * sizeof(float) // the positions
|
|
+ set.records.size() * (sizeof(RestraintRecord) + sizeof(int)) + set.plane_atoms.size() * sizeof(int)
|
|
+ rows * (sizeof(int) + 2 * sizeof(float)) // row starts, J v
|
|
+ entries * (8 * sizeof(float) + 3 * sizeof(int)) + params * sizeof(int) // J, its transposed copy, index
|
|
+ n * 15 * sizeof(float) // seven vectors, diagonal
|
|
+ n * (2 * sizeof(float) + 2 * sizeof(int)) + 2 * block_atoms.size() * sizeof(int) // h, the blocks
|
|
+ inverse * 2 * sizeof(float) // their inverses
|
|
+ static_cast<size_t>(iterations) * n * 3 * sizeof(float); // the kept residuals
|
|
}
|
|
|
|
// The host half: the index of J, as RestraintGaussNewton lays out its rows, with every row kept.
|
|
void RestraintNormalMatrixGPU::At(const RestraintSet &set, const std::vector<std::array<double, 4>> &xyzb) {
|
|
if (!indexed_) {
|
|
std::vector<int> record_entry, start{0}, atom;
|
|
for (const RestraintRecord &r : set.records) {
|
|
record_entry.push_back(static_cast<int>(atom.size()));
|
|
switch (static_cast<RestraintKind>(r.kind)) {
|
|
case RestraintKind::Plane:
|
|
// one row per atom of the plane, each over all of them
|
|
for (int i = 0; i < r.atom[1]; i++) {
|
|
for (int k = 0; k < r.atom[1]; k++)
|
|
atom.push_back(set.plane_atoms[r.atom[0] + k]);
|
|
start.push_back(static_cast<int>(atom.size()));
|
|
}
|
|
continue;
|
|
case RestraintKind::Angle:
|
|
atom.insert(atom.end(), r.atom, r.atom + 3);
|
|
break;
|
|
case RestraintKind::Torsion:
|
|
case RestraintKind::Chiral:
|
|
case RestraintKind::NcsDistance:
|
|
atom.insert(atom.end(), r.atom, r.atom + 4);
|
|
break;
|
|
default: // Bond, Repulsion, BSimilarity
|
|
atom.insert(atom.end(), r.atom, r.atom + 2);
|
|
break;
|
|
}
|
|
start.push_back(static_cast<int>(atom.size()));
|
|
}
|
|
const size_t rows = start.size() - 1;
|
|
std::vector<int> row_of(atom.size()), param(atom.size());
|
|
for (size_t e = 0; e < atom.size(); e++)
|
|
param[e] = param_of_[atom[e]];
|
|
for (size_t r = 0; r < rows; r++)
|
|
for (int e = start[r]; e < start[r + 1]; e++)
|
|
row_of[e] = static_cast<int>(r);
|
|
std::vector<int> entry_start(n_params_ + 1, 0);
|
|
for (int k : param)
|
|
if (k >= 0)
|
|
entry_start[k + 1]++;
|
|
for (size_t k = 0; k < n_params_; k++)
|
|
entry_start[k + 1] += entry_start[k];
|
|
std::vector<int> entry(entry_start.back());
|
|
std::vector<int> fill(entry_start.begin(), entry_start.end() - 1);
|
|
for (size_t e = 0; e < param.size(); e++)
|
|
if (param[e] >= 0)
|
|
entry[fill[param[e]]++] = static_cast<int>(e);
|
|
Upload(set.records, set.plane_atoms, record_entry, start, param, row_of, entry_start, entry);
|
|
indexed_ = true;
|
|
}
|
|
Fill(xyzb);
|
|
}
|