Skip to content

Commit

Permalink
Trim trailing whitespace and normalize newlines. (#1633)
Browse files Browse the repository at this point in the history
* Trim trailing whitespace and normalize newlines.

* Add settings to devcontainer.

* Update devcontainer files.

* Revert changes to .devcontainer/make_devcontainers.sh
  • Loading branch information
bdice authored Apr 16, 2024
1 parent cefa6b8 commit f4a7ca3
Show file tree
Hide file tree
Showing 195 changed files with 844 additions and 899 deletions.
6 changes: 3 additions & 3 deletions .devcontainer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ For more information, see the `.devcontainer/make_devcontainers.sh --help` messa

2. Install WSL 2 by running:
```bash
wsl --install
wsl --install
```
This should probably install Ubuntu distro as a default.

Expand Down Expand Up @@ -182,14 +182,14 @@ then run `sudo systemctl restart docker.service`.
10. Open the CCCL cloned repo in VS Code ( `Ctrl + Shift + P `, select `File: Open Folder...` and select the path where your CCCL clone is located).
11. If prompted, choose `Reopen in Container`.
- If you are not prompted just type `Ctrl + Shift + P` and `Dev Containers: Open Folder in Container ...`.
12. Verify that Dev Container was configured properly by running `nvidia-smi` in your Dev Container terminal. For a proper configuration it is important for the steps in [Install prerequisites and VS Code extensions](#prereqs) to be followed in a precise order.
From that point on, the guide aligns with our [existing Dev Containers native Linux guide](https://github.com/NVIDIA/cccl/blob/main/.devcontainer/README.md) with just one minor potential alteration:
13. If WSL was launched without the X-server enabled, when asked to "authenticate Git with your Github credentials", if you answer **Yes**, the browser might not open automatically, with the following error message.
13. If WSL was launched without the X-server enabled, when asked to "authenticate Git with your Github credentials", if you answer **Yes**, the browser might not open automatically, with the following error message.
> Failed opening a web browser at https://github.com/login/device
exec: "xdg-open,x-www-browser,www-browser,wslview": executable file not found in $PATH
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda11.1-gcc6/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda11.1-gcc7/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda11.1-gcc8/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda11.1-gcc9/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda11.1-llvm9/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda11.8-gcc11/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-gcc10/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-gcc11/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-gcc12/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-gcc7/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-gcc8/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-gcc9/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm10/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm11/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm12/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm13/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm14/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm15/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm16/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-llvm9/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/cuda12.4-oneapi2023.2.0/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"clang-format.executable": "/usr/local/bin/clang-format",
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}"
]
],
"files.eol": "\n",
"files.trimTrailingWhitespace": true
}
}
},
Expand Down
1 change: 0 additions & 1 deletion .devcontainer/launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,3 @@ main() {
}

main "$@"

2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @nvidia/cccl-codeowners

# Libraries
thrust/ @nvidia/cccl-thrust-codeowners @nvidia/cccl-codeowners
thrust/ @nvidia/cccl-thrust-codeowners @nvidia/cccl-codeowners
cub/ @nvidia/cccl-cub-codeowners @nvidia/cccl-codeowners
libcudacxx/ @nvidia/cccl-libcudacxx-codeowners @nvidia/cccl-codeowners

Expand Down
14 changes: 7 additions & 7 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ body:
options:
- label: I confirmed there appear to be no [duplicate issues](https://github.com/NVIDIA/cccl/issues) for this bug and that I agree to the [Code of Conduct](CODE_OF_CONDUCT.md)
required: true

- type: dropdown
id: bug-type
attributes:
Expand Down Expand Up @@ -46,7 +46,7 @@ body:
attributes:
label: Describe the bug
description: A clear and concise description of what problem you are running into.
placeholder: "Attempting to use structured bindings with `cuda::std::tuple` fails to compile."
placeholder: "Attempting to use structured bindings with `cuda::std::tuple` fails to compile."
validations:
required: true

Expand Down Expand Up @@ -94,16 +94,16 @@ body:
attributes:
label: Operating System
description:
If applicable, the OS version where this bug occurs.
If applicable, the OS version where this bug occurs.
placeholder: Ubuntu Linux 20.04
validations:
required: false

- type: textarea
id: nvidia-smi-output
attributes:
label: nvidia-smi output
description: If applicable, the output from running the `nvidia-smi` command.
description: If applicable, the output from running the `nvidia-smi` command.
placeholder: |
+-----------------------------------------------------------------------------+
| NVIDIA-SMI 495.29.05 Driver Version: 495.29.05 CUDA Version: 11.5 |
Expand All @@ -118,12 +118,12 @@ body:
+-------------------------------+----------------------+----------------------+
validations:
required: false

- type: textarea
id: nvcc-version
attributes:
label: NVCC version
description: If applicable, the version of nvcc you're using.
description: If applicable, the version of nvcc you're using.
placeholder: |
nvcc --version
nvcc: NVIDIA (R) Cuda compiler driver
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ blank_issues_enabled: true
contact_links:
- name: Question
url: https://github.com/NVIDIA/cccl/discussions
about: Check out our Discussions page to ask and answer questions.
about: Check out our Discussions page to ask and answer questions.
- name: CUDA C++ Core Libraries Discord
url: https://discord.gg/nvidiadeveloper
about: Come chat about using and contributing to CCCL!
about: Come chat about using and contributing to CCCL!
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/doc_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ body:
- type: textarea
id: search_locs
attributes:
label: If this is a correction, please provide a link to the incorrect documentation. If this is a new documentation request, please link to where you have looked.
label: If this is a correction, please provide a link to the incorrect documentation. If this is a new documentation request, please link to where you have looked.
placeholder: |
https://docs.nvidia.com/cuda/thrust/
https://docs.nvidia.com/cuda/cub/
https://docs.nvidia.com/cuda/cuda-c-std/index.html
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ body:
- Not sure
validations:
required: true

- type: textarea
id: description
attributes:
label: Is your feature request related to a problem? Please describe.
description: A clear and concise description of what the problem is, e.g., "I would like to be able to..."
placeholder: I would like to be able to use the equivalent of `std::variant` in both host and device code.
placeholder: I would like to be able to use the equivalent of `std::variant` in both host and device code.
validations:
required: true

Expand All @@ -42,7 +42,7 @@ body:
label: Describe the solution you'd like
description: A clear and concise description of what you want to happen.
placeholder: |
Provide the header `<cuda/std/variant>` that implements a heterogeneous `cuda::std::variant` type.
Provide the header `<cuda/std/variant>` that implements a heterogeneous `cuda::std::variant` type.
validations:
required: true

Expand All @@ -53,7 +53,7 @@ body:
description:
If applicable, please add a clear and concise description of any alternative solutions or features you've
considered.
placeholder: The alternatives to a `variant` are unappealing. They usually involve using a raw `union` which is not type safe and has none of the convenient machinery like `std::visit`.
placeholder: The alternatives to a `variant` are unappealing. They usually involve using a raw `union` which is not type safe and has none of the convenient machinery like `std::visit`.
validations:
required: false

Expand All @@ -62,6 +62,6 @@ body:
attributes:
label: Additional context
description: Add any other context about the request here.
placeholder: This would be a helpful vocabulary type that could replace a lot of custom and error prone code.
placeholder: This would be a helpful vocabulary type that could replace a lot of custom and error prone code.
validations:
required: false
Loading

0 comments on commit f4a7ca3

Please sign in to comment.