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

Jump to bottom

Fix hardcoding __THRUST_HOST_SYSTEM_NAMESPACE to cpp #2341

Merged
merged 1 commit into from
Aug 31, 2024
Merged

Fix hardcoding __THRUST_HOST_SYSTEM_NAMESPACE to cpp #2341

merged 1 commit into from
Aug 31, 2024

Conversation

bernhardmgruber
Copy link
Contributor

This change was erroneously introduced in 91b78d8;

Fixes: #2098

@bernhardmgruber
Fix hardcoding __THRUST_HOST_SYSTEM_NAMESPACE to cpp
81a9d80 
This change was erroneously introduced in 91b78d8

Fixes: NVIDIA#2098
@bernhardmgruber bernhardmgruber mentioned this pull request Aug 30, 2024
Closed
1 task
@bernhardmgruber bernhardmgruber added the thrust For all items related to Thrust. label Aug 30, 2024
@github-actions GitHub Actions
Copy link
Contributor

🟩 CI finished in 4h 37m: Pass: 100%/251 | Total: 1d 07h | Avg: 7m 25s | Max: 36m 45s | Hits: 99%/17373

  • 🟩 cub: Pass: 100%/132 | Total: 18h 54m | Avg: 8m 35s | Max: 36m 45s | Hits: 99%/4296 

    🟩 cpu
  🟩 amd64              Pass: 100%/124 | Total: 18h 22m | Avg:  8m 53s | Max: 36m 45s | Hits:  99%/4296  
  🟩 arm64              Pass: 100%/8   | Total: 32m 10s | Avg:  4m 01s | Max:  4m 17s
🟩 ctk
  🟩 11.1               Pass: 100%/15  | Total:  1h 04m | Avg:  4m 18s | Max: 14m 05s | Hits:  99%/716   
  🟩 11.8               Pass: 100%/3   | Total: 13m 53s | Avg:  4m 37s | Max:  5m 15s
  🟩 12.5               Pass: 100%/114 | Total: 17h 35m | Avg:  9m 15s | Max: 36m 45s | Hits:  99%/3580  
🟩 cudacxx
  🟩 ClangCUDA17        Pass: 100%/2   | Total:  7m 26s | Avg:  3m 43s | Max:  3m 47s
  🟩 nvcc11.1           Pass: 100%/15  | Total:  1h 04m | Avg:  4m 18s | Max: 14m 05s | Hits:  99%/716   
  🟩 nvcc11.8           Pass: 100%/3   | Total: 13m 53s | Avg:  4m 37s | Max:  5m 15s
  🟩 nvcc12.5           Pass: 100%/112 | Total: 17h 28m | Avg:  9m 21s | Max: 36m 45s | Hits:  99%/3580  
🟩 cudacxx_family
  🟩 ClangCUDA          Pass: 100%/2   | Total:  7m 26s | Avg:  3m 43s | Max:  3m 47s
  🟩 nvcc               Pass: 100%/130 | Total: 18h 46m | Avg:  8m 40s | Max: 36m 45s | Hits:  99%/4296  
🟩 cxx
  🟩 Clang9             Pass: 100%/6   | Total: 26m 48s | Avg:  4m 28s | Max:  5m 14s
  🟩 Clang10            Pass: 100%/3   | Total: 15m 11s | Avg:  5m 03s | Max:  5m 09s
  🟩 Clang11            Pass: 100%/4   | Total: 18m 01s | Avg:  4m 30s | Max:  4m 50s
  🟩 Clang12            Pass: 100%/4   | Total: 17m 58s | Avg:  4m 29s | Max:  4m 38s
  🟩 Clang13            Pass: 100%/4   | Total: 18m 05s | Avg:  4m 31s | Max:  5m 06s
  🟩 Clang14            Pass: 100%/4   | Total: 17m 53s | Avg:  4m 28s | Max:  4m 45s
  🟩 Clang15            Pass: 100%/4   | Total: 18m 12s | Avg:  4m 33s | Max:  4m 47s
  🟩 Clang16            Pass: 100%/4   | Total: 18m 33s | Avg:  4m 38s | Max:  4m 54s
  🟩 Clang17            Pass: 100%/26  | Total:  5h 48m | Avg: 13m 24s | Max: 31m 33s
  🟩 GCC6               Pass: 100%/2   | Total:  7m 24s | Avg:  3m 42s | Max:  3m 58s
  🟩 GCC7               Pass: 100%/6   | Total: 23m 09s | Avg:  3m 51s | Max:  4m 55s
  🟩 GCC8               Pass: 100%/6   | Total: 23m 21s | Avg:  3m 53s | Max:  4m 23s
  🟩 GCC9               Pass: 100%/6   | Total: 23m 46s | Avg:  3m 57s | Max:  4m 36s
  🟩 GCC10              Pass: 100%/4   | Total: 17m 29s | Avg:  4m 22s | Max:  4m 34s
  🟩 GCC11              Pass: 100%/7   | Total: 32m 58s | Avg:  4m 42s | Max:  5m 15s
  🟩 GCC12              Pass: 100%/4   | Total: 18m 25s | Avg:  4m 36s | Max:  4m 55s
  🟩 GCC13              Pass: 100%/29  | Total:  6h 37m | Avg: 13m 41s | Max: 36m 45s
  🟩 Intel2023.2.0      Pass: 100%/3   | Total: 15m 55s | Avg:  5m 18s | Max:  5m 29s
  🟩 MSVC14.16          Pass: 100%/1   | Total: 14m 05s | Avg: 14m 05s | Max: 14m 05s | Hits:  99%/716   
  🟩 MSVC14.29          Pass: 100%/2   | Total: 23m 31s | Avg: 11m 45s | Max: 12m 22s | Hits:  99%/1432  
  🟩 MSVC14.39          Pass: 100%/3   | Total: 37m 37s | Avg: 12m 32s | Max: 12m 59s | Hits:  99%/2148  
🟩 cxx_family
  🟩 Clang              Pass: 100%/59  | Total:  8h 19m | Avg:  8m 27s | Max: 31m 33s
  🟩 GCC                Pass: 100%/64  | Total:  9h 03m | Avg:  8m 29s | Max: 36m 45s
  🟩 Intel              Pass: 100%/3   | Total: 15m 55s | Avg:  5m 18s | Max:  5m 29s
  🟩 MSVC               Pass: 100%/6   | Total:  1h 15m | Avg: 12m 32s | Max: 14m 05s | Hits:  99%/4296  
🟩 gpu
  🟩 v100               Pass: 100%/132 | Total: 18h 54m | Avg:  8m 35s | Max: 36m 45s | Hits:  99%/4296  
🟩 jobs
  🟩 Build              Pass: 100%/99  | Total:  7h 59m | Avg:  4m 50s | Max: 14m 05s | Hits:  99%/4296  
  🟩 DeviceLaunch       Pass: 100%/8   | Total:  2h 20m | Avg: 17m 30s | Max: 20m 26s
  🟩 GraphCapture       Pass: 100%/8   | Total:  2h 02m | Avg: 15m 15s | Max: 18m 15s
  🟩 HostLaunch         Pass: 100%/8   | Total:  2h 22m | Avg: 17m 46s | Max: 20m 30s
  🟩 SmallGMem          Pass: 100%/1   | Total: 36m 45s | Avg: 36m 45s | Max: 36m 45s
  🟩 TestGPU            Pass: 100%/8   | Total:  3h 34m | Avg: 26m 46s | Max: 33m 33s
🟩 sm
  🟩 60;70;80;90        Pass: 100%/3   | Total: 13m 53s | Avg:  4m 37s | Max:  5m 15s
  🟩 90a                Pass: 100%/4   | Total: 14m 41s | Avg:  3m 40s | Max:  3m 53s
🟩 std
  🟩 11                 Pass: 100%/34  | Total:  4h 20m | Avg:  7m 40s | Max: 33m 33s
  🟩 14                 Pass: 100%/37  | Total:  4h 57m | Avg:  8m 01s | Max: 31m 33s | Hits:  99%/2148  
  🟩 17                 Pass: 100%/37  | Total:  5h 45m | Avg:  9m 20s | Max: 36m 45s | Hits:  99%/1432  
  🟩 20                 Pass: 100%/24  | Total:  3h 50m | Avg:  9m 36s | Max: 27m 33s | Hits:  99%/716

  • 🟩 thrust: Pass: 100%/118 | Total: 11h 55m | Avg: 6m 03s | Max: 22m 55s | Hits: 99%/13077 

    🟩 cpu
  🟩 amd64              Pass: 100%/110 | Total: 11h 24m | Avg:  6m 13s | Max: 22m 55s | Hits:  99%/13077 
  🟩 arm64              Pass: 100%/8   | Total: 30m 41s | Avg:  3m 50s | Max:  4m 29s
🟩 ctk
  🟩 11.1               Pass: 100%/15  | Total:  1h 06m | Avg:  4m 27s | Max: 17m 54s | Hits:  99%/1453  
  🟩 11.8               Pass: 100%/3   | Total: 12m 43s | Avg:  4m 14s | Max:  4m 20s
  🟩 12.5               Pass: 100%/100 | Total: 10h 35m | Avg:  6m 21s | Max: 22m 55s | Hits:  99%/11624 
🟩 cudacxx
  🟩 ClangCUDA17        Pass: 100%/2   | Total:  8m 03s | Avg:  4m 01s | Max:  4m 11s
  🟩 nvcc11.1           Pass: 100%/15  | Total:  1h 06m | Avg:  4m 27s | Max: 17m 54s | Hits:  99%/1453  
  🟩 nvcc11.8           Pass: 100%/3   | Total: 12m 43s | Avg:  4m 14s | Max:  4m 20s
  🟩 nvcc12.5           Pass: 100%/98  | Total: 10h 27m | Avg:  6m 24s | Max: 22m 55s | Hits:  99%/11624 
🟩 cudacxx_family
  🟩 ClangCUDA          Pass: 100%/2   | Total:  8m 03s | Avg:  4m 01s | Max:  4m 11s
  🟩 nvcc               Pass: 100%/116 | Total: 11h 47m | Avg:  6m 05s | Max: 22m 55s | Hits:  99%/13077 
🟩 cxx
  🟩 Clang9             Pass: 100%/6   | Total: 25m 35s | Avg:  4m 15s | Max:  5m 06s
  🟩 Clang10            Pass: 100%/3   | Total: 14m 17s | Avg:  4m 45s | Max:  4m 55s
  🟩 Clang11            Pass: 100%/4   | Total: 16m 08s | Avg:  4m 02s | Max:  4m 10s
  🟩 Clang12            Pass: 100%/4   | Total: 16m 30s | Avg:  4m 07s | Max:  4m 44s
  🟩 Clang13            Pass: 100%/4   | Total: 16m 28s | Avg:  4m 07s | Max:  4m 35s
  🟩 Clang14            Pass: 100%/4   | Total: 16m 26s | Avg:  4m 06s | Max:  4m 28s
  🟩 Clang15            Pass: 100%/4   | Total: 17m 12s | Avg:  4m 18s | Max:  4m 41s
  🟩 Clang16            Pass: 100%/4   | Total: 16m 57s | Avg:  4m 14s | Max:  4m 25s
  🟩 Clang17            Pass: 100%/18  | Total:  2h 06m | Avg:  7m 01s | Max: 17m 52s
  🟩 GCC6               Pass: 100%/2   | Total:  6m 50s | Avg:  3m 25s | Max:  4m 00s
  🟩 GCC7               Pass: 100%/6   | Total: 22m 48s | Avg:  3m 48s | Max:  4m 29s
  🟩 GCC8               Pass: 100%/6   | Total: 21m 35s | Avg:  3m 35s | Max:  3m 53s
  🟩 GCC9               Pass: 100%/6   | Total: 22m 02s | Avg:  3m 40s | Max:  4m 21s
  🟩 GCC10              Pass: 100%/4   | Total: 16m 55s | Avg:  4m 13s | Max:  4m 42s
  🟩 GCC11              Pass: 100%/7   | Total: 30m 41s | Avg:  4m 23s | Max:  5m 00s
  🟩 GCC12              Pass: 100%/4   | Total: 16m 56s | Avg:  4m 14s | Max:  4m 30s
  🟩 GCC13              Pass: 100%/20  | Total:  2h 22m | Avg:  7m 06s | Max: 18m 01s
  🟩 Intel2023.2.0      Pass: 100%/3   | Total: 15m 06s | Avg:  5m 02s | Max:  5m 15s
  🟩 MSVC14.16          Pass: 100%/1   | Total: 17m 54s | Avg: 17m 54s | Max: 17m 54s | Hits:  99%/1453  
  🟩 MSVC14.29          Pass: 100%/2   | Total: 29m 34s | Avg: 14m 47s | Max: 15m 30s | Hits:  99%/2906  
  🟩 MSVC14.39          Pass: 100%/6   | Total:  1h 47m | Avg: 17m 50s | Max: 22m 55s | Hits:  99%/8718  
🟩 cxx_family
  🟩 Clang              Pass: 100%/51  | Total:  4h 26m | Avg:  5m 13s | Max: 17m 52s
  🟩 GCC                Pass: 100%/55  | Total:  4h 39m | Avg:  5m 05s | Max: 18m 01s
  🟩 Intel              Pass: 100%/3   | Total: 15m 06s | Avg:  5m 02s | Max:  5m 15s
  🟩 MSVC               Pass: 100%/9   | Total:  2h 34m | Avg: 17m 10s | Max: 22m 55s | Hits:  99%/13077 
🟩 gpu
  🟩 v100               Pass: 100%/118 | Total: 11h 55m | Avg:  6m 03s | Max: 22m 55s | Hits:  99%/13077 
🟩 jobs
  🟩 Build              Pass: 100%/99  | Total:  7h 54m | Avg:  4m 47s | Max: 17m 54s | Hits:  99%/8718  
  🟩 TestCPU            Pass: 100%/11  | Total:  1h 53m | Avg: 10m 19s | Max: 22m 55s | Hits:  99%/4359  
  🟩 TestGPU            Pass: 100%/8   | Total:  2h 07m | Avg: 15m 54s | Max: 18m 01s
🟩 sm
  🟩 60;70;80;90        Pass: 100%/3   | Total: 12m 43s | Avg:  4m 14s | Max:  4m 20s
  🟩 90a                Pass: 100%/4   | Total: 14m 28s | Avg:  3m 37s | Max:  3m 48s
🟩 std
  🟩 11                 Pass: 100%/30  | Total:  2h 18m | Avg:  4m 37s | Max: 16m 17s
  🟩 14                 Pass: 100%/34  | Total:  3h 44m | Avg:  6m 36s | Max: 22m 55s | Hits:  99%/5812  
  🟩 17                 Pass: 100%/33  | Total:  3h 26m | Avg:  6m 16s | Max: 19m 15s | Hits:  99%/4359  
  🟩 20                 Pass: 100%/21  | Total:  2h 25m | Avg:  6m 54s | Max: 19m 12s | Hits:  99%/2906

  • 🟩 pycuda: Pass: 100%/1 | Total: 13m 03s | Avg: 13m 03s | Max: 13m 03s

     
    🟩 cpu
  🟩 amd64              Pass: 100%/1   | Total: 13m 03s | Avg: 13m 03s | Max: 13m 03s
🟩 ctk
  🟩 12.5               Pass: 100%/1   | Total: 13m 03s | Avg: 13m 03s | Max: 13m 03s
🟩 cudacxx
  🟩 nvcc12.5           Pass: 100%/1   | Total: 13m 03s | Avg: 13m 03s | Max: 13m 03s
🟩 cudacxx_family
  🟩 nvcc               Pass: 100%/1   | Total: 13m 03s | Avg: 13m 03s | Max: 13m 03s
🟩 cxx
  🟩 GCC13              Pass: 100%/1   | Total: 13m 03s | Avg: 13m 03s | Max: 13m 03s
🟩 cxx_family
  🟩 GCC                Pass: 100%/1   | Total: 13m 03s | Avg: 13m 03s | Max: 13m 03s
🟩 gpu
  🟩 v100               Pass: 100%/1   | Total: 13m 03s | Avg: 13m 03s | Max: 13m 03s
🟩 jobs
  🟩 Test               Pass: 100%/1   | Total: 13m 03s | Avg: 13m 03s | Max: 13m 03s

👃 Inspect Changes

Modifications in project?

Project
CCCL Infrastructure
libcu++
CUB
+/- Thrust
CUDA Experimental
pycuda

Modifications in project or dependencies?

Project
CCCL Infrastructure
libcu++
+/- CUB
+/- Thrust
CUDA Experimental
+/- pycuda

🏃‍ Runner counts (total jobs: 251)
# Runner
178 linux-amd64-cpu16
42 linux-amd64-gpu-v100-latest-1
16 linux-arm64-cpu16
15 windows-amd64-cpu16

@bernhardmgruber bernhardmgruber marked this pull request as ready for review August 31, 2024 18:42
@bernhardmgruber bernhardmgruber requested review from a team as code owners August 31, 2024 18:42
@bernhardmgruber bernhardmgruber merged commit 0a40182 into NVIDIA:main Aug 31, 2024
267 checks passed
@bernhardmgruber bernhardmgruber deleted the fix_cpp branch August 31, 2024 18:42
wmaxey pushed a commit that referenced this pull request Sep 4, 2024
@bernhardmgruber @wmaxey
Fix hardcoding __THRUST_HOST_SYSTEM_NAMESPACE to cpp (#2341)
e2039e5 
This change was erroneously introduced in 91b78d8

Fixes: #2098
wmaxey pushed a commit that referenced this pull request Sep 4, 2024
@bernhardmgruber @wmaxey
Fix hardcoding __THRUST_HOST_SYSTEM_NAMESPACE to cpp (#2341)
abb9cb7 
This change was erroneously introduced in 91b78d8

Fixes: #2098
wmaxey added a commit that referenced this pull request Sep 10, 2024
@wmaxey @alliepiper @bernhardmgruber
Backport PR #2332 and #2341 (#2368)
9019a6a 
* Update CCCL version to 2.6.1

* Do not hardcode Thrust's host system to cpp. (#2332)

* Fix hardcoding __THRUST_HOST_SYSTEM_NAMESPACE to cpp (#2341)

This change was erroneously introduced in 91b78d8

Fixes: #2098

---------

Co-authored-by: Allison Piper <[email protected]>
Co-authored-by: Bernhard Manfred Gruber <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alliepiper alliepiper alliepiper approved these changes

@miscco miscco Awaiting requested review from miscco miscco is a code owner automatically assigned from NVIDIA/cccl-thrust-codeowners

@fbusato fbusato Awaiting requested review from fbusato fbusato is a code owner automatically assigned from NVIDIA/cccl-codeowners

Assignees
No one assigned
Labels
thrust For all items related to Thrust.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[BUG]: Regression: Using Thrust OpenMP and CUDA back ends at the same time
2 participants
@bernhardmgruber @alliepiper