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>
78 lines
3.4 KiB
C++
78 lines
3.4 KiB
C++
// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include <catch2/catch_all.hpp>
|
|
|
|
#ifdef __APPLE__
|
|
|
|
#include <complex>
|
|
#include <cstring>
|
|
#include <random>
|
|
#include <vector>
|
|
|
|
#include "gemmi/it92.hpp"
|
|
#include "gemmi/symmetry.hpp"
|
|
#include "../image_analysis/structure_refinement/SideChainField.h"
|
|
#include "../image_analysis/structure_refinement/SideChainFieldMetal.h"
|
|
|
|
// The side-chain field's direct sums on the Apple GPU (SideChainFieldMetal.h) are the CPU's, bit for bit, so the
|
|
// contributions are compared as bit patterns and the energies exactly. A Mac without a Metal device fails rather than
|
|
// skips, as in ModelDensityMetalTest.cpp.
|
|
|
|
TEST_CASE("SideChainFieldMetal_BitIdenticalToCPU", "[portable][Metal]") {
|
|
std::mt19937 rng(23);
|
|
std::uniform_real_distribution<float> unit(0.0f, 1.0f);
|
|
std::uniform_int_distribution<int> index(-25, 25);
|
|
// reflections of a 50 A cell to about 2 A, in no particular order, a tenth of them free
|
|
FieldReflections fr;
|
|
for (int i = 0; i < 20000; i++) {
|
|
const float h = static_cast<float>(index(rng)), k = static_cast<float>(index(rng)), l = static_cast<float>(index(rng));
|
|
fr.hkl.push_back({h, k, l});
|
|
fr.stol2.push_back((h * h + k * k + l * l) / (4.0f * 50 * 50));
|
|
fr.fo.push_back(100 * unit(rng));
|
|
fr.d.push_back(0.9f);
|
|
fr.var.push_back(50 + 100 * unit(rng));
|
|
fr.centric.push_back(i % 7 == 0);
|
|
fr.work.push_back(i % 10 != 0);
|
|
fr.k_total.push_back(1.0f);
|
|
fr.fmask.push_back({10 * unit(rng), 10 * unit(rng)});
|
|
}
|
|
const std::vector<FormFactor> elements = {gemmi::IT92<float>::get(gemmi::El::C, 0).coefs,
|
|
gemmi::IT92<float>::get(gemmi::El::N, 0).coefs,
|
|
gemmi::IT92<float>::get(gemmi::El::O, 0).coefs};
|
|
const auto ops = FieldOperators(*gemmi::find_spacegroup_by_name("P 21 21 21"));
|
|
// 70 states of six atoms each - more than one batch - and combinations of one and of two states
|
|
FieldStates states;
|
|
for (int s = 0; s < 70; s++) {
|
|
std::vector<FieldAtom> atoms;
|
|
for (int a = 0; a < 6; a++)
|
|
atoms.push_back({unit(rng), unit(rng), unit(rng), 10 + 50 * unit(rng), 0.5f + 0.5f * unit(rng), a % 3});
|
|
states.Add(atoms);
|
|
}
|
|
states.current = {0};
|
|
for (int c = 0; c < 69; c++)
|
|
states.AddCombo(c % 2 == 0 ? std::vector<int>{c} : std::vector<int>{c, c + 1});
|
|
|
|
auto cpu = MakeSideChainFieldEvaluatorCPU(fr, ops, elements, 4, false);
|
|
auto gpu = MakeSideChainFieldEvaluatorCPU(fr, ops, elements, 4, true);
|
|
const size_t before = SideChainFieldMetal::States();
|
|
size_t different = 0;
|
|
for (int s : {0, 33, 69}) {
|
|
const std::vector<std::complex<float>> c = cpu->Contribution(states, s), g = gpu->Contribution(states, s);
|
|
REQUIRE(c.size() == g.size());
|
|
for (size_t m = 0; m < c.size(); m++)
|
|
different += std::memcmp(&c[m], &g[m], sizeof(c[m])) != 0;
|
|
}
|
|
REQUIRE(SideChainFieldMetal::States() == before + 3); // the GPU summed them
|
|
CHECK(different == 0);
|
|
|
|
const std::vector<std::complex<float>> total = cpu->Contribution(states, 0);
|
|
cpu->SetTotal(total);
|
|
gpu->SetTotal(total);
|
|
const std::vector<double> ec = cpu->Evaluate(states), eg = gpu->Evaluate(states);
|
|
REQUIRE(SideChainFieldMetal::States() == before + 3 + 70);
|
|
CHECK(ec == eg);
|
|
}
|
|
|
|
#endif
|