Skip to content

Commit 83e6c95

Browse files
jrhemstadjrhemstad
committed
Remove CXX and CUDAHOSTCXX definitions.
These are defined in the base images.
1 parent 35b7e49 commit 83e6c95

File tree

21 files changed

+21
-62
lines changed

21 files changed

+21
-62
lines changed

‎.devcontainer/cuda11.1-gcc6/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "11.1",
1919
"CCCL_HOST_COMPILER": "gcc",
2020
"CCCL_HOST_COMPILER_VERSION": "6",
21-
"CCCL_BUILD_INFIX": "cuda11.1-gcc6",
22-
"CXX": "g++",
23-
"CUDAHOSTCXX": "g++"
21+
"CCCL_BUILD_INFIX": "cuda11.1-gcc6"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda11.1-gcc7/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "11.1",
1919
"CCCL_HOST_COMPILER": "gcc",
2020
"CCCL_HOST_COMPILER_VERSION": "7",
21-
"CCCL_BUILD_INFIX": "cuda11.1-gcc7",
22-
"CXX": "g++",
23-
"CUDAHOSTCXX": "g++"
21+
"CCCL_BUILD_INFIX": "cuda11.1-gcc7"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda11.1-gcc8/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "11.1",
1919
"CCCL_HOST_COMPILER": "gcc",
2020
"CCCL_HOST_COMPILER_VERSION": "8",
21-
"CCCL_BUILD_INFIX": "cuda11.1-gcc8",
22-
"CXX": "g++",
23-
"CUDAHOSTCXX": "g++"
21+
"CCCL_BUILD_INFIX": "cuda11.1-gcc8"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda11.1-gcc9/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "11.1",
1919
"CCCL_HOST_COMPILER": "gcc",
2020
"CCCL_HOST_COMPILER_VERSION": "9",
21-
"CCCL_BUILD_INFIX": "cuda11.1-gcc9",
22-
"CXX": "g++",
23-
"CUDAHOSTCXX": "g++"
21+
"CCCL_BUILD_INFIX": "cuda11.1-gcc9"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda11.1-llvm9/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "11.1",
1919
"CCCL_HOST_COMPILER": "llvm",
2020
"CCCL_HOST_COMPILER_VERSION": "9",
21-
"CCCL_BUILD_INFIX": "cuda11.1-llvm9",
22-
"CXX": "clang++",
23-
"CUDAHOSTCXX": "clang++"
21+
"CCCL_BUILD_INFIX": "cuda11.1-llvm9"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda12.3-gcc10/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "12.3",
1919
"CCCL_HOST_COMPILER": "gcc",
2020
"CCCL_HOST_COMPILER_VERSION": "10",
21-
"CCCL_BUILD_INFIX": "cuda12.3-gcc10",
22-
"CXX": "g++",
23-
"CUDAHOSTCXX": "g++"
21+
"CCCL_BUILD_INFIX": "cuda12.3-gcc10"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda12.3-gcc11/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "12.3",
1919
"CCCL_HOST_COMPILER": "gcc",
2020
"CCCL_HOST_COMPILER_VERSION": "11",
21-
"CCCL_BUILD_INFIX": "cuda12.3-gcc11",
22-
"CXX": "g++",
23-
"CUDAHOSTCXX": "g++"
21+
"CCCL_BUILD_INFIX": "cuda12.3-gcc11"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda12.3-gcc12/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "12.3",
1919
"CCCL_HOST_COMPILER": "gcc",
2020
"CCCL_HOST_COMPILER_VERSION": "12",
21-
"CCCL_BUILD_INFIX": "cuda12.3-gcc12",
22-
"CXX": "g++",
23-
"CUDAHOSTCXX": "g++"
21+
"CCCL_BUILD_INFIX": "cuda12.3-gcc12"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda12.3-gcc7/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "12.3",
1919
"CCCL_HOST_COMPILER": "gcc",
2020
"CCCL_HOST_COMPILER_VERSION": "7",
21-
"CCCL_BUILD_INFIX": "cuda12.3-gcc7",
22-
"CXX": "g++",
23-
"CUDAHOSTCXX": "g++"
21+
"CCCL_BUILD_INFIX": "cuda12.3-gcc7"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda12.3-gcc8/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "12.3",
1919
"CCCL_HOST_COMPILER": "gcc",
2020
"CCCL_HOST_COMPILER_VERSION": "8",
21-
"CCCL_BUILD_INFIX": "cuda12.3-gcc8",
22-
"CXX": "g++",
23-
"CUDAHOSTCXX": "g++"
21+
"CCCL_BUILD_INFIX": "cuda12.3-gcc8"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda12.3-gcc9/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "12.3",
1919
"CCCL_HOST_COMPILER": "gcc",
2020
"CCCL_HOST_COMPILER_VERSION": "9",
21-
"CCCL_BUILD_INFIX": "cuda12.3-gcc9",
22-
"CXX": "g++",
23-
"CUDAHOSTCXX": "g++"
21+
"CCCL_BUILD_INFIX": "cuda12.3-gcc9"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda12.3-llvm10/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "12.3",
1919
"CCCL_HOST_COMPILER": "llvm",
2020
"CCCL_HOST_COMPILER_VERSION": "10",
21-
"CCCL_BUILD_INFIX": "cuda12.3-llvm10",
22-
"CXX": "clang++",
23-
"CUDAHOSTCXX": "clang++"
21+
"CCCL_BUILD_INFIX": "cuda12.3-llvm10"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda12.3-llvm11/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "12.3",
1919
"CCCL_HOST_COMPILER": "llvm",
2020
"CCCL_HOST_COMPILER_VERSION": "11",
21-
"CCCL_BUILD_INFIX": "cuda12.3-llvm11",
22-
"CXX": "clang++",
23-
"CUDAHOSTCXX": "clang++"
21+
"CCCL_BUILD_INFIX": "cuda12.3-llvm11"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda12.3-llvm12/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "12.3",
1919
"CCCL_HOST_COMPILER": "llvm",
2020
"CCCL_HOST_COMPILER_VERSION": "12",
21-
"CCCL_BUILD_INFIX": "cuda12.3-llvm12",
22-
"CXX": "clang++",
23-
"CUDAHOSTCXX": "clang++"
21+
"CCCL_BUILD_INFIX": "cuda12.3-llvm12"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda12.3-llvm13/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "12.3",
1919
"CCCL_HOST_COMPILER": "llvm",
2020
"CCCL_HOST_COMPILER_VERSION": "13",
21-
"CCCL_BUILD_INFIX": "cuda12.3-llvm13",
22-
"CXX": "clang++",
23-
"CUDAHOSTCXX": "clang++"
21+
"CCCL_BUILD_INFIX": "cuda12.3-llvm13"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda12.3-llvm14/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "12.3",
1919
"CCCL_HOST_COMPILER": "llvm",
2020
"CCCL_HOST_COMPILER_VERSION": "14",
21-
"CCCL_BUILD_INFIX": "cuda12.3-llvm14",
22-
"CXX": "clang++",
23-
"CUDAHOSTCXX": "clang++"
21+
"CCCL_BUILD_INFIX": "cuda12.3-llvm14"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda12.3-llvm15/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "12.3",
1919
"CCCL_HOST_COMPILER": "llvm",
2020
"CCCL_HOST_COMPILER_VERSION": "15",
21-
"CCCL_BUILD_INFIX": "cuda12.3-llvm15",
22-
"CXX": "clang++",
23-
"CUDAHOSTCXX": "clang++"
21+
"CCCL_BUILD_INFIX": "cuda12.3-llvm15"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda12.3-llvm16/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "12.3",
1919
"CCCL_HOST_COMPILER": "llvm",
2020
"CCCL_HOST_COMPILER_VERSION": "16",
21-
"CCCL_BUILD_INFIX": "cuda12.3-llvm16",
22-
"CXX": "clang++",
23-
"CUDAHOSTCXX": "clang++"
21+
"CCCL_BUILD_INFIX": "cuda12.3-llvm16"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/cuda12.3-llvm9/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "12.3",
1919
"CCCL_HOST_COMPILER": "llvm",
2020
"CCCL_HOST_COMPILER_VERSION": "9",
21-
"CCCL_BUILD_INFIX": "cuda12.3-llvm9",
22-
"CXX": "clang++",
23-
"CUDAHOSTCXX": "clang++"
21+
"CCCL_BUILD_INFIX": "cuda12.3-llvm9"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/devcontainer.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"CCCL_CUDA_VERSION": "12.3",
1919
"CCCL_HOST_COMPILER": "gcc",
2020
"CCCL_HOST_COMPILER_VERSION": "12",
21-
"CCCL_BUILD_INFIX": "cuda12.3-gcc12",
22-
"CXX": "g++",
23-
"CUDAHOSTCXX": "g++"
21+
"CCCL_BUILD_INFIX": "cuda12.3-gcc12"
2422
},
2523
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2624
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",

‎.devcontainer/make_devcontainers.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ update_devcontainer() {
4141
'.image = $image | .name = $name | .containerEnv.DEVCONTAINER_NAME = $name |
4242
.containerEnv.CCCL_BUILD_INFIX = $name |
4343
.containerEnv.CCCL_CUDA_VERSION = $cuda_version | .containerEnv.CCCL_HOST_COMPILER = $compiler_name |
44-
.containerEnv.CCCL_HOST_COMPILER_VERSION = $compiler_version |
45-
.containerEnv.CXX = $compiler_exe | .containerEnv.CUDAHOSTCXX = $compiler_exe' \
44+
.containerEnv.CCCL_HOST_COMPILER_VERSION = $compiler_version '\
4645
"$input_file" > "$output_file"
4746
}
4847

0 commit comments

Comments
 (0)