Skip to content

Fixing clang-format version to what PyTorch uses. #981

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

Merged
merged 1 commit into from
Oct 22, 2020
Merged

Fixing clang-format version to what PyTorch uses. #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .circleci/torchscript_bc_test/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ install_release() {
install_build_dependencies() {
printf "* Installing torchaudio dependencies except PyTorch - (Python: %s)\n" "$1"
conda env update -q --file "${_this_dir}/environment.yml" --prune
if [ "${_os}" == Linux ]; then
Copy link
Contributor Author

@datumbox datumbox Oct 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe clang-format is not actually used in the specific tests, so I removed it.

pip install clang-format
fi
}

build_master() {
Expand Down
4 changes: 2 additions & 2 deletions .circleci/unittest/linux/scripts/run_style_checks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ if [ "${status}" -ne 0 ]; then
fi

printf "\x1b[34mRunning clang-format: "
clang-format --version
./clang-format --version
Copy link
Contributor Author

@datumbox datumbox Oct 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our root_dir is ./ here. Similar to what we do above with conda.

printf "\x1b[0m\n"
git-clang-format origin/master
git-clang-format --binary ./clang-format origin/master
git diff --exit-code
status=$?
exit_status="$((exit_status+status))"
Expand Down
4 changes: 3 additions & 1 deletion .circleci/unittest/linux/scripts/setup_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ conda activate "${env_dir}"
printf "* Installing dependencies (except PyTorch)\n"
conda env update --file "${this_dir}/environment.yml" --prune
if [ "${os}" == Linux ] ; then
pip install clang-format
clangformat_path="${root_dir}/clang-format"
Copy link
Contributor Author

@datumbox datumbox Oct 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I understand other libraries like conda are put directly in root. So I do the same with clang-format.

curl https://oss-clang-format.s3.us-east-2.amazonaws.com/linux64/clang-format-linux64 -o "${clangformat_path}"
chmod +x "${clangformat_path}"
fi

# 4. Buld codecs
Expand Down