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

merge back 6.3 hotfixes to develop #634

Merged

Conversation

NguyenNhuDi
Copy link
Collaborator

No description provided.

umfranzw and others added 11 commits August 29, 2024 22:53
Referencing or using code from some websites is prohibited in this repository.
This change removes an informational reference in the comments.
)

* test: add tests for internal serial merge function

* refactor(detail/merge_path.hpp): removed code duplication

* fix(detail/merge_path.hpp): stricter boundary checking in serial merge

* fix(detail/block_sort_merge.hpp): fix missing block-wide sync

During a previous refactor, serial_merge does no longer do a block sync. This has now been re-added.

* feat: add unsafe variant of serial merge

* fix: use bounded version for serial merge to fix rare page faults

* test(test_internal_merge_path): clean up internal merge path tests

* style: standardize range_t<> construction

* fix(detail/merge_path.hpp): fix 'range_t<>::count1()' and 'range_t<>::count2()' return types to be same as encapsulated type

* perf(detail/merge_path.hpp): use const ref in function parameters

* refactor(detail/merge_path.hpp): replace redundant use of 'OffsetT' with 'unsigned int'

* chore: update changelog

* fix: restore missing thread sync

This got removed during a rebase.
* Update dependency names for static builds (ROCm#557)

This also removes the line setting `BUILD_SHARED_LIBS` to `ON`, which was previously required to get the correctly named packages when not specifically compiling for a static build. Updates to the ROCmCMakeBuildTools (rocm-cmake) should mean this is no longer necessary.

* Fix BUILD_SHARED_LIBS for packaging (ROCm#558)

* Fix the dependencies of the static packages (ROCm#563)

* cmake: don't set CMAKE_C_COMPILER, as rocPRIM is a CXX project (ROCm#567)

* add developer guidelines (ROCm#555) (ROCm#574)



* Update Read the Docs config to Python 3.10 and latest rocm-docs-core (ROCm#564) (ROCm#579)

* Cherry-pick: Optimize block_reduce_warp_reduce when block size is the same as warp size (ROCm#599)

* Optimize block_reduce_warp_reduce when block size == warp size

* Make conditional constexpr

* Fix conflict in concepts.rst

---------

Co-authored-by: Lauren Wrubleski <[email protected]>
Co-authored-by: Steve Leung <[email protected]>
Co-authored-by: randyh62 <[email protected]>
Co-authored-by: Nol Moonen <[email protected]>
Co-authored-by: Sam Wu <[email protected]>
…on error (ROCm#622)

* added std::min to ensure no out of bound acess

* fixed typo keys->keys1

* updated changelog

* reverted std::min

* implemented suggested logic
* fixed mem leak in test_config_dispatch.cpp

* added missing hip free for method==4 in test_block_scan.kernels

* added graphHelpeer class that does not cause memory leak due to using hipGraphCreate

* replaced old hipGraph helpers with new class in device_bin_search

* changed HIP_CHECK_NON_VOID to HIP_CHECK

* fixed mem leak in device_bin_search

* added additional functions

* changed out old calls to hipGraphCrete to new GraphHelper class

* added missing stream sync for hipgrag_algs

* n

* added missing hipFree and HIP_CHECK for lookback_reproducibility

* added missing hipFree in test_discard_iterator

* fixed test failures

* removed extra hipFree

* removed unused variables

* updated change log

* removed redundant function

---------

Co-authored-by: Your Name <[email protected]>
Co-authored-by: root <[email protected]>
@NguyenNhuDi
Copy link
Collaborator Author

Not sure why the gfx1101 tests are failing. I ran the unit tests locally and observe no failures.

@NguyenNhuDi NguyenNhuDi merged commit 44159bd into ROCm:develop Nov 1, 2024
1 of 4 checks passed
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