rustyverse/rustytorch
2
0
Fork 0
Code Issues Pull Requests Actions 22 Packages Projects Releases Wiki Activity

embedded3 PERF-3 P1-3 (f): the mask build's whole-grid scans as parallel per-entry maps (cell classification with the anchor as the smallest fluid index, the three face-kind tables, the merging scan's small flags, the centroid-shift table per face) — slab flag ny 62 CSV byte-identical, device moving/cg green; ny 124 rebuild block 2,680 → 2,569 ms per step (build_mask 409 → 309)
CI / Build (macos-latest) (push) Waiting to run
Details
CI / Test (macos-latest) (push) Blocked by required conditions
Details
CI / Test (ubuntu-latest) (push) Blocked by required conditions
Details
CI / Python Bindings (maturin) (macos-latest) (push) Blocked by required conditions
Details
CI / Python Bindings (maturin) (ubuntu-latest) (push) Blocked by required conditions
Details
CI / WASM Build + Size Check (push) Blocked by required conditions
Details
CI / Distributed Training Tests (push) Blocked by required conditions
Details
CI / CI Success (push) Blocked by required conditions
Details
CI / Build CPU-Only (Explicit) (push) Failing after 4s
Details
Documentation / Build API Documentation (push) Failing after 5s
Details
Documentation / Build User Guide (push) Successful in 4s
Details
CI / Format Check (push) Failing after 14s
Details
CI / Clippy Check (push) Failing after 54s
Details
CI / Build (ubuntu-latest) (push) Failing after 1m44s
Details
Performance Benchmarks / Run Benchmarks (push) Successful in 2m4s
Details

Browse Source 
Co-Authored-By: Claude Fable 5.1 <[email protected]>
This commit is contained in:
Omar Sobh
2026-09-20 12:31:00 -05:00
co-authored by Claude Fable 5.1
parent 5a376630a7
commit 44caeb8110
2 changed files with 83 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/specialized/rtx-cfd/src/solvers/incompressible/embedded3/closure.rs
+30 -34
View File
@@ -48,42 +48,38 @@ impl Mask {
vec![0.0; 3 * sizes[1]],
vec![0.0; 3 * sizes[2]],
];
// P1-3 (f): per face in parallel (each entry from its own geometry).
use rayon::prelude::*;
for c in 0..3 {
let (ni, nj, nk) = (
g.nx + usize::from(c == 0),
g.ny + usize::from(c == 1),
g.nz + usize::from(c == 2),
);
for k in 0..nk {
for j in 0..nj {
for i in 0..ni {
let p = [i as i64, j as i64, k as i64];
let Some(f) = lat.face(c, p) else { continue };
let Some(alpha) = self.aperture(c, p) else {
continue;
};
if alpha <= 0.0 || alpha >= 1.0 {
continue;
}
// Interior faces only (a control volume needs both cells).
let on_side = p[c] == 0 || p[c] as usize == [g.nx, g.ny, g.nz][c];
if on_side && !(c == 2 && self.periodic_z) {
continue;
}
let cv = self.cv_geometry(c, p);
let mut n = cv.wall;
n[c] = 0.0;
let a = (n[0] * n[0] + n[1] * n[1] + n[2] * n[2]).sqrt();
if a == 0.0 {
continue;
}
for d in 0..3 {
// `wall` points into the body: the open part lies the other way.
tables[c][3 * f + d] = -0.5 * h[d] * (1.0 - alpha) * n[d] / a;
}
let (ni, nj) = (g.nx + usize::from(c == 0), g.ny + usize::from(c == 1));
tables[c]
.par_chunks_mut(3)
.enumerate()
.for_each(|(f, out)| {
let (k, j, i) = (f / (nj * ni), (f / ni) % nj, f % ni);
let p = [i as i64, j as i64, k as i64];
debug_assert_eq!(lat.face(c, p), Some(f));
let Some(alpha) = self.aperture(c, p) else { return };
if alpha <= 0.0 || alpha >= 1.0 {
return;
}
}
}
// Interior faces only (a control volume needs both cells).
let on_side = p[c] == 0 || p[c] as usize == [g.nx, g.ny, g.nz][c];
if on_side && !(c == 2 && self.periodic_z) {
return;
}
let cv = self.cv_geometry(c, p);
let mut n = cv.wall;
n[c] = 0.0;
let a = (n[0] * n[0] + n[1] * n[1] + n[2] * n[2]).sqrt();
if a == 0.0 {
return;
}
for d in 0..3 {
// `wall` points into the body: the open part lies the other way.
out[d] = -0.5 * h[d] * (1.0 - alpha) * n[d] / a;
}
});
}
self.face_shifts = Some(tables);
}
crates/specialized/rtx-cfd/src/solvers/incompressible/embedded3/cutwall.rs
+53 -57
View File
@@ -128,35 +128,31 @@ impl Mask {
let (nx, ny, nz) = (g.nx, g.ny, g.nz);
let periodic = b.z0 == Side::Periodic;
let allowed = |side: Side| matches!(side, Side::Velocity | Side::Periodic | Side::SlipWall);
let mut cell_fluid = vec![true; g.cells()];
let mut fluid_cells = 0;
let mut anchor = None;
for k in 0..nz {
for j in 0..ny {
for i in 0..nx {
let idx = g.cell(k, j, i);
let fluid = cut.vol[idx] > 0.0;
cell_fluid[idx] = fluid;
if fluid {
fluid_cells += 1;
if anchor.is_none() {
anchor = Some(idx);
}
} else {
let touches = (i == 0 && !allowed(b.x0))
|| (i + 1 == nx && !allowed(b.x1))
|| (j == 0 && !allowed(b.y0))
|| (j + 1 == ny && !allowed(b.y1))
|| (k == 0 && !allowed(b.z0))
|| (k + 1 == nz && !allowed(b.z1));
if touches {
return Err(format!(
"embedded body reaches a domain side that is not a Velocity/Periodic side at cell ({k}, {j}, {i})"
));
}
}
}
// P1-3 (f): the whole-grid classifications as parallel per-entry
// maps (the same values; the anchor is the smallest fluid index, the
// serial loop's first).
use rayon::prelude::*;
let nxy = nx * ny;
let cell_fluid: Vec<bool> = cut.vol.par_iter().map(|&v| v > 0.0).collect();
let fluid_cells = cell_fluid.par_iter().filter(|&&f| f).count();
let anchor = (0..g.cells()).into_par_iter().find_first(|&idx| cell_fluid[idx]);
let touching = (0..g.cells()).into_par_iter().find_first(|&idx| {
if cell_fluid[idx] {
return false;
}
let (k, j, i) = (idx / nxy, (idx % nxy) / nx, idx % nx);
(i == 0 && !allowed(b.x0))
|| (i + 1 == nx && !allowed(b.x1))
|| (j == 0 && !allowed(b.y0))
|| (j + 1 == ny && !allowed(b.y1))
|| (k == 0 && !allowed(b.z0))
|| (k + 1 == nz && !allowed(b.z1))
});
if let Some(idx) = touching {
let (k, j, i) = (idx / nxy, (idx % nxy) / nx, idx % nx);
return Err(format!(
"embedded body reaches a domain side that is not a Velocity/Periodic side at cell ({k}, {j}, {i})"
));
}
let Some(anchor) = anchor else {
return Err("embedded body covers the whole domain".into());
@@ -168,32 +164,28 @@ impl Mask {
FaceKind::Solid
}
};
let mut u_kind = vec![FaceKind::Fluid; g.n_ufaces()];
let mut v_kind = vec![FaceKind::Fluid; g.n_vfaces()];
let mut w_kind = vec![FaceKind::Fluid; g.n_wfaces()];
for k in 0..nz {
for j in 0..ny {
for i in 1..nx {
let f = g.uface(k, j, i);
u_kind[f] = kind(cut.a_u[f]);
}
}
for j in 1..ny {
for i in 0..nx {
let f = g.vface(k, j, i);
v_kind[f] = kind(cut.a_v[f]);
}
}
}
let w_range = if periodic { 0..nz + 1 } else { 1..nz };
for k in w_range {
for j in 0..ny {
for i in 0..nx {
let f = g.wface(k, j, i);
w_kind[f] = kind(cut.a_w[f]);
}
}
}
// Domain-side faces keep `Fluid` (the serial loops skipped them).
let u_kind: Vec<FaceKind> = (0..g.n_ufaces())
.into_par_iter()
.map(|f| {
let i = f % (nx + 1);
if i == 0 || i == nx { FaceKind::Fluid } else { kind(cut.a_u[f]) }
})
.collect();
let v_kind: Vec<FaceKind> = (0..g.n_vfaces())
.into_par_iter()
.map(|f| {
let j = (f / nx) % (ny + 1);
if j == 0 || j == ny { FaceKind::Fluid } else { kind(cut.a_v[f]) }
})
.collect();
let w_kind: Vec<FaceKind> = (0..g.n_wfaces())
.into_par_iter()
.map(|f| {
let k = f / nxy;
if !periodic && (k == 0 || k == nz) { FaceKind::Fluid } else { kind(cut.a_w[f]) }
})
.collect();
let mut mask = Self {
grid: g,
periodic_z: periodic,
@@ -254,9 +246,13 @@ impl Mask {
.ok()
.and_then(|v| v.parse().ok())
.unwrap_or(MERGE_FRACTION);
let small: Vec<bool> = (0..n)
.map(|idx| self.cell_active(idx) && frac(idx) < threshold)
.collect();
let small: Vec<bool> = {
use rayon::prelude::*;
(0..n)
.into_par_iter()
.map(|idx| self.cell_active(idx) && frac(idx) < threshold)
.collect()
};
let mut master = vec![usize::MAX; n];
for idx in (0..n).filter(|&i| small[i]) {
let (k, j, i) = g.kji(idx);