Skip to content
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.

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

update ROCm naming #95

Merged
merged 1 commit into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/SetupNVCC.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down
4 changes: 2 additions & 2 deletions cmake/VerifyCompiler.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
8 changes: 4 additions & 4 deletions docs/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/ROCmSoftwarePlatform/rocRAND.git>`_

To build hipRAND for the CUDA platform instead, the following software is required:
Expand All @@ -54,7 +54,7 @@ The hipRAND sources are available from the `hipRAND GitHub Repository <https://g
Building the Library
^^^^^^^^^^^^^^^^^^^^

After obtaining the sources and dependencies, hipRAND can be built for the ROCm platform using the installation script::
After obtaining the sources and dependencies, hipRAND can be built for ROCm software using the installation script::

cd hipRAND
./install --install
Expand All @@ -76,7 +76,7 @@ For a more elaborate installation process, hipRAND can be built manually using C
# Install
[sudo] make install

Where ``<compiler>>`` should be set to ``hipcc`` on a ROCm platform, or to a regular C++ compiler such as ``g++`` on a CUDA platform.
Where ``<compiler>>`` 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``.
Expand Down
2 changes: 1 addition & 1 deletion install
Original file line number Diff line number Diff line change
Expand Up @@ -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=<path-to-hipcc>'
# On ROCm software set C++ compiler to HIPCC. You can do it by adding 'CXX=<path-to-hipcc>'
# before 'cmake' or setting cmake option 'CMAKE_CXX_COMPILER' to path to the HIPCC compiler.
#

Expand Down