From 001e61c1a4ba86e73965df5460c926b9b89be204 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Sun, 25 Oct 2026 13:33:12 +0100 Subject: [PATCH] Refinement: the repulsion search on the refinement's threads, hydrogens skipped before the neighbour walk BuildRepulsions walked the neighbours of every atom and only then dropped the pairs of a riding hydrogen; those atoms are now skipped before the walk. The atoms are searched in 64 blocks under ParallelFor and the blocks' pairs joined in atom order, so the restraint list is the same as before for any thread count. The model is no longer copied for the NeighborSearch. Same bits. 9yl4: repulsions 3.37 -> 1.09 s (91 calls), refinement 17.7 -> 14.2 s; 5reo 0.38 -> 0.12 s (RTX 5080, -N 8, loaded box). Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_015CeEGgpKdfkCTJb3YNMJcu (cherry picked from commit ded11388a18f5a4138a73150c4bb073570152727) (cherry picked from commit 9c96836a90c9f170008d343af2cd885a4e59b321) --- .../structure_refinement/Refinement.cpp | 6 +- .../RefinementRestraints.cpp | 123 ++++++++++-------- .../RefinementRestraints.h | 7 +- 3 files changed, 74 insertions(+), 62 deletions(-) diff --git a/image_analysis/structure_refinement/Refinement.cpp b/image_analysis/structure_refinement/Refinement.cpp index 070c38d85..93d5383c1 100644 --- a/image_analysis/structure_refinement/Refinement.cpp +++ b/image_analysis/structure_refinement/Refinement.cpp @@ -729,7 +729,7 @@ RefinementResult RefineModel(const gemmi::Structure &placed, const std::vectorSetRestraints(0, set); - RestraintSet repulsions = BuildRepulsions(topo, ctx.Model(), cell, sg, 0.0); + RestraintSet repulsions = BuildRepulsions(topo, ctx.Model(), cell, sg, 0.0, ctx.nthreads); result.geometry_start = MeasureGeometry(topo.geometry, repulsions, ctx.XyzB()); } double w0 = 0; @@ -783,7 +783,7 @@ RefinementResult RefineModel(const gemmi::Structure &placed, const std::vector> first(copy.chains.size()); + std::vector> first(model.chains.size()); std::vector pos; - for (size_t c = 0; c < copy.chains.size(); c++) - for (const gemmi::Residue &r : copy.chains[c].residues) { + for (size_t c = 0; c < model.chains.size(); c++) + for (const gemmi::Residue &r : model.chains[c].residues) { first[c].push_back(static_cast(pos.size())); for (const gemmi::Atom &a : r.atoms) pos.push_back(a.pos); } - for (size_t i = 0; i < pos.size(); i++) { - const gemmi::Fractional fi = cell.fractionalize(pos[i]); - ns.for_each(pos[i], '\0', reach, [&](gemmi::NeighborSearch::Mark &m, double) { - const int j = first[m.chain_idx][m.residue_idx] + m.atom_idx; - if (topo.rider_parent[i] >= 0 || topo.rider_parent[j] >= 0 || topo.element[i] == gemmi::El::H || - topo.element[j] == gemmi::El::H) - return; - if (!topo.refinable[i] && !topo.refinable[j]) - return; - if (m.image_idx == 0 && (static_cast(i) >= j || - std::binary_search(topo.excluded[i].begin(), topo.excluded[i].end(), j))) - return; - if (m.image_idx != 0 && static_cast(i) > j) - return; - if (topo.altloc[i] && topo.altloc[j] && topo.altloc[i] != topo.altloc[j]) - return; - // The image of j nearest to i, as a Cartesian x -> R x + t. - const gemmi::FTransform ft = ns.get_image_transformation(m.image_idx); - const gemmi::Fractional fj = ft.apply(cell.fractionalize(pos[j])); - const gemmi::Vec3 shift(std::round(fi.x - fj.x), std::round(fi.y - fj.y), std::round(fi.z - fj.z)); - if (m.image_idx == 0 && (shift.x != 0 || shift.y != 0 || shift.z != 0)) - return; // the same copy's own lattice translate: the identity term covers the contact - const gemmi::Mat33 rot = cell.orth.mat.multiply(ft.mat).multiply(cell.frac.mat); - const gemmi::Vec3 tran = cell.orth.mat.multiply(ft.vec + shift); - const gemmi::Position image(rot.multiply(pos[j]) + tran); - const double d = pos[i].dist(image); + // The atoms in blocks searched on the threads, each block's pairs listed in atom order; the blocks are + // joined in order below, so the list is the same for any number of threads. + constexpr int BLOCKS = 64; + std::vector> found(BLOCKS); + ParallelFor(BLOCKS, nthreads, [&](int block) { + const size_t lo = pos.size() * block / BLOCKS, hi = pos.size() * (block + 1) / BLOCKS; + for (size_t i = lo; i < hi; i++) { + if (topo.rider_parent[i] >= 0 || topo.element[i] == gemmi::El::H) + continue; + const gemmi::Fractional fi = cell.fractionalize(pos[i]); + ns.for_each(pos[i], '\0', reach, [&](gemmi::NeighborSearch::Mark &m, double) { + const int j = first[m.chain_idx][m.residue_idx] + m.atom_idx; + if (topo.rider_parent[j] >= 0 || topo.element[j] == gemmi::El::H) + return; + if (!topo.refinable[i] && !topo.refinable[j]) + return; + if (m.image_idx == 0 && (static_cast(i) >= j || + std::binary_search(topo.excluded[i].begin(), topo.excluded[i].end(), j))) + return; + if (m.image_idx != 0 && static_cast(i) > j) + return; + if (topo.altloc[i] && topo.altloc[j] && topo.altloc[i] != topo.altloc[j]) + return; + // The image of j nearest to i, as a Cartesian x -> R x + t. + const gemmi::FTransform ft = ns.get_image_transformation(m.image_idx); + const gemmi::Fractional fj = ft.apply(cell.fractionalize(pos[j])); + const gemmi::Vec3 shift(std::round(fi.x - fj.x), std::round(fi.y - fj.y), std::round(fi.z - fj.z)); + if (m.image_idx == 0 && (shift.x != 0 || shift.y != 0 || shift.z != 0)) + return; // the same copy's own lattice translate: the identity term covers the contact + const gemmi::Mat33 rot = cell.orth.mat.multiply(ft.mat).multiply(cell.frac.mat); + const gemmi::Vec3 tran = cell.orth.mat.multiply(ft.vec + shift); + const gemmi::Position image(rot.multiply(pos[j]) + tran); + const double d = pos[i].dist(image); - float d0 = topo.vdw_radius[i] + topo.vdw_radius[j]; - if (topo.metal[i] || topo.metal[j]) { - const gemmi::El other = topo.element[topo.metal[i] ? j : static_cast(i)]; - if (other == gemmi::El::N || other == gemmi::El::O || other == gemmi::El::S) - d0 = METAL_CONTACT; - } else if (topo.hbond[i] && topo.hbond[j]) - d0 = HBOND_CONTACT; - if (!(d < d0 + margin)) - return; - RestraintRecord r; - r.kind = static_cast(RestraintKind::Repulsion); - r.atom[0] = static_cast(i); - r.atom[1] = j; - r.ideal = d0; - r.sigma = REPULSION_SIGMA; - for (int a = 0; a < 3; a++) { - for (int b = 0; b < 3; b++) - r.rot[3 * a + b] = static_cast(rot[a][b]); - r.tran[a] = static_cast(tran.at(a)); - } + float d0 = topo.vdw_radius[i] + topo.vdw_radius[j]; + if (topo.metal[i] || topo.metal[j]) { + const gemmi::El other = topo.element[topo.metal[i] ? j : static_cast(i)]; + if (other == gemmi::El::N || other == gemmi::El::O || other == gemmi::El::S) + d0 = METAL_CONTACT; + } else if (topo.hbond[i] && topo.hbond[j]) + d0 = HBOND_CONTACT; + if (!(d < d0 + margin)) + return; + RestraintRecord r; + r.kind = static_cast(RestraintKind::Repulsion); + r.atom[0] = static_cast(i); + r.atom[1] = j; + r.ideal = d0; + r.sigma = REPULSION_SIGMA; + for (int a = 0; a < 3; a++) { + for (int b = 0; b < 3; b++) + r.rot[3 * a + b] = static_cast(rot[a][b]); + r.tran[a] = static_cast(tran.at(a)); + } + found[block].push_back(r); + }); + } + }); + RestraintSet out; + for (const std::vector &records : found) + for (const RestraintRecord &r : records) out.Add(r, 2); - }); - } out.Finalize(pos.size()); return out; } diff --git a/image_analysis/structure_refinement/RefinementRestraints.h b/image_analysis/structure_refinement/RefinementRestraints.h index 64b2e2ce2..7617e9094 100644 --- a/image_analysis/structure_refinement/RefinementRestraints.h +++ b/image_analysis/structure_refinement/RefinementRestraints.h @@ -84,9 +84,10 @@ void PlaceRidingHydrogens(RefinementTopology &topo); // The repulsions of the model as it is now: every pair of atoms, symmetry mates included, closer than its // contact distance plus `margin` and not excluded, where at least one of the two is refinable and the two are // not alternative conformations of each other. Contact distances: van der Waals radii summed, 2.6 A where -// both can hydrogen-bond, 1.9 A between a metal and N, O or S. -RestraintSet BuildRepulsions(const RefinementTopology &topo, const gemmi::Model &model, const gemmi::UnitCell &cell, - const gemmi::SpaceGroup &sg, double margin); +// both can hydrogen-bond, 1.9 A between a metal and N, O or S. `model` is not changed (gemmi's NeighborSearch +// takes it non-const); the search runs on `nthreads` threads. +RestraintSet BuildRepulsions(const RefinementTopology &topo, gemmi::Model &model, const gemmi::UnitCell &cell, + const gemmi::SpaceGroup &sg, double margin, size_t nthreads = 1); // The usual summary of a model's geometry. struct GeometryStatistics {