Skip to content

merge queue: checking #2429 + #2430 + #2432 together on main (2afc3e0) - #2433

Closed
mergify[bot] wants to merge 8 commits into
mainfrom
mergify/merge-queue/03313470bb
Closed

mergify[bot] wants to merge 8 commits into
mainfrom
mergify/merge-queue/03313470bb

Conversation

@mergify

@mergify mergify Bot commented Sep 22, 2026 •

Copy link
Copy Markdown
Contributor

🎉 This combination of pull requests has been checked successfully and will be merged soon. 🎉

#2429 + #2430 + #2432 are queued together for merge on branch main (2afc3e0).

This pull request has been created by Mergify to check the mergeability of [#2429 + #2430 + #2432].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue rule main queue for merge:

  • check-success = all

Required conditions to stay in the queue:

---
checking_base_sha: 2afc3e0ee72a43bbcc5b60e058d1d086c9704aa7
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 2429
    scopes: []
  - number: 2430
    scopes: []
  - number: 2432
    scopes: []
scopes: []
...

tdavidcl and others added 8 commits September 22, 2026 07:30
Resolve conflict in godunov_homogeneous_bench_result.json by keeping
both the newly added Apple M4 Max entry and upstream's newly added
Intel Data Center GPU Max 1550 entry.

Assisted-by: Claude Code
leaf_part_id in start_neighbors_cache_2stages() used a raw sycl::buffer
while the rest of the neighbour cache build already used
sham::DeviceBuffer with explicit read/write access and event-state
completion. Switch it to the same pattern for consistency.

Extracted from the sycl::buffer -> sham::DeviceBuffer migration in
#2424 (commit bbca40c).

Assisted-by: Claude Code
@coderabbitai

coderabbitai Bot commented Sep 22, 2026

Copy link
Copy Markdown

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: ASSERTIVE

Plan: Advanced

Run ID: 30632485-e822-41d1-b0ee-dde79a5890ed

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions

Copy link
Copy Markdown
Contributor

Thanks @mergify[bot] for opening this PR!

You can do multiple things directly here:
1 - Comment pre-commit.ci run to run pre-commit checks.
2 - Comment pre-commit.ci autofix to apply fixes.
3 - Add label autofix.ci to fix authorship & pre-commit for every commit made.
4 - Add label full-ci to run the full test suite (default is light CI; full CI also runs on Mergify merge-queue branches).
5 - Add label profile-build to run the compile-time build profile job even in light CI.
6 - Add label trigger-ci to create an empty commit to trigger the CI.

Once the workflow completes a message will appear displaying informations related to the run.

Also the PR gets automatically reviewed by gemini, you can:
1 - Comment /gemini review to trigger a review
2 - Comment /gemini summary for a summary
3 - Tag it using @gemini-code-assist either in the PR or in review comments on files

@github-actions

Copy link
Copy Markdown
Contributor

Workflow report

workflow report corresponding to commit 2d9868e
Commiter email is 37929162+mergify[bot]@users.noreply.github.com
You are using github private e-mail. This prevent proper tracing of who contributed what, please disable it (see Keep my email addresses private).
GitHub page artifact URL GitHub page artifact link (can expire)

Pre-commit check report

Pre-commit check: ✅

trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
check for merge conflicts................................................Passed
check that executables have shebangs.....................................Passed
check that scripts with shebangs are executable..........................Passed
check for added large files..............................................Passed
check for case conflicts.................................................Passed
check for broken symlinks................................................Passed
check yaml...............................................................Passed
detect private key.......................................................Passed
No-tabs checker..........................................................Passed
Tabs remover.............................................................Passed
cmake-format.............................................................Passed
Validate GitHub Workflows................................................Passed
clang-format.............................................................Passed
ruff check...............................................................Passed
ruff format..............................................................Passed
Check doxygen headers....................................................Passed
Check license headers....................................................Passed
Check #pragma once.......................................................Passed
Check SYCL #include......................................................Passed
No ssh in git submodules remote..........................................Passed
No UTF-8 in files (except for authors)...................................Passed

Test pipeline can run.

Clang-tidy diff report

/__w/Shamrock/Shamrock/src/shammodels/sph/src/modules/NeighbourCache.cpp:552:33: warning: invalid case style for constexpr variable 'Rker2' [readability-identifier-naming]
  552 |                 constexpr Tscal Rker2 = Kernel::Rkern * Kernel::Rkern;
      |                                 ^~~~~
      |                                 rker2
/__w/Shamrock/Shamrock/src/shammodels/sph/src/modules/NeighbourCache.cpp:552:33: note: FIX-IT applied suggested code changes
/__w/Shamrock/Shamrock/src/shammodels/sph/src/modules/NeighbourCache.cpp:574:60: note: FIX-IT applied suggested code changes
  574 |                                 = rab2 > rint_a * rint_a * Rker2 && rab2 > rint_b * rint_b * Rker2;
      |                                                            ^
/__w/Shamrock/Shamrock/src/shammodels/sph/src/modules/NeighbourCache.cpp:574:94: note: FIX-IT applied suggested code changes
  574 |                                 = rab2 > rint_a * rint_a * Rker2 && rab2 > rint_b * rint_b * Rker2;
      |                                                                                              ^

27948 warnings generated.
clang-tidy applied 3 of 3 suggested fixes.
Suppressed 27948 warnings (27944 in non-user code, 3 due to line filter, 1 NOLINT).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.

Suggested changes

Detailed changes :
diff --git a/src/shammodels/sph/src/modules/NeighbourCache.cpp b/src/shammodels/sph/src/modules/NeighbourCache.cpp
index 9f79d095..b710c447 100644
--- a/src/shammodels/sph/src/modules/NeighbourCache.cpp
+++ b/src/shammodels/sph/src/modules/NeighbourCache.cpp
@@ -549,7 +549,7 @@ void shammodels::sph::modules::NeighbourCache<Tvec, Tmorton, SPHKernel>::
 
                 u32 offset_leaf = intnode_cnt;
 
-                constexpr Tscal Rker2 = Kernel::Rkern * Kernel::Rkern;
+                constexpr Tscal rker2 = Kernel::Rkern * Kernel::Rkern;
 
                 shambase::parallel_for(cgh, obj_cnt, "compute neigh cache 2", [=](u64 gid) {
                     u32 id_a = (u32) gid;
@@ -571,7 +571,7 @@ void shammodels::sph::modules::NeighbourCache<Tvec, Tmorton, SPHKernel>::
                             Tscal rint_b = hpart[id_b] * h_tolerance;
 
                             bool no_interact
-                                = rab2 > rint_a * rint_a * Rker2 && rab2 > rint_b * rint_b * Rker2;
+                                = rab2 > rint_a * rint_a * rker2 && rab2 > rint_b * rint_b * rker2;
 
                             if (!no_interact) {
                                 neigh[cnt] = id_b;
# Doxygen diff with `main` Removed warnings : 0 New warnings : 0 Warnings count : 8186 → 8186 (0.0%)
Detailed changes :

@mergify mergify Bot closed this Sep 22, 2026
@mergify
mergify Bot deleted the mergify/merge-queue/03313470bb branch September 22, 2026 19:54
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