From 15289c645198c3c857137832c195244645c84dcf Mon Sep 17 00:00:00 2001 From: Simeon Ehrig Date: Wed, 3 Jan 2024 15:14:31 +0100 Subject: [PATCH] remove HIP 5.0 support --- README.md | 4 ++-- cmake/alpakaCommon.cmake | 2 +- script/job_generator/generate_job_yaml.py | 4 +--- script/job_generator/versions.py | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1140d4ffa719..47520a5992ec 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ Accelerator Back-ends | std::thread | std::thread | Host CPU (multi core) | sequential | parallel (preemptive multitasking) | | TBB | TBB 2.2+ | Host CPU (multi core) | parallel (preemptive multitasking) | sequential (only 1 thread per block) | | CUDA | CUDA 9.0+ | NVIDIA GPUs | parallel (undefined) | parallel (lock-step within warps) | -| HIP(clang) | [HIP 5.0+](https://github.com/ROCm-Developer-Tools/HIP) | AMD GPUs | parallel (undefined) | parallel (lock-step within warps) | +| HIP(clang) | [HIP 5.1+](https://github.com/ROCm-Developer-Tools/HIP) | AMD GPUs | parallel (undefined) | parallel (lock-step within warps) | Supported Compilers @@ -74,7 +74,7 @@ This library uses C++17 (or newer when available). | TBB | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | CUDA (nvcc) | :white_check_mark:
(CUDA 11.0 - 12.2)[^2] | :white_check_mark:
(CUDA 11.4 - 12.0)[^2] | :white_check_mark:
(CUDA 12.0 - 12.2) | :x: | :white_check_mark:
(CUDA 11.0-11.2; 11.6 - 12.0)[^2] | :white_check_mark:
(CUDA 11.2, 11.6 - 12.0)[^2] | :white_check_mark:
(CUDA 11.6 - 12.0)[^2] | :white_check_mark:
(CUDA 11.7 - 12.0) | :white_check_mark:
(CUDA 11.8 - 12.0) | :white_check_mark:
(CUDA 12.2) | :x: | :x: | :x: | :x: | :x: | | CUDA (clang) | - | - | - | :x: | :x: | :x: | :x: | :x: | :white_check_mark: (CUDA 11.0 - 11.5) | :white_check_mark: (CUDA 11.0 - 11.5)[^1] | :white_check_mark: (CUDA 11.0 - 11.5)[^1] | :white_check_mark: (CUDA 11.0 - 11.8)[^1] | :x: | - | - | -| [HIP](https://alpaka.readthedocs.io/en/latest/install/HIP.html) (clang) | - | - | - | :x: | :x: | :x: | :x: | :x: | :white_check_mark: (HIP 5.0 - 5.2) | :white_check_mark: (HIP 5.3 - 5.4) | :white_check_mark: (HIP 5.5 - 5.6) | :white_check_mark: (HIP 5.7 - 6.0) | :x: | - | - | +| [HIP](https://alpaka.readthedocs.io/en/latest/install/HIP.html) (clang) | - | - | - | :x: | :x: | :x: | :x: | :x: | :white_check_mark: (HIP 5.1 - 5.2) | :white_check_mark: (HIP 5.3 - 5.4) | :white_check_mark: (HIP 5.5 - 5.6) | :white_check_mark: (HIP 5.7 - 6.0) | :x: | - | - | | SYCL | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark:[^4] | :x: | :x: | Other compilers or combinations marked with :x: in the table above may work but are not tested in CI and are therefore not explicitly supported. diff --git a/cmake/alpakaCommon.cmake b/cmake/alpakaCommon.cmake index 6d30dbfa0c91..077278c80852 100644 --- a/cmake/alpakaCommon.cmake +++ b/cmake/alpakaCommon.cmake @@ -507,7 +507,7 @@ endif() if(alpaka_ACC_GPU_HIP_ENABLE) # supported HIP version range - set(_alpaka_HIP_MIN_VER 5.0) + set(_alpaka_HIP_MIN_VER 5.1) set(_alpaka_HIP_MAX_VER 5.7) set(_alpaka_HIP_NEXT_MAJOR_MIN_VER 6.0) diff --git a/script/job_generator/generate_job_yaml.py b/script/job_generator/generate_job_yaml.py index 137f70d0206a..1fe63eef92fb 100644 --- a/script/job_generator/generate_job_yaml.py +++ b/script/job_generator/generate_job_yaml.py @@ -337,9 +337,7 @@ def job_variables(job: Dict[str, Tuple[str, str]]) -> Dict[str, str]: variables["CXX"] = "clang++" variables["GPU_TARGETS"] = "${CI_GPU_ARCH}" # TODO(SimeonEhrig) check, if we can remove this variable: - if job[DEVICE_COMPILER][VERSION] == "5.0": - variables["ALPAKA_CI_CLANG_VER"] = "14" - elif job[DEVICE_COMPILER][VERSION] == "5.1": + if job[DEVICE_COMPILER][VERSION] == "5.1": variables["ALPAKA_CI_CLANG_VER"] = "14" elif job[DEVICE_COMPILER][VERSION] == "5.2": variables["ALPAKA_CI_CLANG_VER"] = "14" diff --git a/script/job_generator/versions.py b/script/job_generator/versions.py index 41c6ac7182fa..d010bad3e100 100644 --- a/script/job_generator/versions.py +++ b/script/job_generator/versions.py @@ -27,7 +27,7 @@ "12.1", "12.2", ], - HIPCC: ["5.0", "5.1", "5.2", "5.3", "5.4", "5.5", "5.6", "5.7", "6.0"], + HIPCC: ["5.1", "5.2", "5.3", "5.4", "5.5", "5.6", "5.7", "6.0"], ICPX: ["2023.1.0", "2023.2.0"], # Contains all enabled back-ends. # There are special cases for ALPAKA_ACC_GPU_CUDA_ENABLE and ALPAKA_ACC_GPU_HIP_ENABLE