Skip to content

Supporting clang10 for SLES #708

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.

Sign up for GitHub

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

Merged
saadrahim merged 1 commit into from
Sep 19, 2019
Merged

Supporting clang10 for SLES #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions clients/benchmarks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,14 @@ set( BLIS_LIBRARY ${CMAKE_SOURCE_DIR}/build/deps/blis/lib/libblis.so )


if( OS_ID_rhel OR OS_ID_centos OR OS_ID_sles)
if( OS_ID_rhel OR OS_ID_centos)
set( OPENMP_INCLUDE_DIR /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/include )
set( OPENMP_LIBRARY /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/libgomp.so )
if( OS_ID_rhel OR OS_ID_centos)
set( OPENMP_INCLUDE_DIR /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/include )
set( OPENMP_LIBRARY /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/libgomp.so )
else()
#SLES
set( OPENMP_INCLUDE_DIR /usr/lib64/gcc/x86_64-suse-linux/7/include/ )
set( OPENMP_LIBRARY /usr/lib64/gcc/x86_64-suse-linux/7/libgomp.so )
endif()

if(EXISTS /opt/rocm/hcc/lib/clang/10.0.0/include/immintrin.h)
set( CLANG_INCLUDE_DIR /opt/rocm/hcc/lib/clang/10.0.0/include )
Expand All @@ -78,12 +83,6 @@ if( OS_ID_rhel OR OS_ID_centos OR OS_ID_sles)
else()
error("cannot find immintrin.h")
endif()
else()
#SLES
set( OPENMP_INCLUDE_DIR /usr/lib64/gcc/x86_64-suse-linux/7/include/ )
set( OPENMP_LIBRARY /usr/lib64/gcc/x86_64-suse-linux/7/libgomp.so )
set( CLANG_INCLUDE_DIR /opt/rocm/hcc/lib/clang/9.0.0/include )
endif()

# External header includes included as system files
target_include_directories( rocblas-bench
Expand Down
17 changes: 8 additions & 9 deletions clients/gtest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,14 @@ set( BLIS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/build/deps/blis/include/blis )
set( BLIS_LIBRARY ${CMAKE_SOURCE_DIR}/build/deps/blis/lib/libblis.so )

if( OS_ID_rhel OR OS_ID_centos OR OS_ID_sles)
if( OS_ID_rhel OR OS_ID_centos)
set( OPENMP_INCLUDE_DIR /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/include )
set( OPENMP_LIBRARY /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/libgomp.so )
if( OS_ID_rhel OR OS_ID_centos)
set( OPENMP_INCLUDE_DIR /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/include )
set( OPENMP_LIBRARY /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/libgomp.so )
else()
#SLES
set( OPENMP_INCLUDE_DIR /usr/lib64/gcc/x86_64-suse-linux/7/include/ )
set( OPENMP_LIBRARY /usr/lib64/gcc/x86_64-suse-linux/7/libgomp.so )
endif()

if(EXISTS /opt/rocm/hcc/lib/clang/10.0.0/include/immintrin.h)
set( CLANG_INCLUDE_DIR /opt/rocm/hcc/lib/clang/10.0.0/include )
Expand All @@ -113,12 +118,6 @@ if( OS_ID_rhel OR OS_ID_centos OR OS_ID_sles)
else()
error("cannot find immintrin.h")
endif()
else()
#SLES
set( OPENMP_INCLUDE_DIR /usr/lib64/gcc/x86_64-suse-linux/7/include/ )
set( OPENMP_LIBRARY /usr/lib64/gcc/x86_64-suse-linux/7/libgomp.so )
set( CLANG_INCLUDE_DIR /opt/rocm/hcc/lib/clang/9.0.0/include )
endif()

# External header includes included as system files
target_include_directories( rocblas-test
Expand Down