Skip to content

Added all changes from struphy-with-cupy#93

Draft
max-models wants to merge 14 commits into
develfrom
clean-struphy-with-cupy
Draft

Added all changes from struphy-with-cupy#93
max-models wants to merge 14 commits into
develfrom
clean-struphy-with-cupy

Conversation

@max-models
Copy link
Copy Markdown
Member

Redo of #25

Notes:

This MR is still pointing towards 318, but it will be merged into devel once finished (which will be after 318 has already been merged).

To run on my PC, I still need to do:

export ARRAY_BACKEND=cupy
export CUDA_PATH=/usr/local/cuda
export PATH=$CUDA_PATH/bin:$PATH

I am then running the Vlasov standard parameters

struphy params Vlasov
python params_Vlasov.py

To do

  • Fix the need for setting CUDA path
  • We have many cases of from numpy import xyz, this makes sense in pyccelized kernels since we will not be allowed to use cupy there. But in my current testing, but otherwise not.
  • When calling a pyccelized kernel while using cupy, we can convert the arrays to numpy arrays, they should also be converted back to cupy arrays afterwards.

@max-models max-models mentioned this pull request Oct 31, 2025
3 tasks
@max-models
Copy link
Copy Markdown
Member Author

@copilot resolve the merge conflicts in this pull request

# Conflicts:
#	src/struphy/feec/basis_projection_ops.py
#	src/struphy/feec/psydac_derham.py
#	src/struphy/feec/tests/test_l2_projectors.py
#	src/struphy/feec/tests/test_local_projectors.py
#	src/struphy/fields_background/tests/test_mhd_equils.py
#	src/struphy/geometry/base.py
#	src/struphy/main.py
#	src/struphy/models/base.py
#	src/struphy/models/fluid.py
#	src/struphy/models/toy.py
#	src/struphy/post_processing/likwid/plot_time_traces.py
#	src/struphy/propagators/propagators_markers.py

Co-authored-by: max-models <181350288+max-models@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented May 5, 2026

@copilot resolve the merge conflicts in this pull request

Resolved all merge conflicts in commit 8b66de1. Here's a summary of what was resolved:

  • Deleted in devel (accepted deletions): main.py, models/fluid.py, models/toy.py, propagators/propagators_markers.py
  • Content conflicts (accepted devel's refactoring):
    • feec/basis_projection_ops.py: updated derham.p/Nelderham.degree/num_elements
    • feec/psydac_derham.py: replaced old dirichlet_bc assertion with devel's options extraction pattern
    • feec/tests/test_l2_projectors.py & test_local_projectors.py: updated to new API (Nel/p/spl_kindnum_elements/degree/bcs)
    • fields_background/tests/test_mhd_equils.py: kept devel's domains import
    • geometry/base.py: kept cupy's Pyccelkernel import alongside devel's utils/logger additions
    • models/base.py: accepted devel's major class refactoring (moved methods to sim.py)
    • post_processing/likwid/plot_time_traces.py: updated to new region/rank key naming

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.

2 participants