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.

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

[SYCL] Move SYCL headers from CL/ to sycl/ #6407

Merged
merged 13 commits into from
Jul 13, 2022

Conversation

aelovikov-intel
Copy link
Contributor

CL/sycl.hpp is changed to include sycl/sycl.hpp.

No deprecation warning emitted as the header is required by the SYCL 2020
for backward compatibility.

@aelovikov-intel
Copy link
Contributor Author

/verify with intel/llvm-test-suite#1078

1 similar comment
@aelovikov-intel
Copy link
Contributor Author

/verify with intel/llvm-test-suite#1078

aelovikov-intel added a commit to aelovikov-intel/llvm-test-suite that referenced this pull request Jul 8, 2022
Also, CL/sycl.hpp -> sycl/sycl.hpp.

This change is complementary to intel/llvm#6407.
@aelovikov-intel
Copy link
Contributor Author

/verify with intel/llvm-test-suite#1078

@aelovikov-intel
Copy link
Contributor Author

/verify with intel/llvm-test-suite#1078

@aelovikov-intel
Copy link
Contributor Author

/verify with intel/llvm-test-suite#1078

Quoting SYCL 2020:

  For compatibility with SYCL 1.2.1, SYCL provides another standard header file:
  <CL/sycl.hpp>, which can be included in place of <sycl/sycl.hpp>. In that
  case, all SYCL classes, constants, types and functions defined by this
  specification should exist within the ::cl::sycl C++ namespace.
@aelovikov-intel
Copy link
Contributor Author

/verify with intel/llvm-test-suite#1078

@aelovikov-intel aelovikov-intel marked this pull request as ready for review July 11, 2022 19:29
@aelovikov-intel aelovikov-intel requested review from a team as code owners July 11, 2022 19:29
Copy link
Contributor

@bader bader left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert of llvm-spirv changes looks good to me. Let's consider that all approves are still in place.
If @intel/dpcpp-specification-reviewers team approves, we can merge this PR.

@aelovikov-intel
Copy link
Contributor Author

/verify with intel/llvm-test-suite#1078

@aelovikov-intel
Copy link
Contributor Author

@intel/dpcpp-specification-reviewers , can you please take a look at the relevant part of this?

asudarsa
asudarsa previously approved these changes Jul 12, 2022
Copy link
Contributor

@asudarsa asudarsa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

llvm-SPIRV changes LGTM. Thanks

v-klochkov
v-klochkov previously approved these changes Jul 12, 2022
smanna12
smanna12 previously approved these changes Jul 12, 2022
jbrodman
jbrodman previously approved these changes Jul 13, 2022
Copy link
Contributor

@jbrodman jbrodman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@aelovikov-intel
Copy link
Contributor Author

/verify with intel/llvm-test-suite#1078

@jbrodman jbrodman self-requested a review July 13, 2022 15:12
Copy link
Contributor

@asudarsa asudarsa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks

@againull againull merged commit ee93fbc into intel:sycl Jul 13, 2022
@aelovikov-intel aelovikov-intel deleted the move-includes branch July 13, 2022 23:48
yhmtsai added a commit to yhmtsai/oneMKL that referenced this pull request Aug 1, 2022
yhmtsai added a commit to yhmtsai/oneMKL that referenced this pull request Aug 1, 2022
mkrainiuk pushed a commit to oneapi-src/oneMKL that referenced this pull request Aug 31, 2022
* use the correct sycl path after intel/llvm#6407

* fix the missing sycl/sycl.hpp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants