Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backports from master to release_29 #3643

Merged
merged 9 commits into from
May 30, 2023

Conversation

vicentebolea and others added 7 commits May 29, 2023 17:17
…rapper

ci: use nvcc_wrapper in adiosKokkos
(cherry picked from commit 189f384)
(cherry picked from commit cf7a879)
(cherry picked from commit e095189)
(cherry picked from commit 731616f)
(cherry picked from commit 49e80a1)
Bumps [requests](https://github.com/psf/requests) from 2.28.1 to 2.31.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](psf/requests@v2.28.1...v2.31.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 8385796)
(cherry picked from commit 6107372)
@vicentebolea vicentebolea self-assigned this May 29, 2023
@vicentebolea vicentebolea added this to the v2.9.1 milestone May 29, 2023
@vicentebolea vicentebolea marked this pull request as ready for review May 29, 2023 21:21
(cherry picked from commit 59c589e)
@vicentebolea vicentebolea changed the title Backports from master Backports from master to release_29 May 29, 2023
Copy link
Member

@eisenhauer eisenhauer left a comment

Choose a reason for hiding this comment

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

I think the only thing I can comment on is the whatsnew docs (and maybe the HDF5 type change), both of which look good.

@vicentebolea
Copy link
Collaborator Author

Thanks @eisenhauer. CI changes add the support for OCLF crusher/ascent add coverage in this release branch.

The other PR which is being backported is the one that changes how kokkos is built. In this case no header/source code is changed, the only thing changes is its path and perhaps some flags in the nvcc compiler meaning that no function signature changed in the binary interface.

Merging :)

@vicentebolea vicentebolea merged commit 3bd4cff into ornladios:release_29 May 30, 2023
36 checks passed
@vicentebolea vicentebolea deleted the backports-from-master branch May 30, 2023 16:31
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.

None yet

3 participants