From aae6f4a96bef9f374eda298251fd90e0ff8a4f5e Mon Sep 17 00:00:00 2001 From: Lisa Delaney Date: Mon, 20 Nov 2023 15:34:54 -0700 Subject: [PATCH] update ROCm naming --- CMakeLists.txt | 2 +- README.md | 2 +- cmake/SetupNVCC.cmake | 2 +- cmake/VerifyCompiler.cmake | 4 ++-- docs/installing.rst | 8 ++++---- install | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84c258c..56a8038 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,7 +112,7 @@ if( CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) string(REGEX MATCH ".mcode\-object\-version" TARGET_ID_SUPPORT ${CXX_OUTPUT}) endif() -# Verify that hipcc or HIP-aware clang is used on ROCM platform +# Verify that hipcc or HIP-aware clang is used on ROCM software # TODO: Fix VerifyCompiler for Windows if (NOT WIN32) include(cmake/VerifyCompiler.cmake) diff --git a/README.md b/README.md index 10fc890..ed804d7 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ You must have the following installed to use hipRAND: * CMake (3.16 or later) * For AMD GPUs: - * AMD ROCm platform (5.0.0 or later) + * AMD ROCm Software (5.0.0 or later) * rocRAND library * For NVIDIA GPUs: * CUDA Toolkit diff --git a/cmake/SetupNVCC.cmake b/cmake/SetupNVCC.cmake index 3bf7a3c..1fdaa14 100644 --- a/cmake/SetupNVCC.cmake +++ b/cmake/SetupNVCC.cmake @@ -21,7 +21,7 @@ # SOFTWARE. # Find HIP package and verify that correct C++ compiler was selected for available -# platform. On ROCm platform host and device code is compiled by the same compiler. +# platform. On ROCm software host and device code is compiled by the same compiler. # On CUDA host can be compiled by any C++ compiler while device code is compiled # by nvcc compiler (CMake's CUDA package handles this). diff --git a/cmake/VerifyCompiler.cmake b/cmake/VerifyCompiler.cmake index 6120702..043f97c 100644 --- a/cmake/VerifyCompiler.cmake +++ b/cmake/VerifyCompiler.cmake @@ -36,8 +36,8 @@ if (BUILD_WITH_LIB STREQUAL "CUDA") endif() elseif(HIP_COMPILER STREQUAL "clang") if(NOT (CMAKE_CXX_COMPILER MATCHES ".*hipcc$" OR CMAKE_CXX_COMPILER MATCHES ".*clang\\+\\+")) - message(FATAL_ERROR "On ROCm platform 'hipcc' or HIP-aware Clang must be used as C++ compiler.") + message(FATAL_ERROR "On ROCm software 'hipcc' or HIP-aware Clang must be used as C++ compiler.") endif() else() - message(FATAL_ERROR "HIP_COMPILER must be `clang` (AMD ROCm platform)") + message(FATAL_ERROR "HIP_COMPILER must be `clang` (AMD ROCm Software)") endif() diff --git a/docs/installing.rst b/docs/installing.rst index 09ac86b..696ba90 100644 --- a/docs/installing.rst +++ b/docs/installing.rst @@ -34,9 +34,9 @@ Requirements To build hipRAND, CMake version 3.10 or later is required. -Additionally, to build hipRAND for the ROCm platform, the following software are required: +Additionally, to build hipRAND for ROCm software, the following software are required: -* AMD ROCm platform (version 5.0.0 or later). +* AMD ROCm Software (version 5.0.0 or later). * `rocRAND `_ To build hipRAND for the CUDA platform instead, the following software is required: @@ -54,7 +54,7 @@ The hipRAND sources are available from the `hipRAND GitHub Repository >`` should be set to ``hipcc`` on a ROCm platform, or to a regular C++ compiler such as ``g++`` on a CUDA platform. +Where ``>`` should be set to ``hipcc`` on ROCm software, or to a regular C++ compiler such as ``g++`` on a CUDA platform. * ``BUILD_WITH_LIB`` controls whether to build hipRAND with the rocRAND or cuRAND backend. If set to ``CUDA``, hipRAND will be built using the cuRAND backend. Otherwise, the rocRAND backend will be used. * ``BUILD_FORTRAN_WRAPPER`` controls whether to build the Fortran wrapper. Defaults to ``OFF``. diff --git a/install b/install index 405977c..7a45c0a 100755 --- a/install +++ b/install @@ -138,7 +138,7 @@ fi # BUILD_BENCHMARK - off by default. # # ! IMPORTANT ! -# On ROCm platform set C++ compiler to HIPCC. You can do it by adding 'CXX=' +# On ROCm software set C++ compiler to HIPCC. You can do it by adding 'CXX=' # before 'cmake' or setting cmake option 'CMAKE_CXX_COMPILER' to path to the HIPCC compiler. #