Skip to content

cherry-pick fix for ROCm 6.4 #73

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.

Sign up for GitHub

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

Open
quantumsteve wants to merge 2 commits into
base: master
Choose a base branch
from
Open

cherry-pick fix for ROCm 6.4 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40fb29c
build on ROCm 6.4
kmaehashi Apr 14, 2025
1cea0ec
update CI to use ROCm 6.4
kmaehashi Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pretest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@ jobs:

- name: Build & Test
run: |
docker run --rm -v "${PWD}:/src" -w /src "rocm/dev-ubuntu-22.04:6.0" bash .github/workflows/scripts/pretest-rocm-test.sh
docker run --rm -v "${PWD}:/src" -w /src "rocm/dev-ubuntu-22.04:6.4" bash .github/workflows/scripts/pretest-rocm-test.sh
7 changes: 7 additions & 0 deletions cupy/cuda/cupy_thrust.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@
#ifndef CUPY_NO_CUDA
#include <vector>
#include <cstdint>

#ifndef CUPY_USE_HIP
#include <thrust/version.h> // for THRUST_VERSION
#else
// WAR #9098:
// rocThrust 3.3.0 (ROCm 6.4.0) cannot be compiled by host compiler
#define THRUST_VERSION 0
#endif

void thrust_sort(int, void *, size_t *, const std::vector<ptrdiff_t>&, intptr_t, void *);
void thrust_lexsort(int, size_t *, void *, size_t, size_t, intptr_t, void *);
Expand Down
4 changes: 3 additions & 1 deletion install/cupy_builder/_features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,9 @@ def get_features(ctx: Context) -> Dict[str, Feature]:
('cupy.cuda.thrust', ['cupy/cuda/cupy_thrust.cu']),
],
'include': [
'thrust/version.h',
# WAR #9098:
# rocThrust 3.3.0 (ROCm 6.4.0) cannot be compiled by host compiler
# 'thrust/version.h',
],
'libraries': [
'amdhip64', # was hiprtc and hip_hcc before ROCm 3.8.0
Expand Down