Skip to content

Commit

Permalink
CMake & DPC++: Avoid Flag Deduplication (#1388)
Browse files Browse the repository at this point in the history
## Summary

Avoid deduplication of `-mlong-double-64 -Xclang -mlong-double-64` into `-mlong-double-64 -Xclang`.

Update the apt package name, which was changed by upstream for beta09.

Refs.:
- https://gitlab.kitware.com/cmake/cmake/-/issues/15826
- https://gitlab.kitware.com/cmake/cmake/-/merge_requests/1841

## Additional background

## Checklist

The proposed changes:
- [ ] fix a bug or incorrect behavior in AMReX
- [ ] add new capabilities to AMReX
- [ ] changes answers in the test suite to more than roundoff level
- [ ] are likely to significantly affect the results of downstream AMReX users
- [ ] are described in the proposed changes to the AMReX documentation, if appropriate
  • Loading branch information
ax3l authored Sep 21, 2020
1 parent 1cec808 commit 1e35d0d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dependencies/dependencies_dpcpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ sudo apt-get update

sudo apt-get install -y --no-install-recommends \
build-essential \
intel-oneapi-dpcpp-compiler intel-oneapi-mkl \
intel-oneapi-dpcpp-cpp-compiler intel-oneapi-mkl \
g++ gfortran \
libopenmpi-dev \
openmpi-bin
2 changes: 1 addition & 1 deletion Tools/CMake/AMReXSYCL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ target_link_options( SYCL
# https://github.com/intel/llvm/issues/2187
target_compile_options( SYCL
INTERFACE
$<${_cxx_clang}:-mlong-double-64 -Xclang -mlong-double-64>)
$<${_cxx_clang}:-mlong-double-64 "SHELL:-Xclang -mlong-double-64">)

if (ENABLE_DPCPP_AOT)
message(FATAL_ERROR "\nAhead-of-time (AOT) compilation support not available yet.\nRe-configure with ENABLE_DPCPP_AOT=OFF.")
Expand Down

0 comments on commit 1e35d0d

Please sign in to comment.