Skip to content

[SYCL][CUDA] Fixes CUDA unit tests that uses SYCL directly #1763

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

Merged
merged 1 commit into from
May 29, 2020

Conversation

steffenlarsen
Copy link
Contributor

CUDA-specific unit tests that use SYCL directly fail if another backend is in use. This fixes this by actively selecting CUDA platforms and only runs the tests on these.

Signed-off-by: Steffen Larsen steffen.larsen@codeplay.com

vladimirlaz
vladimirlaz previously approved these changes May 28, 2020
s-kanaev
s-kanaev previously approved these changes May 29, 2020
@bader bader added the cuda CUDA back-end label May 29, 2020
@bader
Copy link
Contributor

bader commented May 29, 2020

@steffenlarsen, I looks like this PR conflicts with recently merged #1735. Could you resolve the conflict, please?

@steffenlarsen
Copy link
Contributor Author

@steffenlarsen, I looks like this PR conflicts with recently merged #1735. Could you resolve the conflict, please?

The merge conflict has been fixed. I noticed that the conflicting change had a better way of selecting the valid platform, so I adopted it.

@steffenlarsen steffenlarsen force-pushed the steffen/fix-cuda-sycl-unittests branch from 8778e16 to ee7ef20 Compare May 29, 2020 09:32
CUDA-specific unit tests that use SYCL directly fail if another backend
is in use. This commit fixes this by actively selecting CUDA platforms
and only runs the tests on these.

Signed-off-by: Steffen Larsen <steffen.larsen@codeplay.com>
@steffenlarsen steffenlarsen force-pushed the steffen/fix-cuda-sycl-unittests branch from ee7ef20 to b29ee99 Compare May 29, 2020 09:36
@bader bader requested review from s-kanaev and vladimirlaz May 29, 2020 09:39
@bader bader merged commit 0c2e99c into intel:sycl May 29, 2020
alexbatashev pushed a commit to alexbatashev/llvm that referenced this pull request Jun 2, 2020
* upstream/sycl:
  [SYCL] Handle KernelName templated using type with enum template argument (intel#1780)
  [SYCL] Fix KernelNameInfo generated for empty template parameter pack (intel#1775)
  [SYCL] Do not export utility methods from SYCLMemObjT (intel#1768)
  [Driver][SYCL] Fix processing when using -fsycl-link (intel#1765)
  [SYCL][NFC] Remove outdated confusing comment (intel#1779)
  [SYCL][NFC] Wrap classes in .cpp into a namespace to disable external linkage. (intel#1776)
  [SYCL][CUDA] Fixes CUDA unit tests that uses SYCL directly (intel#1763)
  [SYCL][Doc] Fix default device selection rules doc (intel#1769)
  [SYCL][CUDA] Remove pi Event Callback implementation (intel#1735)
  [SYCL] Throw exception if range/offset of kernel execution exceeds INT_MAX (intel#1713)
  [SYCL-PTX] Add intermediate layer to libclc to ease type management (intel#1712)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cuda CUDA back-end
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants