Skip to content

Add support for ICX compiler instead of DPCPP #3558

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
minitu merged 3 commits into from
Jan 22, 2022
Merged

Add support for ICX compiler instead of DPCPP #3558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8680d2
Use ICX for Intel CPU/GPU platforms
minitu Jan 18, 2022
cdf0b57
Merge branch 'main' into jchoi/icx-build
minitu Jan 21, 2022
321cdda
Merge branch 'main' into jchoi/icx-build
minitu Jan 21, 2022
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
10 changes: 7 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
string(REGEX REPLACE ".*(-.*)" "\\1" CMK_COMPILER_SUFFIX ${mytmp})
endif()
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(CMK_COMPILER clang)
if(CMAKE_CXX_COMPILER MATCHES "(icpx)$")
set(CMK_COMPILER icx)
else()
set(CMK_COMPILER clang)
endif()
get_filename_component(mytmp ${CMAKE_CXX_COMPILER} NAME)
if(mytmp MATCHES "-")
string(REGEX REPLACE ".*(-.*)" "\\1" CMK_COMPILER_SUFFIX ${mytmp})
Expand Down Expand Up @@ -606,8 +610,8 @@ endif()
configure_file(src/arch/common/cc-bluegene.sh include/ COPYONLY)
configure_file(src/arch/common/cc-clang.sh include/ COPYONLY)
configure_file(src/arch/common/cc-clang.h include/ COPYONLY)
configure_file(src/arch/common/cc-dpcpp.sh include/ COPYONLY)
configure_file(src/arch/common/cc-dpcpp.h include/ COPYONLY)
configure_file(src/arch/common/cc-icx.sh include/ COPYONLY)
configure_file(src/arch/common/cc-icx.h include/ COPYONLY)
configure_file(src/arch/common/cc-craycc.h include/ COPYONLY)
configure_file(src/arch/common/cc-craycc.sh include/ COPYONLY)
configure_file(src/arch/common/cc-msvc.h include/ COPYONLY)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ for more information:

will give:

Supported compilers: clang craycc gcc icc iccstatic msvc pgcc xlc xlc64 dpcpp
Supported compilers: clang craycc gcc icc iccstatic msvc pgcc xlc xlc64 icx
Supported options: common cuda flang gfortran ifort local nolb omp ooc papi perftools persistent pgf90 pxshm smp syncft sysvshm tcp tsan


Expand Down
4 changes: 2 additions & 2 deletions buildcmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@ function parse_platform_compilers() {
opt_FC=flang
opt_compiler+=("$arg")
;;
dpcpp)
icx)
opt_CC=icx
opt_CXX=dpcpp
opt_CXX=icpx
opt_compiler+=("$arg")
;;
icc|iccstatic)
Expand Down
4 changes: 2 additions & 2 deletions buildold
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ syntax() {
( cd "$src" ; ls -1 | egrep -v '(^mpi$)|(^netlrts?$)|(^multicore$)|(^util$)|(^common$)|(^win$)|(^gni$)|(^pami(lrts)?$)|(^verbs$)|(^ofi$)|(^ucx$)|(^template$)|(^cuda$)' | pr -3 -t )
echo ''
echo '<options>: compiler and platform specific options'
echo 'icc iccstatic xlc xlc64 gcc clang dpcpp pgcc cc mpicxx'
echo 'icc iccstatic xlc xlc64 gcc clang icx pgcc cc mpicxx'
echo 'help smp omp tcp ooc syncft papi pthreads'
echo '--incdir --libdir --basedir --build-shared --destination --suffix -j'
if test $more = 1
Expand All @@ -50,7 +50,7 @@ syntax() {
echo ' xlc, xlc64 IBM XL compilers (with 64-bit option on architectures with 32-bit modes)'
echo ' gcc GNU compiler collection (on platforms where the default differs)'
echo ' clang Clang C/C++ compiler (including bgclang)'
echo ' dpcpp Intel oneAPI DPC++/C++ compiler'
echo ' icx Intel oneAPI DPC++/C++ compiler'
echo ' pgcc Portland Group compilers'
echo ''
echo 'Choose an alternative fortran compiler (only one option is allowed from this section):'
Expand Down
0 src/arch/common/cc-dpcpp.h → src/arch/common/cc-icx.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/arch/common/cc-dpcpp.sh → src/arch/common/cc-icx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ CMK_CPP_CHARM="cpp -P"
CMK_CPP_C="icx$CMK_COMPILER_SUFFIX"
CMK_CC="icx$CMK_COMPILER_SUFFIX"
CMK_LD="icx$CMK_COMPILER_SUFFIX"
CMK_CXX="dpcpp$CMK_COMPILER_SUFFIX"
CMK_LDXX="dpcpp$CMK_COMPILER_SUFFIX"
CMK_CXX="icpx$CMK_COMPILER_SUFFIX"
CMK_LDXX="icpx$CMK_COMPILER_SUFFIX"

CMK_CPP_C_FLAGS="-E"

Expand Down