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

Bump Kokkos version to 4.3.01 #725

Merged
merged 18 commits into from
May 17, 2024
Merged

Bump Kokkos version to 4.3.01 #725

merged 18 commits into from
May 17, 2024

Conversation

mlxd
Copy link
Member

@mlxd mlxd commented May 10, 2024

Before submitting

Please complete the following checklist when submitting a PR:

  • All new features must include a unit test.
    If you've fixed a bug or added code that should be tested, add a test to the
    tests directory!

  • All new functions and code must be clearly commented and documented.
    If you do make documentation changes, make sure that the docs build and
    render correctly by running make docs.

  • Ensure that the test suite passes, by running make test.

  • Add a new entry to the .github/CHANGELOG.md file, summarizing the
    change, and including a link back to the PR.

  • Ensure that code is properly formatted by running make format.

When all the above are checked, delete everything above the dashed
line and fill in the pull request template.


Context: Building Catalyst currently causes issues with Kokkos path resolution. This PR aims to update the Kokkos version to offer a potential route to rectify this issue.

Description of the Change: Updates kokkos to 4.3.01

Benefits: New support for Kokkos architectures and performance gains. Potential fix for Catalyst runtime Kokkos failure.

Possible Drawbacks:

Related GitHub Issues: PennyLaneAI/catalyst#732

Copy link
Contributor

Hello. You may have forgotten to update the changelog!
Please edit .github/CHANGELOG.md with:

  • A one-to-two sentence description of the change. You may include a small working example for new features.
  • A link back to this PR.
  • Your name (or GitHub username) in the contributors section.

@mlxd
Copy link
Member Author

mlxd commented May 10, 2024

[sc-63118]

@mlxd mlxd marked this pull request as ready for review May 14, 2024 17:29
Copy link

codecov bot commented May 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 99.15%. Comparing base (628d47e) to head (61605de).
Report is 75 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #725      +/-   ##
==========================================
+ Coverage   93.36%   99.15%   +5.78%     
==========================================
  Files         116      134      +18     
  Lines       16815    18989    +2174     
==========================================
+ Hits        15699    18828    +3129     
+ Misses       1116      161     -955     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mlxd mlxd requested review from vincentmr and maliasadi May 15, 2024 16:14
Copy link
Contributor

@vincentmr vincentmr left a comment

Choose a reason for hiding this comment

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

Do we want to check if the wheels still build alright?

Copy link
Member

@maliasadi maliasadi left a comment

Choose a reason for hiding this comment

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

Thanks @mlxd!

.github/CHANGELOG.md Show resolved Hide resolved
docker/Dockerfile Show resolved Hide resolved
docker/Dockerfile Show resolved Hide resolved
.github/workflows/set_wheel_build_matrix.yml Show resolved Hide resolved
@mlxd mlxd added ci:use-multi-gpu-runner Enable usage of Multi-GPU runner for this Pull Request ci:build_wheels Activate wheel building. labels May 15, 2024
@mlxd mlxd requested a review from vincentmr May 15, 2024 20:45
@mlxd mlxd requested a review from maliasadi May 15, 2024 20:45
Copy link
Contributor

@vincentmr vincentmr left a comment

Choose a reason for hiding this comment

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

I've added a tag to docker-build on the present branch, but it is failing because we are still building on an ad hoc branch of Kokkos. I have a PR #722 which fixes some issues in the Dockerfile. I think I should update the Dockerfile to work with Kokkos 4.3 there.

@@ -482,7 +482,7 @@ row-major format.
*/
template <template <typename...> class ComplexT, typename T>
static auto getCRot(T phi, T theta, T omega) -> std::vector<ComplexT<T>> {
const auto rot{std::move(getRot<ComplexT, T>(phi, theta, omega))};
const auto rot{getRot<ComplexT, T>(phi, theta, omega)};
Copy link
Member

Choose a reason for hiding this comment

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

Nice catch!

Copy link
Member

@multiphaseCFD multiphaseCFD left a comment

Choose a reason for hiding this comment

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

Thanks @mlxd ! Looks good to me!

@mlxd
Copy link
Member Author

mlxd commented May 17, 2024

Thanks folks. Ignoring the existing CF error, as it seems like we are optimal for now.

@mlxd mlxd merged commit 6e6e6ad into master May 17, 2024
115 of 134 checks passed
@mlxd mlxd deleted the update/kokkos_version branch May 17, 2024 15:53
multiphaseCFD pushed a commit that referenced this pull request May 17, 2024
* Bump Kokkos version

* Auto update version from '0.37.0-dev6' to '0.37.0-dev8'

* Auto update version from '0.37.0-dev8' to '0.37.0-dev9'

* Replace all Kokkos versions with 4.3 to update cache

* Auto update version from '0.37.0-dev9' to '0.37.0-dev10'

* Update changelog

* Auto update version from '0.37.0-dev11' to '0.37.0-dev12'

* Auto update version from '0.37.0-dev12' to '0.37.0-dev13'

* Fix warning: moving a temporary object prevents copy elision

* Ensure kokkos_swap used throughout

* Auto update version from '0.37.0-dev13' to '0.37.0-dev14'

---------

Co-authored-by: ringo-but-quantum <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci:build_wheels Activate wheel building. ci:use-multi-gpu-runner Enable usage of Multi-GPU runner for this Pull Request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants