kernels: name compilation entries by storage route (uniform.cu, blocked.cu)
kernel_v2.cu -> uniform.cu (whole-domain NX/NY, Simulation) and
blocks.cu -> blocked.cu (one block window, every blocked level), with
InitTubeFlow_v2 -> InitTubeFlow. All live callers, include comments,
CONFIG.md, lifecycle doc and current-tree tests move together; no alias.
refinement.cu keeps its name until the dense-route decision.
Historical-revision tooling that names the old files (LES source pins,
timing/J campaign runners, TG run_case, supported_settings citations at
888c8038, development notes) is unchanged on purpose.
No arithmetic change; the PTX symbol InitTubeFlow_v2 is renamed.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
dbcdb87081
commit
2b3c2a7529
26 files changed
+34
-34
No files matched your search
@@ -13,7 +13,7 @@ from ._cases import make_sim
|
||||
def test_source_provenance():
|
||||
root = Path(__file__).resolve().parents[2] / "src/CelerisLab"
|
||||
assert Path(CelerisLab.__file__).resolve().parent == root
|
||||
assert Path(compiler_v2.kernel_path("kernel_v2.cu")).resolve() == root / "lbm/kernels/kernel_v2.cu"
|
||||
assert Path(compiler_v2.kernel_path("uniform.cu")).resolve() == root / "lbm/kernels/uniform.cu"
|
||||
|
||||
|
||||
def test_two_contexts_interleaved_and_non_lifo_close():
|
||||
|
||||
@@ -168,7 +168,7 @@ class BuildContracts(unittest.TestCase):
|
||||
with self.assertRaises(subprocess.CalledProcessError):
|
||||
compiler.compile_kernel(build_dir=build)
|
||||
self.assertEqual(Path(previous).read_bytes(), old_bytes)
|
||||
self.assertEqual(sorted(Path(build).glob("kernel_v2-*.ptx")), []) # no partial output
|
||||
self.assertEqual(sorted(Path(build).glob("uniform-*.ptx")), []) # no partial output
|
||||
compiler.cleanup_build_dir(build)
|
||||
|
||||
|
||||
|
||||
@@ -135,6 +135,6 @@ def test_d2_entrypoint_compiles_in_isolation(tmp_path, model, shift, storage):
|
||||
source=re.sub(r"(#define\s+"+key+r"\s+)\S+",lambda match: match[1]+str(value),source)
|
||||
path.write_text(source)
|
||||
result=subprocess.run([nvcc,"-ptx","-arch=sm_70","-std=c++17",
|
||||
str(copy/"kernel_v2.cu"),"-o",str(tmp_path/"kernel.ptx")],
|
||||
str(copy/"uniform.cu"),"-o",str(tmp_path/"kernel.ptx")],
|
||||
capture_output=True,text=True)
|
||||
assert result.returncode == 0, result.stderr
|
||||
@@ -18,7 +18,7 @@ from .test_state_regressions import device, make_field, manager
|
||||
def test_planar_helper_moments_and_known_populations(tmp_path):
|
||||
root = Path(__file__).resolve().parents[2]
|
||||
assert Path(CelerisLab.__file__).resolve() == root/'src/CelerisLab/__init__.py'
|
||||
assert Path(compiler.kernel_path('kernel_v2.cu')).resolve() == root/'src/CelerisLab/lbm/kernels/kernel_v2.cu'
|
||||
assert Path(compiler.kernel_path('uniform.cu')).resolve() == root/'src/CelerisLab/lbm/kernels/uniform.cu'
|
||||
lines = compile_run(tmp_path, 'planar_velocity.cpp', dict(WALL_NORMAL_VELOCITY='0.0f'))
|
||||
cx = np.array([0,1,-1,0,0,1,-1,1,-1])
|
||||
cy = np.array([0,0,0,1,-1,1,-1,-1,1])
|
||||
|
||||
@@ -22,7 +22,7 @@ class RefinementMRTHost(unittest.TestCase):
|
||||
|
||||
def test_srt_statements_and_guards_preserved(self):
|
||||
"""MRT is an additive compile-time branch; SRT statements and other guards remain."""
|
||||
blocks = (KERNELS / "blocks.cu").read_text() + (KERNELS / "step/block_step.cu").read_text()
|
||||
blocks = (KERNELS / "blocked.cu").read_text() + (KERNELS / "step/block_step.cu").read_text()
|
||||
channel = (KERNELS / "step/block_channel.cu").read_text()
|
||||
block_collision = (KERNELS / "operators/block_collision.cuh").read_text()
|
||||
self.assertIn('#include "operators/block_collision.cuh"', blocks)
|
||||
|
||||
@@ -30,7 +30,7 @@ original_module = gate.compile_module
|
||||
cache = {}
|
||||
def retain_compile(*args, **kwargs):
|
||||
result = original_compile(*args, **kwargs)
|
||||
source = kwargs.get('source', 'kernel_v2.cu')
|
||||
source = kwargs.get('source', 'uniform.cu')
|
||||
shutil.copyfile(result, a.output / (Path(source).stem + '.ptx'))
|
||||
metadata = Path(result + '.json')
|
||||
if metadata.exists(): shutil.copyfile(metadata, a.output / (Path(source).stem + '.ptx.json'))
|
||||
|
||||
@@ -171,7 +171,7 @@ class CpuContracts(unittest.TestCase):
|
||||
patch.object(cuda, "mem_alloc") as alloc, patch.object(cuda, "memcpy_htod") as upload:
|
||||
with self.assertRaisesRegex(RuntimeError, "layout mismatch"):
|
||||
PeriodicBlockStepper(config(), layout, context=context)
|
||||
self.assertEqual(compile_kernel.call_args.kwargs["source"], "blocks.cu")
|
||||
self.assertEqual(compile_kernel.call_args.kwargs["source"], "blocked.cu")
|
||||
alloc.assert_not_called()
|
||||
upload.assert_not_called()
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ def state(ny, nx):
|
||||
|
||||
def compile_module(cfg, context, source):
|
||||
cfg.validate()
|
||||
build = compiler.generate_config(cfg, block_root_bc=2 if source == "blocks.cu" else 0)
|
||||
build = compiler.generate_config(cfg, block_root_bc=2 if source == "blocked.cu" else 0)
|
||||
try:
|
||||
module = compiler.load_module(compiler.compile_kernel(context.sm_arch, source=source, build_dir=build))
|
||||
finally:
|
||||
@@ -46,7 +46,7 @@ def run_root(cfg, context, initial, block=None, steps=8):
|
||||
try:
|
||||
layout = None if block is None else BlockLayout2D.build(cfg.ny, cfg.nx, *block)
|
||||
local = cfg if layout is None else replace(cfg, nx=layout.local_shape[1], ny=layout.local_shape[0])
|
||||
module = compile_module(local, context, "kernel_v2.cu" if layout is None else "blocks.cu")
|
||||
module = compile_module(local, context, "uniform.cu" if layout is None else "blocked.cu")
|
||||
data = initial if layout is None else layout.to_blocked(initial)
|
||||
current, spare = upload(data), upload(np.full_like(data, np.nan))
|
||||
tpb = cfg.threads_per_block
|
||||
|
||||
Reference in new issue
Block a user