Bulk fast-forward merge develop to 6.1 staging branch (#317)

* Develop stream 2023-10-27 (#309)

* Accumulator types changed for reduce and test_hipcub_device_reduce fixed for new thread operators

* Add thread operators test

* Bump CUB and Thrust versions to 2.1.0

* change how we use the rocprim::host_warp_size

* update changelog

* move host_warp_size_wrapper out of the HIPCUB_HOST_WARP_THREADS macro

* update changelog to be clearer

* add changes related to __int128_t support

* finish int128 support
add tests for block and device_radix_sort
add assert_bit_eq for (u)int128 vectors

* Test large indices for DeviceReduce

* Fix clang format

* Include FetchContent in new ROCmCMakeBuildToolsDependency cmake file

* Use _ENABLE_EXTENDED_ALIGNED_STORAGE for windows build in rmake.py

* Update CHANGELOG to ROCm 6.1

---------

Co-authored-by: Bence Parajdi <[email protected]>

* StreamHPC 2023-11-21 (DeviceMemcpy::Batched) (#314)

* ci: use build instead rocm-build and nvcc-build tags

This allows the build job to be performed by any runner configured
for building, instead of the ROCm-specialized builder. As the
target architectures are specified ahead of time, the GPU is not
needed during the build process, and may be performed by any builder.

* feat: Add interface for batched memcpy from rocPRIM and CUB

* style(device_memcpy): improve formatting

---------

Co-authored-by: Robin Voetter <[email protected]>
Co-authored-by: Gergely Mészáros <[email protected]>

* Bump cryptography from 41.0.4 to 41.0.6 in /docs/.sphinx (#316)

Bumps [cryptography](https://github.com/pyca/cryptography) from 41.0.4 to 41.0.6.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@41.0.4...41.0.6)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Beatriz Navidad Vilches <[email protected]>
Co-authored-by: Bence Parajdi <[email protected]>
Co-authored-by: Nara <[email protected]>
Co-authored-by: Robin Voetter <[email protected]>
Co-authored-by: Gergely Mészáros <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.clang-format

@@ -58,11 +58,7 @@ BraceWrapping:
     AfterNamespace: true
     AfterStruct: true
     AfterUnion: true
-    BeforeCatch: true
-    BeforeElse: true
     AfterExternBlock: false
-    BeforeCatch: true
-    BeforeElse: true
     BeforeLambdaBody: true
     BeforeWhile: true
     IndentBraces: false

.gitlab-ci.yml

@@ -45,7 +45,7 @@ clang-format:
   stage: lint
   needs: []
   tags:
-    - rocm-build
+    - build
   variables:
     CLANG_FORMAT: "/opt/rocm/llvm/bin/clang-format"
     GIT_CLANG_FORMAT: "/opt/rocm/llvm/bin/git-clang-format"
@@ -62,7 +62,7 @@ copyright-date:
   stage: lint
   needs: []
   tags:
-    - rocm-build
+    - build
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
   script:
@@ -107,7 +107,7 @@ build:rocm:
     - .rules:build
   stage: build
   tags:
-    - rocm-build
+    - build
   needs: []
   script:
     - cmake
@@ -145,7 +145,7 @@ build:rocm-benchmark:
     - .rules:build
   stage: build
   tags:
-    - rocm-build
+    - build
   needs: []
   script:
     - cmake
@@ -304,7 +304,7 @@ build:nvcc:
     - .nvcc
     - .rules:build
   tags:
-    - nvcc-build
+    - build
   needs: []
   script:
     - cmake
@@ -339,7 +339,7 @@ build:nvcc-benchmark:
     - .nvcc
     - .rules:build
   tags:
-    - nvcc-build
+    - build
   needs: []
   script:
     - cmake

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 See README.md on how to build the hipCUB documentation using Doxygen.
 
+## (Unreleased) hipCUB-2.13.1 for ROCm 6.1.0
+### Changed
+- CUB backend references CUB and Thrust version 2.1.0.
+- Updated `HIPCUB_HOST_WARP_THREADS` macro definition to match `host_warp_size` changes from rocPRIM 3.0.
+- Implemented `__int128_t` and `__uint128_t` support for radix_sort.
+### Fixed
+- Fixed build issues with `rmake.py` on Windows when using VS 2017 15.8 or later due to a breaking fix with extended aligned storage.
+
+### Added
+- Added interface `DeviceMemcpy::Batched` for batched memcpy from rocPRIM and CUB.
+
 ## (Unreleased) hipCUB-2.13.1 for ROCm 5.7.0
 ### Changed
 - CUB backend references CUB and Thrust version 2.0.1.

benchmark/CMakeLists.txt

@@ -1,6 +1,6 @@
 # MIT License
 #
-# Copyright (c) 2020 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) 2020-2023 Advanced Micro Devices, Inc. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -80,6 +80,7 @@ add_hipcub_benchmark(benchmark_block_run_length_decode.cpp)
 add_hipcub_benchmark(benchmark_block_scan.cpp)
 add_hipcub_benchmark(benchmark_block_shuffle.cpp)
 add_hipcub_benchmark(benchmark_device_adjacent_difference.cpp)
+add_hipcub_benchmark(benchmark_device_batch_memcpy.cpp)
 add_hipcub_benchmark(benchmark_device_histogram.cpp)
 add_hipcub_benchmark(benchmark_device_memory.cpp)
 add_hipcub_benchmark(benchmark_device_merge_sort.cpp)