Skip to content

Updates camp submodule - #2058

Merged
bechols97 merged 16 commits into
developfrom
feature/bechols97/camp_update
Jul 21, 2026
Merged

Updates camp submodule#2058
bechols97 merged 16 commits into
developfrom
feature/bechols97/camp_update

Conversation

@bechols97

Copy link
Copy Markdown
Contributor

Summary

This PR updates the camp submodule to v2026.07.0. This includes build fixes for:

  • wait_for an event taking a reference instead of a pointer
  • SYCL get_queue returning a reference instead of a pointer
  • Cleans up warnings in the SYCL backend


// _raja_res_wait_start
res_gpu2.wait_for(&e);
res_gpu2.wait_for(e);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This kind of change would be good to capture in the release note -- We typically wait until the end to update the release notes, but just marking this so we remember.

bechols97 and others added 7 commits July 13, 2026 15:26
This is fine as the LoopData object is created on the stack
in a function where the resource  is an argument.
Note that the LoopData object is used on the device in async kernels
but that is also fine as the resource may not be used on
the device.
@rhornung67

Copy link
Copy Markdown
Member

@lc-hubcast approve

@lc-hubcast

lc-hubcast Bot commented Jul 16, 2026

Copy link
Copy Markdown

To approve syncing this PR, please use the GitHub review comment feature to submit an approval. This ensures approval is tied to a specific commit to avoid the sync of malicious data.

@rhornung67 rhornung67 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lc-hubcast approve

  - Fixes a segfault
  - More work is needed to better support SYCL's reduce and
    be more similar to CUDA and HIP.
Comment thread include/RAJA/policy/sycl/reduce.hpp Outdated
Comment thread include/RAJA/policy/sycl/MemUtils_SYCL.hpp Outdated
Comment thread include/RAJA/policy/sycl/reduce.hpp Outdated
Comment thread include/RAJA/policy/sycl/reduce.hpp Outdated
Comment thread include/RAJA/policy/sycl/reduce.hpp Outdated
@MrBurmark

Copy link
Copy Markdown
Member

This looks good. We'll have to wait for this camp PR so the camp tests pass llnl/camp#213.

@bechols97

Copy link
Copy Markdown
Contributor Author

This looks good. We'll have to wait for this camp PR so the camp tests pass llnl/camp#213.

In addition to the camp PR, both the spack-packages repo and radius-spack-configs need to be updated with the correct camp version for CI prior to merging this PR. There are some temporary files here for testing the changes to the spack packages prior to updating the spack-packages repo.

@bechols97

Copy link
Copy Markdown
Contributor Author

@lc-hubcast approve

@lc-hubcast

lc-hubcast Bot commented Jul 16, 2026

Copy link
Copy Markdown

To approve syncing this PR, please use the GitHub review comment feature to submit an approval. This ensures approval is tied to a specific commit to avoid the sync of malicious data.

@rhornung67 rhornung67 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lc-hubcast approve

@rhornung67

Copy link
Copy Markdown
Member

@smithsg84 @bechols97 is the idea to merge this, then fix the spack package issues upstream?

I don't know what's the issue with the windows shared lib build. Apparently, I can't see the raw log file while other jobs are running.

@bechols97

Copy link
Copy Markdown
Contributor Author

@rhornung67 That was my understanding. Also, I'm not sure on the Windows build either. It was passing prior to getting the branch up to date with develop.

@rhornung67

rhornung67 commented Jul 20, 2026

Copy link
Copy Markdown
Member

@bechols97 after some digging it seems that the windows build issue is due to using an experimental version of CMake (4.4), which has a known JSON string parsing issue tickled by changes to the camp array test. I'm going to push a change to your branch to a "stable" cmake version and see if that works.

@rhornung67

Copy link
Copy Markdown
Member

@bechols97 @smithsg84 my change to a stable version of CMake in our GHA Windows checks appears to have fixed the issue.

@bechols97
bechols97 merged commit ada664d into develop Jul 21, 2026
21 checks passed
@rhornung67
rhornung67 deleted the feature/bechols97/camp_update branch July 21, 2026 20:45

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be upstreamed to camp?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@smithsg84 mentioned that this had been upstreamed in an earlier version of camp. This was just added to get the local spack packages working correctly.

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.

6 participants