detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2026-09-03 01:20:43 +02:00
Code Issues Actions Packages Releases Activity

released the GIL in parallel fits
Build on RHEL9 / build (push) Successful in 2m38s
Details
Build on RHEL8 / build (push) Successful in 3m5s
Details
Run tests using data on local RHEL8 / build (push) Successful in 4m4s
Details

Browse Source
This commit is contained in:
mazzol_a
2026-08-27 14:33:05 +02:00
parent ed6c7a17bb
commit 07c99e5485
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/fit.hpp
+22 -8
View File
@@ -211,9 +211,12 @@ fit_dispatch(const aare::FitModel<Model> &model,
new NDArray<double, 3>({y.shape(0), y.shape(1), npar}, 0.0);
auto y_view_err = make_view_3d(y_err);
aare::fit_3d<Model>(model, x_view, y_view, y_view_err,
par_out->view(), err_out->view(),
chi2_out->view(), n_threads);
{
py::gil_scoped_release release; // release GIL for parallel loop
aare::fit_3d<Model>(model, x_view, y_view, y_view_err,
par_out->view(), err_out->view(),
chi2_out->view(), n_threads);
}
if (model.compute_errors()) {
return py::dict("par"_a = return_image_data(par_out),
@@ -229,9 +232,12 @@ fit_dispatch(const aare::FitModel<Model> &model,
NDView<double, 3> dummy_err{};
NDView<double, 3> dummy_err_out{};
aare::fit_3d<Model>(model, x_view, y_view, dummy_err,
par_out->view(), dummy_err_out,
chi2_out->view(), n_threads);
{
py::gil_scoped_release release; // release GIL for parallel loop
aare::fit_3d<Model>(model, x_view, y_view, dummy_err,
par_out->view(), dummy_err_out,
chi2_out->view(), n_threads);
}
return py::dict("par"_a = return_image_data(par_out),
"chi2"_a = return_image_data(chi2_out));
@@ -253,9 +259,17 @@ fit_dispatch(const aare::FitModel<Model> &model,
}
auto y_view_err = make_view_1d(y_err);
result = aare::fit_pixel<Model>(model, x_view, y_view, y_view_err);
{
py::gil_scoped_release release; // release GIL for parallel loop
result =
aare::fit_pixel<Model>(model, x_view, y_view, y_view_err);
}
} else {
result = aare::fit_pixel<Model>(model, x_view, y_view);
{
py::gil_scoped_release
release; // release GIL for parallel loop}
result = aare::fit_pixel<Model>(model, x_view, y_view);
}
}
return pack_1d_result_dict<Model>(result, model.compute_errors());