diff --git a/.github/workflows/pretest.yml b/.github/workflows/pretest.yml index f149f9c4fba..86043e6610f 100644 --- a/.github/workflows/pretest.yml +++ b/.github/workflows/pretest.yml @@ -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 diff --git a/cupy/cuda/cupy_thrust.h b/cupy/cuda/cupy_thrust.h index 76cfe9ff7f8..838142b981e 100644 --- a/cupy/cuda/cupy_thrust.h +++ b/cupy/cuda/cupy_thrust.h @@ -4,7 +4,14 @@ #ifndef CUPY_NO_CUDA #include #include + +#ifndef CUPY_USE_HIP #include // 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&, intptr_t, void *); void thrust_lexsort(int, size_t *, void *, size_t, size_t, intptr_t, void *); diff --git a/install/cupy_builder/_features.py b/install/cupy_builder/_features.py index 908e699580d..4a7b0a1906b 100644 --- a/install/cupy_builder/_features.py +++ b/install/cupy_builder/_features.py @@ -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