Skip to content

GPU stack 6/8: marker rows prepared inside the push kernels - #787

Open
max-models wants to merge 8 commits into
gpu-stack-5-diffusion-solvefrom
gpu-stack-6-marker-layout
Open

max-models wants to merge 8 commits into
gpu-stack-5-diffusion-solvefrom
gpu-stack-6-marker-layout

Conversation

@max-models

@max-models max-models commented Oct 16, 2026 •

Copy link
Copy Markdown
Member

Part 6 of 8 of the split of #772 (cuda-aware-mpi-fixes) into stacked PRs. Requires struphy-hub/feectools#104 to be merged into feectools devel-tiny first (PR 1 bumps the submodule).

  • push_eta_stage and push_vxb_analytic prepare each marker themselves at stage 0 (MarkerArgs.prepare_rows): they copy the phase-space coordinates to the rows from first_pusher_idx and zero the rows after them, as prepare_push does. Pusher._push then skips the separate prepare_push launch when no init or evaluation kernel runs before them (those may read the prepared rows). The kernels cover the same markers, one thread per used marker (n_markers_used).
  • prepare_rows is a CUDA-only field of MarkerArgs. The CUDA emulation of the tests reads it with default 0.

Updated after #774 and #775 were merged into devel: on the original branch this PR also stored the marker buffer column-major on the GPU (order="F"). devel now stores it as (n_cols, n_markers) on both backends, so that part is gone. The row preparation is ported to markers(j, ip) indexing.

Tests

Local, macOS without a GPU, in a fresh environment with feectools 1d8d47c and the pinned cunumpy, after merging devel (with #774 and #775). The PR passes test_cuda_parity, test_cuda_emulation, test_kernel_backends, test_sorting, test_accum_matrix_cupy, test_preconditioner_cupy, test_poisson and test_output on its own. The top of the stack also passes the mass-matrix, preconditioner, Derham-GPU, fused-gradient, Kronecker-block, Poisson, shear Alfvén, post-processing, polar fake-CuPy and all pic tests (1477 passed), the examples test for the two profiling cases, the sorting, Poisson and fused-gradient tests under mpirun -n 2, and the device MPI sort on the fake CuPy on 2 and 4 ranks. The Kronecker products match the stencil mass matrices to 5e-16 for M0, M1, M2, M3, Mv, M1n and M2n on a Cuboid, periodic and Dirichlet, on 1 and 2 ranks.
Not tested on a GPU here. The CUDA kernels and the device paths need a run on the cluster.

Stack (merge in order)

  1. Device ghost-exchange plans, fused block exchanges, single-reduction PCG (CUDA-aware MPI) feectools#104 (feectools, into devel-tiny)
# PR base
1 #782 update feectools (device ghost exchange, single-reduction PCG); pcg_sr solver option devel
2 #783 host/device conversions in post-processing; math.sqrt in Species #782
3 #784 CUDA mass-matrix assembly kernel kernel_3d_mat #783
4 #785 apply separable mass matrices as Kronecker products of 1D banded matrices #784
5 #786 Poisson/diffusion solve with fewer passes over the vectors #785
6 #787 marker rows prepared inside the push kernels (this PR) #786
7 #788 chunked marker loading, row-based weight update, leaner MPI sorting; static field in PushVxB #787
8 #789 profiling cases Poisson cube and Vlasov slab (CPU node vs GPU, GPU scaling) #788

🤖 Generated with Claude Code

max-models and others added 2 commits October 16, 2026 10:26
…the push kernels

- Particles allocates the marker buffer column-major on the CuPy backend: kernels and the Python
  column operations access a few columns of many markers, so with a row-major buffer every access
  touched whole rows and the threads of a warp read addresses a row apart. The CUDA kernels
  address the buffer through its strides (Array2D<double> in MarkerArgs); NumPy keeps C order
  for the pyccel kernels.
- push_eta_stage and push_vxb_analytic prepare each marker row themselves at stage 0
  (MarkerArgs.prepare_rows), so Pusher._push skips the separate prepare_push pass when no init or
  evaluation kernel runs before them. prepare_push is launched on a 2D grid.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…repare_rows in the CUDA emulation

Kernels without a CUDA version run on host copies of the device arrays, which keep the F order
(cunumpy.to_numpy uses get(order='A')), and the pyccel kernels reject it: the sorting-box kernels
failed on the fake CuPy (test_sorting_boxes_on_cupy_fake_cupy), and the same holds on a GPU for every
marker kernel without a CUDA version. The buffer is therefore C-ordered unless the variable is set.

The CUDA emulation of the tests reads the struct fields from the pyccel argument objects, which do
not have the CUDA-only prepare_rows flag (every emulated marker kernel failed).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…k-5-diffusion-solve)

# Conflicts:
#	src/struphy/kernel_arguments/pusher_args_cuda.py
#	src/struphy/pic/base.py
#	src/struphy/pic/pushing/prepare_push_cuda.cu
#	src/struphy/pic/pushing/pusher.py
@max-models max-models changed the title GPU stack 6/8: column-major marker buffer on the GPU; rows prepared in the push kernels GPU stack 6/8: marker rows prepared inside the push kernels Oct 16, 2026

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant