Build Packages / Create release (push) Successful in 8s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 5m11s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 10m32s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 18m26s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 22m11s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 23m32s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 25m36s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 27m28s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 28m10s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 28m10s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 29m24s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 21m45s
Build Packages / Generate python client (push) Successful in 31s
Build Packages / Build documentation (push) Successful in 1m21s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 24m2s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 29m25s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 30m27s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 27m12s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 32m20s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 33m36s
Build Packages / Unit tests (push) Successful in 2h7m18s
Build Packages / Validation Battery (push) Successful in 33m19s
* Rugnux: Stills processing needs only the unit cell and space group beyond what the file records - detector distance, beam centre, tilt, panel placement, saturation level, gain and polarisation plane are found from the images - and is up to twice as fast. * Rugnux: Stills can be indexed without a GPU, with a CPU implementation of the fast-feedback indexer (macOS, computers without a GPU). * Rugnux: Rotation and stills data are integrated in the detector's own units with one gain model, improving data from CCD detectors. * Web frontend: The Rugnux live page shows the placed model with its electron density and anomalous difference map in a Mol* viewer. Reviewed-on: #90 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
137 lines
5.2 KiB
C++
137 lines
5.2 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>
|
|
#include "../common/CUDAWrapper.h"
|
|
|
|
#ifdef JFJOCH_USE_CUDA
|
|
|
|
#include <map>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "../image_analysis/roi/ROIIntegrationCPU.h"
|
|
#include "../image_analysis/roi/ROIIntegrationGPU.h"
|
|
#include "../image_analysis/image_preprocessing/ImagePreprocessorBufferGPU.h"
|
|
#include "../common/DiffractionExperiment.h"
|
|
|
|
namespace {
|
|
DiffractionExperiment make_roi_experiment() {
|
|
DiffractionExperiment experiment(DetJF(1));
|
|
// Overlapping boxes so some pixels belong to several ROIs at once (multi-bit
|
|
// mask), exercising the per-bit accumulation that has to match between CPU and GPU.
|
|
// ROIBox is (name, x_min, x_max, y_min, y_max), kept within the JF module bounds.
|
|
experiment.ROI().SetROI(ROIDefinition{.boxes = {
|
|
ROIBox("roiA", 10, 210, 20, 220),
|
|
ROIBox("roiB", 100, 300, 100, 300),
|
|
ROIBox("roiC", 0, 150, 0, 150),
|
|
ROIBox("roiD", 50, 250, 50, 250),
|
|
}});
|
|
return experiment;
|
|
}
|
|
|
|
void compare_results(const std::map<std::string, ROIMessage> &cpu,
|
|
const std::map<std::string, ROIMessage> &gpu) {
|
|
REQUIRE(cpu.size() == gpu.size());
|
|
for (const auto &[name, c] : cpu) {
|
|
INFO("ROI " << name);
|
|
REQUIRE(gpu.contains(name));
|
|
const auto &g = gpu.at(name);
|
|
CHECK(g.sum == c.sum);
|
|
CHECK(g.sum_square == c.sum_square);
|
|
CHECK(g.max_count == c.max_count);
|
|
CHECK(g.pixels == c.pixels);
|
|
CHECK(g.x_weighted == c.x_weighted);
|
|
CHECK(g.y_weighted == c.y_weighted);
|
|
CHECK(g.pixels_masked == c.pixels_masked);
|
|
}
|
|
}
|
|
|
|
void run_and_compare(const DiffractionExperiment &experiment) {
|
|
const auto roi_map = experiment.ExportROIMap();
|
|
const size_t npixel = roi_map.size();
|
|
const uint16_t roi_count = experiment.ROI().size();
|
|
REQUIRE(roi_count > 0);
|
|
|
|
// Deterministic image with both positive and negative values; negatives exercise
|
|
// the signed weighted-sum path (val * x can be negative).
|
|
std::vector<int32_t> values(npixel);
|
|
for (size_t i = 0; i < npixel; i++)
|
|
values[i] = static_cast<int32_t>((i * 2654435761u) % 1000) - 500;
|
|
|
|
// Inject one saturated (INT32_MAX) and one masked (INT32_MIN) pixel into every ROI
|
|
// so both the "max only, not summed" and "fully excluded" branches are covered.
|
|
for (uint16_t r = 0; r < roi_count; r++) {
|
|
bool injected_sat = false, injected_mask = false;
|
|
for (size_t i = 0; i < npixel && !(injected_sat && injected_mask); i++) {
|
|
if (!(roi_map[i] & (1u << r)))
|
|
continue;
|
|
if (!injected_sat) { values[i] = INT32_MAX; injected_sat = true; }
|
|
else if (!injected_mask) { values[i] = INT32_MIN; injected_mask = true; }
|
|
}
|
|
REQUIRE(injected_sat);
|
|
REQUIRE(injected_mask);
|
|
}
|
|
|
|
// CPU reference
|
|
ImagePreprocessorBuffer cpu_image(npixel);
|
|
for (size_t i = 0; i < npixel; i++)
|
|
cpu_image[i] = values[i];
|
|
|
|
ROIIntegrationCPU cpu(experiment);
|
|
std::map<std::string, ROIMessage> out_cpu;
|
|
cpu.Run(cpu_image, out_cpu);
|
|
|
|
// GPU under test — identical input uploaded to the device
|
|
auto stream = std::make_shared<CudaStream>();
|
|
ImagePreprocessorBufferGPU gpu_image(npixel);
|
|
for (size_t i = 0; i < npixel; i++)
|
|
gpu_image[i] = values[i];
|
|
|
|
REQUIRE(cudaMemcpyAsync(gpu_image.getGPUBuffer(),
|
|
gpu_image.getBuffer().data(),
|
|
npixel * sizeof(int32_t),
|
|
cudaMemcpyHostToDevice,
|
|
*stream) == cudaSuccess);
|
|
|
|
ROIIntegrationGPU gpu(experiment, stream);
|
|
std::map<std::string, ROIMessage> out_gpu;
|
|
gpu.Run(gpu_image, out_gpu);
|
|
|
|
compare_results(out_cpu, out_gpu);
|
|
}
|
|
} // namespace
|
|
|
|
// The GPU kernel reduces with atomics and two's-complement unsigned accumulators,
|
|
// while the CPU path is a plain serial loop. On identical input every per-ROI
|
|
// statistic must be bit-for-bit identical, so we run both and compare.
|
|
TEST_CASE("ROIIntegrationGPU_MatchesCPU") {
|
|
if (get_gpu_count() == 0) {
|
|
WARN("No CUDA GPU present. Skipping ROIIntegrationGPU_MatchesCPU");
|
|
return;
|
|
}
|
|
run_and_compare(make_roi_experiment());
|
|
}
|
|
|
|
// The same with a panel table: the centre of mass is summed per panel and placed on the plane. Two panels
|
|
// stacked in the image, the second turned by 180 degrees and moved by a fraction of a pixel; a strip of
|
|
// rows below them is on no panel.
|
|
TEST_CASE("ROIIntegrationGPU_MatchesCPU_Panels") {
|
|
if (get_gpu_count() == 0) {
|
|
WARN("No CUDA GPU present. Skipping ROIIntegrationGPU_MatchesCPU_Panels");
|
|
return;
|
|
}
|
|
DetectorModule a = DetectorModule::AsImaged(0, 0, 256, 128);
|
|
DetectorModule b = DetectorModule::AsImaged(0, 128, 256, 128);
|
|
b.ox = 300.25; b.oy = 400.5; b.fx = -1; b.sy = -1;
|
|
DiffractionExperiment experiment(DetDECTRIS(256, 300, "panels", ""));
|
|
experiment.Modules(DetectorModules({a, b}));
|
|
experiment.ROI().SetROI(ROIDefinition{.boxes = {
|
|
ROIBox("roiA", 10, 210, 20, 220),
|
|
ROIBox("roiB", 0, 255, 0, 299),
|
|
}});
|
|
run_and_compare(experiment);
|
|
}
|
|
|
|
#endif
|