Skip to content

Commit

Permalink
Merge pull request #165 from ROCmSoftwarePlatform/develop_stream_2020…
Browse files Browse the repository at this point in the history
…0608

Replace HCC with HIP-clang
  • Loading branch information
saadrahim authored Jun 9, 2020
2 parents 4490eba + a724c46 commit 3bf9f61
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ build:cmake-latest:
- cd $BUILD_LATEST_DIR
- cmake
-G Ninja
-D CMAKE_CXX_COMPILER=hcc
-D CMAKE_CXX_COMPILER=hipcc
-D CMAKE_BUILD_TYPE=Release
-D BUILD_TEST=ON
-D BUILD_EXAMPLE=ON
Expand Down Expand Up @@ -120,7 +120,7 @@ build:cmake-minimum:
- cd $BUILD_MINIMUM_DIR
- cmake
-G Ninja
-D CMAKE_CXX_COMPILER=hcc
-D CMAKE_CXX_COMPILER=hipcc
-D CMAKE_BUILD_TYPE=Release
-D BUILD_TEST=ON
-D BUILD_EXAMPLE=ON
Expand Down Expand Up @@ -150,7 +150,7 @@ build:package:
- cd $PACKAGE_DIR
- cmake
-G Ninja
-D CMAKE_CXX_COMPILER=hcc
-D CMAKE_CXX_COMPILER=hipcc
-D CMAKE_BUILD_TYPE=Release
-B $PACKAGE_DIR
$CI_PROJECT_DIR
Expand All @@ -162,7 +162,7 @@ build:package:
- mkdir -p ../package_test && cd ../package_test
- cmake
-G Ninja
-D CMAKE_CXX_COMPILER=hcc
-D CMAKE_CXX_COMPILER=hipcc
-D CMAKE_BUILD_TYPE=Release
$CI_PROJECT_DIR/test/extra
- cmake
Expand Down Expand Up @@ -190,7 +190,7 @@ test:deb:
- mkdir -p package_test && cd package_test
- cmake
-G Ninja
-D CMAKE_CXX_COMPILER=hcc
-D CMAKE_CXX_COMPILER=hipcc
-D CMAKE_BUILD_TYPE=Release
$CI_PROJECT_DIR/test/extra
- cmake
Expand Down
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ performant GPU-accelerated code on AMD ROCm platform.
* Git
* CMake (3.5.1 or later)
* AMD [ROCm](https://rocm.github.io/install.html) platform (1.8.2 or later)
* Including [HCC](https://github.com/RadeonOpenCompute/hcc) compiler
* Alternatively [HIP-clang](https://github.com/ROCm-Developer-Tools/HIP/blob/master/INSTALL.md#hip-clang) compiler
* Including [HIP-clang](https://github.com/ROCm-Developer-Tools/HIP/blob/master/INSTALL.md#hip-clang) compiler

Optional:

Expand Down Expand Up @@ -43,11 +42,9 @@ cd rocPRIM; mkdir build; cd build
# tests only of a specific architecture is possible for eg: ctest -R gfx803|gfx900
#
# ! IMPORTANT !
# Set C++ compiler to HCC or HIP-clang. You can do it by adding 'CXX=<path-to-compiler>'
# Set C++ compiler to HIP-clang. You can do it by adding 'CXX=<path-to-compiler>'
# before 'cmake' or setting cmake option 'CMAKE_CXX_COMPILER' to path to the compiler.
# Using HCC:
[CXX=hcc] cmake -DBUILD_BENCHMARK=ON ../. # or cmake-gui ../.
# or using HIP-clang:
# Using HIP-clang:
[CXX=hipcc] cmake -DBUILD_BENCHMARK=ON ../.

# Build
Expand Down

0 comments on commit 3bf9f61

Please sign in to comment.