detectors/aare
25
0 Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2026-10-31 21:51:28 +01:00
Code Issues Actions Packages Releases Activity

Port the frozen and CUDA finders to FastPedestal
Build on RHEL8 / build (push) Successful in 3m38s
Details
Build on RHEL9 / build (push) Successful in 3m49s
Details
Run tests using data on local RHEL8 / build (push) Successful in 4m46s
Details

Browse Source 
- main moved ClusterFinder to FastPedestal and dropped Pedestal's
  push_fast/get_sum/get_sum2, which ClusterFinderFrozen and both CUDA
  drivers still called.

- Move all three to FastPedestal. Its uniform sample count is what the
  CUDA kernel already assumes, and matching ClusterFinder keeps CPU and
  GPU warm-up identical, which ClusterFinderFrozen exists to verify.
  FastPedestal gains get_sum/get_sum2 to de-interleave its internal
  Entry{sum,sum2} for the CUDA upload.

- Also expose min_pedestal_samples on these constructors and factories,
  make the factories keyword-only after image_size. Same API in C++ and Python.
This commit is contained in:
kferjaoui committed 2026-09-23 15:54:16 +02:00
1 parent 7a8f918a56
commit d9bead2a07
10 files changed
+128 -47
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

python/src/bind_ClusterFinderCUDA.hpp
+3 -2
View File
@@ -2,8 +2,8 @@
#pragma once
#include "aare/ClusterFinderCUDA.hpp"
#include "aare/ClusterVector.hpp"
#include "aare/FastPedestal.hpp"
#include "aare/NDView.hpp"
#include "aare/Pedestal.hpp"
#include "np_helper.hpp"
#include <cstdint>
@@ -112,9 +112,10 @@ void define_ClusterFinderCUDA(py::module &m, const std::string &typestr) {
coordinates as (x, y).)");
py::class_<CF>(m, class_name.c_str())
.def(py::init<Shape<2>, float, size_t, int, bool>(),
.def(py::init<Shape<2>, float, size_t, int, size_t, bool>(),
py::arg("image_size"), py::arg("n_sigma") = 5.0f,
py::arg("max_clusters_per_frame") = 2048, py::arg("n_streams") = 4,
py::arg("min_pedestal_samples") = 1000,
py::arg("time_kernels") = false)
.def_property(
python/src/bind_ClusterFinderCUDAGraph.hpp
+5 -4
View File
@@ -2,8 +2,8 @@
#pragma once
#include "aare/ClusterFinderCUDA_graph.hpp"
#include "aare/ClusterVector.hpp"
#include "aare/FastPedestal.hpp"
#include "aare/NDView.hpp"
#include "aare/Pedestal.hpp"
#include "np_helper.hpp"
#include <cstdint>
@@ -31,9 +31,10 @@ void define_ClusterFinderCUDAGraph(py::module &m, const std::string &typestr) {
py::array_t<uint16_t, py::array::c_style | py::array::forcecast>;
py::class_<CF>(m, class_name.c_str())
.def(py::init<Shape<2>, float, size_t, int>(), py::arg("image_size"),
py::arg("n_sigma") = 5.0f,
py::arg("max_clusters_per_frame") = 2048, py::arg("n_streams") = 4)
.def(py::init<Shape<2>, float, size_t, int, size_t>(),
py::arg("image_size"), py::arg("n_sigma") = 5.0f,
py::arg("max_clusters_per_frame") = 2048, py::arg("n_streams") = 4,
py::arg("min_pedestal_samples") = 1000)
.def_property(
"nSigma", &CF::get_nSigma, &CF::set_nSigma,
python/src/bind_ClusterFinderFrozen.hpp
+4 -2
View File
@@ -27,8 +27,10 @@ void define_ClusterFinderFrozen(py::module &m, const std::string &typestr) {
py::class_<ClusterFinderFrozen<ClusterType, uint16_t, pd_type>>(
m, class_name.c_str())
.def(py::init<Shape<2>, pd_type, size_t>(), py::arg("image_size"),
py::arg("n_sigma") = 5.0, py::arg("capacity") = 1'000'000)
.def(py::init<Shape<2>, pd_type, size_t, size_t>(),
py::arg("image_size"), py::arg("n_sigma") = 5.0,
py::arg("capacity") = 1'000'000,
py::arg("min_pedestal_samples") = 1000)
.def_property(
"nSigma",
python/tests/ClusterFinderCUDA.ipynb
+23 -12
View File
@@ -88,7 +88,7 @@
"# reached, which is how you size this for a new dataset.\n",
"CAP = 3000\n",
"\n",
"capacity = 10_000 # initial ClusterVector capacity, CPU side\n",
"capacity = 3_000 # initial ClusterVector capacity, CPU side\n",
"N_BINS = 200\n",
"E_MIN, E_MAX = -2, 4000 # spectrum range, ADU\n",
"\n",
@@ -113,12 +113,12 @@
"outputs": [],
"source": [
"cf_cpu = ClusterFinderMT(image_size, cluster_size, n_sigma=N_SIGMA,\n",
" capacity=capacity, n_threads=N_THREADS)\n",
" capacity=capacity, min_pedestal_samples=n_frames_pd, n_threads=N_THREADS)\n",
"sink = ClusterCollector(cf_cpu)\n",
"\n",
"cf_cuda = ClusterFinderCUDA(image_size, cluster_size, n_sigma=N_SIGMA,\n",
" max_clusters_per_frame=CAP, n_streams=N_STREAMS, \n",
" time_kernels=False, algorithm=\"fixed_window\")"
" n_pedestal_frames=n_frames_pd, algorithm=\"fixed_window\", time_kernels=False)"
]
},
{
@@ -175,7 +175,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Reading 100000 frames: 82.39s (1,214 FPS, 32.00 GB at 0.39 GB/s)\n"
"Reading 100000 frames: 5.20s (19,219 FPS, 32.00 GB at 6.15 GB/s)\n"
]
}
],
@@ -207,14 +207,14 @@
"name": "stderr",
"output_type": "stream",
"text": [
"100%|██████████████████████████████████████████████████| 100000/100000 [00:23<00:00, 4191.14it/s]\n"
"100%|██████████████████████████████████████████████████████████████| 100000/100000 [00:23<00:00, 4310.91it/s]\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"CPU MT (24 threads): 23.86s 4,190 FPS 233,099,227 clusters (2331.0/frame)\n"
"CPU MT (24 threads): 23.20s 4,310 FPS 233,099,227 clusters (2331.0/frame)\n"
]
}
],
@@ -253,10 +253,21 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 7,
"id": "cuda",
"metadata": {},
"outputs": [],
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"CUDA batched: 3.18s 31,484 FPS 233,093,554 clusters (2330.9/frame)\n",
" input pinned in 0.84s, once, outside the loop\n",
" vs CPU: 7.30x\n",
" peak clusters in one frame: 2,545 of CAP 3,000\n"
]
}
],
"source": [
"t0 = time.perf_counter()\n",
"cf_cuda.register_input_buffer(data)\n",
@@ -309,10 +320,10 @@
"output_type": "stream",
"text": [
" s FPS us/frame clusters\n",
"CPU MT (24 thr) 23.86 4,190 238.6 233,099,227\n",
"CUDA batched 3.34 29,926 33.4 233,093,554\n",
"CPU MT (24 thr) 23.20 4,310 232.0 233,099,227\n",
"CUDA batched 3.18 31,484 31.8 233,093,554\n",
"\n",
"speedup: 7.14x\n"
"speedup: 7.30x\n"
]
}
],
@@ -429,7 +440,7 @@
" genuine add / drop 31,395 25,871\n",
"\n",
"frames touched by a genuine difference: 41,569 of 100,000\n",
"[40.6s]\n"
"[40.2s]\n"
]
}
],