Fix clang header conflicts #59
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The docker image has two versions of clang header files: v11.1.0 and v11.0.0. This leads to issues when running clang-tidy on pytorch because there is a header file conflict. To fix this problem, we opt into using v11.1.0.
facebook-github-bot
added
the
CLA Signed
janeyx99
approved these changes
Jul 12, 2021
facebook-github-bot
pushed a commit
to pytorch/pytorch
that referenced
this pull request
Jul 12, 2021
Summary: Fixes recent `clang-diagnostic-errors` on clang-tidy runs See pytorch/test-infra#59 Pull Request resolved: #61545 Reviewed By: malfet, seemethere Differential Revision: D29664061 Pulled By: 1ntEgr8 fbshipit-source-id: cca482a8774e34e61919f2298846ae0b479bf224
|
This will definitely work for docker images, but it will make it almost impossible to run those checks locally |
|
@malfet Why so? We aren't hard-coding v11.1.0. The clang-tidy script in pytorch/pytorch will ensure that the clang builtin includes are on the include path https://github.com/pytorch/pytorch/blob/master/tools/linter/clang_tidy/__main__.py#L14-L47 (if clang exists on the system) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary:
This PR opts in to using v11.1.0 of clang's builtin includes. It does this by copying (instead of symlinking) our custom build clang-tidy binary. As per this document, clang looks for its builtin includes relative to the location of the binary. By copying it into
/usr/bin, we ensure that it cannot pick up our custom built headers which are located at/clang-tidy-checks/build/lib/include/clang/11.0.0/include. The clang-tidy runner script ensures that it will pick up the v11.1.0 header files.Test Plan:
docker build . -t ct-no-header-conflicts -f ci-docker-base/Dockerfile.cilint-clang-tidy docker run -it ct-no-header-conflicts /bin/bashtorch/csrc/autograd/profiler_kineto.cppgit clone --depth 1 https://github.com/pytorch/pytorch cd pytorch python3 -m tools.linter.clang_tidy -p torch/csrc/autograd/profiler_kineto.cpp -vYou should see no clang-diagnostic-errors, thereby fixing the failed run observed in https://github.com/pytorch/pytorch/pull/61478/checks?check_run_id=3033608896