Skip to content

Commit

Permalink
Require at least gcc7 (#3268)
Browse files Browse the repository at this point in the history
Fixes: #3267
  • Loading branch information
bernhardmgruber authored Jan 8, 2025
1 parent 65a98a4 commit 2da2a52
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 63 deletions.
54 changes: 0 additions & 54 deletions .devcontainer/cuda11.1-gcc6/devcontainer.json

This file was deleted.

2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,8 @@ Unless otherwise specified, CCCL supports the same host compilers as the latest
- [Linux](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#host-compiler-support-policy)
- [Windows](https://docs.nvidia.com/cuda/cuda-installation-guide-microsoft-windows/index.html#system-requirements)

For GCC on Linux, at least 7.x is required.

When using older CUDA Toolkits, we also only support the host compilers of the latest CUDA Toolkit,
but at least the most recent host compiler of any supported older CUDA Toolkit.

Expand Down
9 changes: 4 additions & 5 deletions ci/matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ workflows:

pull_request:
# Old CTK
- {jobs: ['build'], std: 'minmax', ctk: '11.1', cxx: ['gcc6', 'gcc9', 'clang9', 'msvc2017']}
- {jobs: ['build'], std: 'minmax', ctk: '11.1', cxx: ['gcc7', 'gcc9', 'clang9', 'msvc2017']}
# Current CTK build-only
- {jobs: ['build'], std: [11, 14], cxx: ['gcc7', 'clang9']}
- {jobs: ['build'], std: 'max', cxx: ['gcc8', 'gcc9', 'gcc10', 'gcc11', 'gcc12']}
Expand Down Expand Up @@ -55,7 +55,7 @@ workflows:
# Python and c/parallel jobs:
- {jobs: ['test'], project: ['cccl_c_parallel', 'python'], ctk: '12.6'}
# cccl-infra:
- {jobs: ['infra'], project: 'cccl', ctk: '11.1', cxx: ['gcc6', 'clang9']}
- {jobs: ['infra'], project: 'cccl', ctk: '11.1', cxx: ['gcc7', 'clang9']}
- {jobs: ['infra'], project: 'cccl', ctk: '12.0', cxx: ['gcc12', 'clang14']}
- {jobs: ['infra'], project: 'cccl', ctk: 'curr', cxx: ['gcc', 'clang']}

Expand All @@ -65,7 +65,7 @@ workflows:
- {jobs: ['test_gpu'], project: 'thrust', cmake_options: '-DTHRUST_DISPATCH_TYPE=Force32bit'}
- {jobs: ['test_gpu'], project: 'thrust', cmake_options: '-DTHRUST_DISPATCH_TYPE=Force64bit'}
# Old CTK
- {jobs: ['build'], std: 'all', ctk: '11.1', cxx: ['gcc6', 'gcc7', 'gcc8', 'gcc9', 'clang9', 'msvc2017']}
- {jobs: ['build'], std: 'all', ctk: '11.1', cxx: ['gcc7', 'gcc8', 'gcc9', 'clang9', 'msvc2017']}
- {jobs: ['build'], std: 'all', ctk: '11.8', cxx: ['gcc11'], sm: '60;70;80;90'}
# Current CTK build-only
- {jobs: ['build'], std: 'all', cxx: ['gcc7', 'gcc8', 'gcc9', 'gcc10', 'gcc11', 'gcc12']}
Expand Down Expand Up @@ -96,7 +96,7 @@ workflows:
- {jobs: ['test'], project: 'cudax', ctk: [ 'curr'], std: 'all', cxx: ['clang18']}

# # These are waiting on the NVKS nodes:
# - {jobs: ['test'], ctk: '11.1', gpu: 'v100', sm: 'gpu', cxx: 'gcc6', std: [11]}
# - {jobs: ['test'], ctk: '11.1', gpu: 'v100', sm: 'gpu', cxx: 'gcc7', std: [11]}
# - {jobs: ['test'], ctk: '11.1', gpu: 't4', sm: 'gpu', cxx: 'clang9', std: [17]}
# - {jobs: ['test'], ctk: '11.8', gpu: 'rtx2080', sm: 'gpu', cxx: 'gcc11', std: [17]}
# - {jobs: ['test'], ctk: 'curr', gpu: 'rtxa6000', sm: 'gpu', cxx: 'gcc7', std: [14]}
Expand Down Expand Up @@ -151,7 +151,6 @@ host_compilers:
container_tag: 'gcc'
exe: 'g++'
versions:
6: { stds: [11, 14, ] }
7: { stds: [11, 14, 17, ] }
8: { stds: [11, 14, 17, ] }
9: { stds: [11, 14, 17, ] }
Expand Down
4 changes: 2 additions & 2 deletions cub/cub/util_cpp_dialect.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
# ifndef CCCL_IGNORE_DEPRECATED_COMPILER

// Compiler checks:
# if _CCCL_COMPILER(GCC, <, 5)
CUB_COMPILER_DEPRECATION(GCC 5.0);
# if _CCCL_COMPILER(GCC, <, 7)
CUB_COMPILER_DEPRECATION(GCC 7.0);
# elif _CCCL_COMPILER(CLANG, <, 7)
CUB_COMPILER_DEPRECATION(Clang 7.0);
# elif _CCCL_COMPILER(MSVC, <, 19, 10)
Expand Down
4 changes: 2 additions & 2 deletions thrust/thrust/detail/config/cpp_dialect.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
#ifndef CCCL_IGNORE_DEPRECATED_COMPILER

// Compiler checks:
# if _CCCL_COMPILER(GCC, <, 5)
THRUST_COMPILER_DEPRECATION(GCC 5.0);
# if _CCCL_COMPILER(GCC, <, 7)
THRUST_COMPILER_DEPRECATION(GCC 7.0);
# elif _CCCL_COMPILER(CLANG, <, 7)
THRUST_COMPILER_DEPRECATION(Clang 7.0);
# elif _CCCL_COMPILER(MSVC, <, 19, 10)
Expand Down

0 comments on commit 2da2a52

Please sign in to comment.