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.

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

Updates for oneAPI beta09 #1365

Merged
merged 1 commit into from
Sep 14, 2020
Merged

Updates for oneAPI beta09 #1365

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
2 changes: 1 addition & 1 deletion Src/Base/AMReX_GpuQualifiers.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
# define AMREX_REQUIRE_SUBGROUP_SIZE(x) \
_Pragma("clang diagnostic push") \
_Pragma("clang diagnostic ignored \"-Wattributes\"") \
[[cl::intel_reqd_sub_group_size(x)]] \
[[intel::reqd_sub_group_size(x)]] \
_Pragma("clang diagnostic pop")
#endif // AMREX_USE_DPCPP

Expand Down
5 changes: 0 additions & 5 deletions Tools/GNUMake/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ else
endif

ifeq ($(USE_DPCPP),TRUE)
ifdef DPCPPROOT
DPCPP_DIR ?= $(DPCPPROOT)
else
DPCPP_DIR ?= /opt/intel/inteloneapi/compiler/latest/linux
endif
override COMP = dpcpp
DEFINES += -DAMREX_USE_DPCPP -DAMREX_USE_GPU
USE_CUDA := FALSE
Expand Down
3 changes: 2 additions & 1 deletion Tools/GNUMake/Make.rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,8 @@ ifeq ($(USE_GPU_PRAGMA),TRUE)
endif
@if [ ! -d $(depEXETempDir) ]; then mkdir -p $(depEXETempDir); fi
ifeq ($(USE_DPCPP),TRUE)
$(CXX) $(CXXDEPFLAGS) $< -o $@
# Use > $@2 to filter out unnecessary messages
$(CXX) $(CXXDEPFLAGS) $< -o $@ > $@2
else ifeq ($(USE_HIP),TRUE)
$(CXX) $(CXXDEPFLAGS) $< -o $@
else
Expand Down
13 changes: 1 addition & 12 deletions Tools/GNUMake/comps/dpcpp.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,6 @@ F90FLAGS =

########################################################################

#clang_version = $(shell $(CXX) --version | head -1 | sed -e 's/.*version.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/')
#clang_major_version = $(shell $(CXX) --version | head -1 | sed -e 's/.*version.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/' | sed -e 's;\..*;;')
#clang_minor_version = $(shell $(CXX) --version | head -1 | sed -e 's/.*version.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/' | sed -e 's;[^.]*\.;;' | sed -e 's;\..*;;')
#
#COMP_VERSION = $(clang_version)
#
#DEFINES += -DBL_CLANG_VERSION='$(clang_version)'
#DEFINES += -DBL_CLANG_MAJOR_VERSION='$(clang_major_version)'
#DEFINES += -DBL_CLANG_MINOR_VERSION='$(clang_minor_version)'

########################################################################

ifeq ($(DEBUG),TRUE)

CXXFLAGS += -g -O0 #-ftrapv
Expand Down Expand Up @@ -156,6 +144,7 @@ override XTRALIBS += -lgfortran -lquadmath

endif

DPCPP_DIR = $(shell dpcpp --version | tail -1 | sed -e 's/InstalledDir: //' | sed -e 's/linux\/bin/linux/')
override XTRAOBJS += $(DPCPP_DIR)/lib/libsycl-glibc.o
LDFLAGS += -device-math-lib=fp32,fp64

Expand Down