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

Mergeback 6.3 fixes #420

Merged
merged 6 commits into from
Nov 1, 2024
Merged

Mergeback 6.3 fixes #420

merged 6 commits into from
Nov 1, 2024

Conversation

umfranzw
Copy link
Collaborator

Merge back commits from the ROCm 6.3 release branch. This fixes some recent build issues that have come up.

umfranzw and others added 4 commits August 26, 2024 16:09
An update to the TwiddleIn/Out functions from PR ROCm#377 seems to be causing
a build failure in onnxruntime. This change reverts the single commit
(0721c2c) that made those changes.
We can re-apply the change with an appropriate fix in the future.
Note: the commits in the PR were squashed, so that commit will not
show up in the log.
Referencing or using code from some websites is prohibited in this repository.
This change removes an informational reference in the comments.
* edited to conform to standards

* edited to conform to standards
@umfranzw umfranzw changed the base branch from develop to staging October 31, 2024 18:31
@umfranzw umfranzw changed the base branch from staging to develop October 31, 2024 19:24
spolifroni-amd and others added 2 commits October 31, 2024 13:31
Merge back commits from release/rocm-rel-6.3 to develop.
@umfranzw umfranzw force-pushed the mergeback_6.3_fixes branch from 4bcc4d9 to d7c7c97 Compare October 31, 2024 19:50
@umfranzw umfranzw merged commit 5869b27 into ROCm:develop Nov 1, 2024
22 of 23 checks passed
NB4444 pushed a commit to StreamHPC/hipCUB that referenced this pull request Nov 20, 2024
* Revert Bit Twiddle change from PR ROCm#377 (ROCm#397)

An update to the TwiddleIn/Out functions from PR ROCm#377 seems to be causing
a build failure in onnxruntime. This change reverts the single commit
(0721c2c) that made those changes.
We can re-apply the change with an appropriate fix in the future.
Note: the commits in the PR were squashed, so that commit will not
show up in the log.

* Remove website URL from comments (ROCm#398)

Referencing or using code from some websites is prohibited in this repository.
This change removes an informational reference in the comments.

* Add gfx1151 target (ROCm#399) (ROCm#401)

Co-authored-by: Stanley Tsang <[email protected]>

* Spolifroni amd/624 changelogcleanup upcoming (ROCm#411)

* edited to conform to standards

* edited to conform to standards

* updated the changelog for 6.3 (ROCm#418)

---------

Co-authored-by: amd-garydeng <[email protected]>
Co-authored-by: Stanley Tsang <[email protected]>
Co-authored-by: spolifroni-amd <[email protected]>
stanleytsang-amd added a commit that referenced this pull request Nov 20, 2024
* Resolve "hipCUB compilation fails with latest rocPRIM changes"

* Rework device_histogram test

* Const-qualify half_t::operator+/*

* Update CUB/Thrust/libcu++ to 2.5.0

* Add tets for large number of items for hipcub::DeviceSelect::If

* Update example_device_radix_sort.cu

* fix: reset error code in device_radix_sort test after out-of-memory error

* Expose DeviceSelect::FlaggedIf

* Add test for DeviceSelect::FlaggedIf

* Add benchmark for DeviceSelect::FlaggedIf

* Set c++ version to 17 and create warning

* Fix ambiguous variable error

* Fix nodiscard warnings

* Set CI tests for both c++14 and 17

* Fix nodiscard warnings in example

* Examples clang-format

* Fixed clang format and dates

* temp fix: wrong error on cuda machines

* Ignore error from hipGetLastError to prevent warning

* Deleted declaration of unecessary hipError_t result

* Deleted declaration of unecessary hipError_t result

* Format amending

* Format amending

* Format amending

* Cleanup

* Formatting

* Added wrapper for BindTexture

* Fixed some issues in the test

* Removed unnecessary code

* Mergeback 6.3 fixes (#420)

* Revert Bit Twiddle change from PR #377 (#397)

An update to the TwiddleIn/Out functions from PR #377 seems to be causing
a build failure in onnxruntime. This change reverts the single commit
(0721c2c) that made those changes.
We can re-apply the change with an appropriate fix in the future.
Note: the commits in the PR were squashed, so that commit will not
show up in the log.

* Remove website URL from comments (#398)

Referencing or using code from some websites is prohibited in this repository.
This change removes an informational reference in the comments.

* Add gfx1151 target (#399) (#401)

Co-authored-by: Stanley Tsang <[email protected]>

* Spolifroni amd/624 changelogcleanup upcoming (#411)

* edited to conform to standards

* edited to conform to standards

* updated the changelog for 6.3 (#418)

---------

Co-authored-by: amd-garydeng <[email protected]>
Co-authored-by: Stanley Tsang <[email protected]>
Co-authored-by: spolifroni-amd <[email protected]>

* Add parameter to specify rocPRIM branch to use (#403)

* added link to documentation (#416)

---------

Co-authored-by: Balint Soproni <[email protected]>
Co-authored-by: Beatriz Navidad Vilches <[email protected]>
Co-authored-by: Saiyang Zhang <[email protected]>
Co-authored-by: Wayne Franz <[email protected]>
Co-authored-by: amd-garydeng <[email protected]>
Co-authored-by: Stanley Tsang <[email protected]>
Co-authored-by: spolifroni-amd <[email protected]>
Co-authored-by: Lauren Wrubleski <[email protected]>
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.

4 participants