jroesch commented on a change in pull request #6437: URL: https://github.com/apache/incubator-tvm/pull/6437#discussion_r487332773
########## File path: tests/lint/git-black.sh ########## @@ -0,0 +1,72 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +set -e +set -u +set -o pipefail + +if [[ "$1" == "-i" ]]; then + INPLACE_FORMAT=1 + shift 1 +else + INPLACE_FORMAT=0 +fi + +if [[ "$#" -lt 1 ]]; then + echo "Usage: tests/lint/git-black.sh [-i] <commit>" + echo "" + echo "Run black-format on files that changed since <commit>" + echo "Examples:" + echo "- Compare last one commit: tests/lint/git-black.sh HEAD~1" + echo "- Compare against upstream/master: tests/lint/git-black.sh upstream/master" + echo "You can also add -i option to do inplace format" + exit 1 +fi + +cleanup() +{ + rm -rf /tmp/$$.black-format.txt +} +trap cleanup 0 + + +if [ -x "$(command -v black)" ]; then + BLACK=black +else + echo "Cannot find black" + exit 1 +fi + +# Print out specific version + +echo "Version Information: $(${BLACK} --version)" + + +IFS=$'\n' read -a FILES -d'\n' < <(git diff --name-only HEAD $1 -- "*.py" "*.pyi") || true +echo "read returned $?" +echo "Files: $FILES" + +if [[ ${INPLACE_FORMAT} -eq 1 ]]; then + echo "Running black on Python files against revision" $1): + CMD=( "black" "${FILES[@]}" ) + echo "${CMD[@]}" + "${CMD[@]}" + exit 0 +fi + +echo "Running black in checking mode" +black --diff --check Review comment: I think diff and check at same time give that behavior if I understand correctly, check makes it return a -1 status code which should fail this entire script. ########## File path: python/tvm/relay/frontend/mxnet_qnn_op_utils.py ########## @@ -277,6 +277,8 @@ def quantize_conv_weights_bias_channel_mkldnn_from_var(weights_var, def get_mkldnn_requantize_scale_outDtype(min_output_range, max_output_range, out_dtype): + """Get the MKLDNN requantized scale.""" + quantized_out_range = ( Review comment: These are a bunch of random edits that made the results of black happier. ########## File path: tests/lint/git-black.sh ########## @@ -0,0 +1,72 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +set -e +set -u +set -o pipefail + +if [[ "$1" == "-i" ]]; then + INPLACE_FORMAT=1 + shift 1 +else + INPLACE_FORMAT=0 +fi + +if [[ "$#" -lt 1 ]]; then + echo "Usage: tests/lint/git-black.sh [-i] <commit>" + echo "" + echo "Run black-format on files that changed since <commit>" + echo "Examples:" + echo "- Compare last one commit: tests/lint/git-black.sh HEAD~1" + echo "- Compare against upstream/master: tests/lint/git-black.sh upstream/master" + echo "You can also add -i option to do inplace format" + exit 1 +fi + +cleanup() +{ + rm -rf /tmp/$$.black-format.txt +} Review comment: I think this is hold over from my copy paste from the clang-format script, we shouldn't need this. ########## File path: pyproject.toml ########## @@ -0,0 +1,46 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +[tool.black] +line-length = 100 +target-version = ['py36'] +include = '\.pyi?$' +exclude = ''' + +( + /( + \.github + | \.tvm + | \.tvm_test_data + | \.vscode + | \.venv + | cmake\/ + | conda\/ + | docker\/ + | golang\/ + | include\/ + | jvm\/ + | licenses\/ + | nnvm\/ + | rust\/ + | src\/ + | tests\/ + | vta\/ + | web\/ + )/|tests/lint/add_asf_header.py|tests/lint/check_file_type.py|python/tvm/topi/testing/pool3d_python.py|python/topi/python/test_topi_pooling.py Review comment: These two files actually trigger an internal error with black and I was going to open up a follow up issue to fix these. ########## File path: tests/lint/git-black.sh ########## @@ -0,0 +1,72 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +set -e +set -u +set -o pipefail + +if [[ "$1" == "-i" ]]; then + INPLACE_FORMAT=1 + shift 1 +else + INPLACE_FORMAT=0 +fi + +if [[ "$#" -lt 1 ]]; then + echo "Usage: tests/lint/git-black.sh [-i] <commit>" + echo "" + echo "Run black-format on files that changed since <commit>" + echo "Examples:" + echo "- Compare last one commit: tests/lint/git-black.sh HEAD~1" + echo "- Compare against upstream/master: tests/lint/git-black.sh upstream/master" + echo "You can also add -i option to do inplace format" + exit 1 +fi + +cleanup() +{ + rm -rf /tmp/$$.black-format.txt +} +trap cleanup 0 + + +if [ -x "$(command -v black)" ]; then + BLACK=black +else + echo "Cannot find black" + exit 1 +fi + +# Print out specific version + +echo "Version Information: $(${BLACK} --version)" + + +IFS=$'\n' read -a FILES -d'\n' < <(git diff --name-only HEAD $1 -- "*.py" "*.pyi") || true +echo "read returned $?" +echo "Files: $FILES" + +if [[ ${INPLACE_FORMAT} -eq 1 ]]; then + echo "Running black on Python files against revision" $1): + CMD=( "black" "${FILES[@]}" ) + echo "${CMD[@]}" + "${CMD[@]}" + exit 0 +fi + +echo "Running black in checking mode" +black --diff --check Review comment: I think diff and check at same time give that behavior if I understand correctly, check makes it return a -1 status code which should fail this entire script. ########## File path: python/tvm/relay/frontend/mxnet_qnn_op_utils.py ########## @@ -277,6 +277,8 @@ def quantize_conv_weights_bias_channel_mkldnn_from_var(weights_var, def get_mkldnn_requantize_scale_outDtype(min_output_range, max_output_range, out_dtype): + """Get the MKLDNN requantized scale.""" + quantized_out_range = ( Review comment: These are a bunch of random edits that made the results of black happier. ########## File path: tests/lint/git-black.sh ########## @@ -0,0 +1,72 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +set -e +set -u +set -o pipefail + +if [[ "$1" == "-i" ]]; then + INPLACE_FORMAT=1 + shift 1 +else + INPLACE_FORMAT=0 +fi + +if [[ "$#" -lt 1 ]]; then + echo "Usage: tests/lint/git-black.sh [-i] <commit>" + echo "" + echo "Run black-format on files that changed since <commit>" + echo "Examples:" + echo "- Compare last one commit: tests/lint/git-black.sh HEAD~1" + echo "- Compare against upstream/master: tests/lint/git-black.sh upstream/master" + echo "You can also add -i option to do inplace format" + exit 1 +fi + +cleanup() +{ + rm -rf /tmp/$$.black-format.txt +} Review comment: I think this is hold over from my copy paste from the clang-format script, we shouldn't need this. ########## File path: pyproject.toml ########## @@ -0,0 +1,46 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +[tool.black] +line-length = 100 +target-version = ['py36'] +include = '\.pyi?$' +exclude = ''' + +( + /( + \.github + | \.tvm + | \.tvm_test_data + | \.vscode + | \.venv + | cmake\/ + | conda\/ + | docker\/ + | golang\/ + | include\/ + | jvm\/ + | licenses\/ + | nnvm\/ + | rust\/ + | src\/ + | tests\/ + | vta\/ + | web\/ + )/|tests/lint/add_asf_header.py|tests/lint/check_file_type.py|python/tvm/topi/testing/pool3d_python.py|python/topi/python/test_topi_pooling.py Review comment: These two files actually trigger an internal error with black and I was going to open up a follow up issue to fix these. ########## File path: tests/lint/git-black.sh ########## @@ -0,0 +1,72 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +set -e +set -u +set -o pipefail + +if [[ "$1" == "-i" ]]; then + INPLACE_FORMAT=1 + shift 1 +else + INPLACE_FORMAT=0 +fi + +if [[ "$#" -lt 1 ]]; then + echo "Usage: tests/lint/git-black.sh [-i] <commit>" + echo "" + echo "Run black-format on files that changed since <commit>" + echo "Examples:" + echo "- Compare last one commit: tests/lint/git-black.sh HEAD~1" + echo "- Compare against upstream/master: tests/lint/git-black.sh upstream/master" + echo "You can also add -i option to do inplace format" + exit 1 +fi + +cleanup() +{ + rm -rf /tmp/$$.black-format.txt +} +trap cleanup 0 + + +if [ -x "$(command -v black)" ]; then + BLACK=black +else + echo "Cannot find black" + exit 1 +fi + +# Print out specific version + +echo "Version Information: $(${BLACK} --version)" + + +IFS=$'\n' read -a FILES -d'\n' < <(git diff --name-only HEAD $1 -- "*.py" "*.pyi") || true +echo "read returned $?" +echo "Files: $FILES" + +if [[ ${INPLACE_FORMAT} -eq 1 ]]; then + echo "Running black on Python files against revision" $1): + CMD=( "black" "${FILES[@]}" ) + echo "${CMD[@]}" + "${CMD[@]}" + exit 0 +fi + +echo "Running black in checking mode" +black --diff --check Review comment: I think diff and check at same time give that behavior if I understand correctly, check makes it return a -1 status code which should fail this entire script. ########## File path: python/tvm/relay/frontend/mxnet_qnn_op_utils.py ########## @@ -277,6 +277,8 @@ def quantize_conv_weights_bias_channel_mkldnn_from_var(weights_var, def get_mkldnn_requantize_scale_outDtype(min_output_range, max_output_range, out_dtype): + """Get the MKLDNN requantized scale.""" + quantized_out_range = ( Review comment: These are a bunch of random edits that made the results of black happier. ########## File path: tests/lint/git-black.sh ########## @@ -0,0 +1,72 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +set -e +set -u +set -o pipefail + +if [[ "$1" == "-i" ]]; then + INPLACE_FORMAT=1 + shift 1 +else + INPLACE_FORMAT=0 +fi + +if [[ "$#" -lt 1 ]]; then + echo "Usage: tests/lint/git-black.sh [-i] <commit>" + echo "" + echo "Run black-format on files that changed since <commit>" + echo "Examples:" + echo "- Compare last one commit: tests/lint/git-black.sh HEAD~1" + echo "- Compare against upstream/master: tests/lint/git-black.sh upstream/master" + echo "You can also add -i option to do inplace format" + exit 1 +fi + +cleanup() +{ + rm -rf /tmp/$$.black-format.txt +} Review comment: I think this is hold over from my copy paste from the clang-format script, we shouldn't need this. ########## File path: pyproject.toml ########## @@ -0,0 +1,46 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +[tool.black] +line-length = 100 +target-version = ['py36'] +include = '\.pyi?$' +exclude = ''' + +( + /( + \.github + | \.tvm + | \.tvm_test_data + | \.vscode + | \.venv + | cmake\/ + | conda\/ + | docker\/ + | golang\/ + | include\/ + | jvm\/ + | licenses\/ + | nnvm\/ + | rust\/ + | src\/ + | tests\/ + | vta\/ + | web\/ + )/|tests/lint/add_asf_header.py|tests/lint/check_file_type.py|python/tvm/topi/testing/pool3d_python.py|python/topi/python/test_topi_pooling.py Review comment: These two files actually trigger an internal error with black and I was going to open up a follow up issue to fix these. ########## File path: tests/lint/git-black.sh ########## @@ -0,0 +1,72 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +set -e +set -u +set -o pipefail + +if [[ "$1" == "-i" ]]; then + INPLACE_FORMAT=1 + shift 1 +else + INPLACE_FORMAT=0 +fi + +if [[ "$#" -lt 1 ]]; then + echo "Usage: tests/lint/git-black.sh [-i] <commit>" + echo "" + echo "Run black-format on files that changed since <commit>" + echo "Examples:" + echo "- Compare last one commit: tests/lint/git-black.sh HEAD~1" + echo "- Compare against upstream/master: tests/lint/git-black.sh upstream/master" + echo "You can also add -i option to do inplace format" + exit 1 +fi + +cleanup() +{ + rm -rf /tmp/$$.black-format.txt +} +trap cleanup 0 + + +if [ -x "$(command -v black)" ]; then + BLACK=black +else + echo "Cannot find black" + exit 1 +fi + +# Print out specific version + +echo "Version Information: $(${BLACK} --version)" + + +IFS=$'\n' read -a FILES -d'\n' < <(git diff --name-only HEAD $1 -- "*.py" "*.pyi") || true +echo "read returned $?" +echo "Files: $FILES" + +if [[ ${INPLACE_FORMAT} -eq 1 ]]; then + echo "Running black on Python files against revision" $1): + CMD=( "black" "${FILES[@]}" ) + echo "${CMD[@]}" + "${CMD[@]}" + exit 0 +fi + +echo "Running black in checking mode" +black --diff --check Review comment: I think diff and check at same time give that behavior if I understand correctly, check makes it return a -1 status code which should fail this entire script. ########## File path: python/tvm/relay/frontend/mxnet_qnn_op_utils.py ########## @@ -277,6 +277,8 @@ def quantize_conv_weights_bias_channel_mkldnn_from_var(weights_var, def get_mkldnn_requantize_scale_outDtype(min_output_range, max_output_range, out_dtype): + """Get the MKLDNN requantized scale.""" + quantized_out_range = ( Review comment: These are a bunch of random edits that made the results of black happier. ########## File path: tests/lint/git-black.sh ########## @@ -0,0 +1,72 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +set -e +set -u +set -o pipefail + +if [[ "$1" == "-i" ]]; then + INPLACE_FORMAT=1 + shift 1 +else + INPLACE_FORMAT=0 +fi + +if [[ "$#" -lt 1 ]]; then + echo "Usage: tests/lint/git-black.sh [-i] <commit>" + echo "" + echo "Run black-format on files that changed since <commit>" + echo "Examples:" + echo "- Compare last one commit: tests/lint/git-black.sh HEAD~1" + echo "- Compare against upstream/master: tests/lint/git-black.sh upstream/master" + echo "You can also add -i option to do inplace format" + exit 1 +fi + +cleanup() +{ + rm -rf /tmp/$$.black-format.txt +} Review comment: I think this is hold over from my copy paste from the clang-format script, we shouldn't need this. ########## File path: pyproject.toml ########## @@ -0,0 +1,46 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +[tool.black] +line-length = 100 +target-version = ['py36'] +include = '\.pyi?$' +exclude = ''' + +( + /( + \.github + | \.tvm + | \.tvm_test_data + | \.vscode + | \.venv + | cmake\/ + | conda\/ + | docker\/ + | golang\/ + | include\/ + | jvm\/ + | licenses\/ + | nnvm\/ + | rust\/ + | src\/ + | tests\/ + | vta\/ + | web\/ + )/|tests/lint/add_asf_header.py|tests/lint/check_file_type.py|python/tvm/topi/testing/pool3d_python.py|python/topi/python/test_topi_pooling.py Review comment: These two files actually trigger an internal error with black and I was going to open up a follow up issue to fix these. ########## File path: tests/lint/git-black.sh ########## @@ -0,0 +1,72 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +set -e +set -u +set -o pipefail + +if [[ "$1" == "-i" ]]; then + INPLACE_FORMAT=1 + shift 1 +else + INPLACE_FORMAT=0 +fi + +if [[ "$#" -lt 1 ]]; then + echo "Usage: tests/lint/git-black.sh [-i] <commit>" + echo "" + echo "Run black-format on files that changed since <commit>" + echo "Examples:" + echo "- Compare last one commit: tests/lint/git-black.sh HEAD~1" + echo "- Compare against upstream/master: tests/lint/git-black.sh upstream/master" + echo "You can also add -i option to do inplace format" + exit 1 +fi + +cleanup() +{ + rm -rf /tmp/$$.black-format.txt +} +trap cleanup 0 + + +if [ -x "$(command -v black)" ]; then + BLACK=black +else + echo "Cannot find black" + exit 1 +fi + +# Print out specific version + +echo "Version Information: $(${BLACK} --version)" + + +IFS=$'\n' read -a FILES -d'\n' < <(git diff --name-only HEAD $1 -- "*.py" "*.pyi") || true +echo "read returned $?" +echo "Files: $FILES" + +if [[ ${INPLACE_FORMAT} -eq 1 ]]; then + echo "Running black on Python files against revision" $1): + CMD=( "black" "${FILES[@]}" ) + echo "${CMD[@]}" + "${CMD[@]}" + exit 0 +fi + +echo "Running black in checking mode" +black --diff --check Review comment: I think diff and check at same time give that behavior if I understand correctly, check makes it return a -1 status code which should fail this entire script. ########## File path: python/tvm/relay/frontend/mxnet_qnn_op_utils.py ########## @@ -277,6 +277,8 @@ def quantize_conv_weights_bias_channel_mkldnn_from_var(weights_var, def get_mkldnn_requantize_scale_outDtype(min_output_range, max_output_range, out_dtype): + """Get the MKLDNN requantized scale.""" + quantized_out_range = ( Review comment: These are a bunch of random edits that made the results of black happier. ########## File path: tests/lint/git-black.sh ########## @@ -0,0 +1,72 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +set -e +set -u +set -o pipefail + +if [[ "$1" == "-i" ]]; then + INPLACE_FORMAT=1 + shift 1 +else + INPLACE_FORMAT=0 +fi + +if [[ "$#" -lt 1 ]]; then + echo "Usage: tests/lint/git-black.sh [-i] <commit>" + echo "" + echo "Run black-format on files that changed since <commit>" + echo "Examples:" + echo "- Compare last one commit: tests/lint/git-black.sh HEAD~1" + echo "- Compare against upstream/master: tests/lint/git-black.sh upstream/master" + echo "You can also add -i option to do inplace format" + exit 1 +fi + +cleanup() +{ + rm -rf /tmp/$$.black-format.txt +} Review comment: I think this is hold over from my copy paste from the clang-format script, we shouldn't need this. ########## File path: pyproject.toml ########## @@ -0,0 +1,46 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +[tool.black] +line-length = 100 +target-version = ['py36'] +include = '\.pyi?$' +exclude = ''' + +( + /( + \.github + | \.tvm + | \.tvm_test_data + | \.vscode + | \.venv + | cmake\/ + | conda\/ + | docker\/ + | golang\/ + | include\/ + | jvm\/ + | licenses\/ + | nnvm\/ + | rust\/ + | src\/ + | tests\/ + | vta\/ + | web\/ + )/|tests/lint/add_asf_header.py|tests/lint/check_file_type.py|python/tvm/topi/testing/pool3d_python.py|python/topi/python/test_topi_pooling.py Review comment: These two files actually trigger an internal error with black and I was going to open up a follow up issue to fix these. ########## File path: tests/lint/git-black.sh ########## @@ -0,0 +1,72 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +set -e +set -u +set -o pipefail + +if [[ "$1" == "-i" ]]; then + INPLACE_FORMAT=1 + shift 1 +else + INPLACE_FORMAT=0 +fi + +if [[ "$#" -lt 1 ]]; then + echo "Usage: tests/lint/git-black.sh [-i] <commit>" + echo "" + echo "Run black-format on files that changed since <commit>" + echo "Examples:" + echo "- Compare last one commit: tests/lint/git-black.sh HEAD~1" + echo "- Compare against upstream/master: tests/lint/git-black.sh upstream/master" + echo "You can also add -i option to do inplace format" + exit 1 +fi + +cleanup() +{ + rm -rf /tmp/$$.black-format.txt +} +trap cleanup 0 + + +if [ -x "$(command -v black)" ]; then + BLACK=black +else + echo "Cannot find black" + exit 1 +fi + +# Print out specific version + +echo "Version Information: $(${BLACK} --version)" + + +IFS=$'\n' read -a FILES -d'\n' < <(git diff --name-only HEAD $1 -- "*.py" "*.pyi") || true +echo "read returned $?" +echo "Files: $FILES" + +if [[ ${INPLACE_FORMAT} -eq 1 ]]; then + echo "Running black on Python files against revision" $1): + CMD=( "black" "${FILES[@]}" ) + echo "${CMD[@]}" + "${CMD[@]}" + exit 0 +fi + +echo "Running black in checking mode" +black --diff --check Review comment: I think diff and check at same time give that behavior if I understand correctly, check makes it return a -1 status code which should fail this entire script. ########## File path: python/tvm/relay/frontend/mxnet_qnn_op_utils.py ########## @@ -277,6 +277,8 @@ def quantize_conv_weights_bias_channel_mkldnn_from_var(weights_var, def get_mkldnn_requantize_scale_outDtype(min_output_range, max_output_range, out_dtype): + """Get the MKLDNN requantized scale.""" + quantized_out_range = ( Review comment: These are a bunch of random edits that made the results of black happier. ########## File path: tests/lint/git-black.sh ########## @@ -0,0 +1,72 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +set -e +set -u +set -o pipefail + +if [[ "$1" == "-i" ]]; then + INPLACE_FORMAT=1 + shift 1 +else + INPLACE_FORMAT=0 +fi + +if [[ "$#" -lt 1 ]]; then + echo "Usage: tests/lint/git-black.sh [-i] <commit>" + echo "" + echo "Run black-format on files that changed since <commit>" + echo "Examples:" + echo "- Compare last one commit: tests/lint/git-black.sh HEAD~1" + echo "- Compare against upstream/master: tests/lint/git-black.sh upstream/master" + echo "You can also add -i option to do inplace format" + exit 1 +fi + +cleanup() +{ + rm -rf /tmp/$$.black-format.txt +} Review comment: I think this is hold over from my copy paste from the clang-format script, we shouldn't need this. ########## File path: pyproject.toml ########## @@ -0,0 +1,46 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +[tool.black] +line-length = 100 +target-version = ['py36'] +include = '\.pyi?$' +exclude = ''' + +( + /( + \.github + | \.tvm + | \.tvm_test_data + | \.vscode + | \.venv + | cmake\/ + | conda\/ + | docker\/ + | golang\/ + | include\/ + | jvm\/ + | licenses\/ + | nnvm\/ + | rust\/ + | src\/ + | tests\/ + | vta\/ + | web\/ + )/|tests/lint/add_asf_header.py|tests/lint/check_file_type.py|python/tvm/topi/testing/pool3d_python.py|python/topi/python/test_topi_pooling.py Review comment: These two files actually trigger an internal error with black and I was going to open up a follow up issue to fix these. ########## File path: tests/lint/git-black.sh ########## @@ -0,0 +1,72 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +set -e +set -u +set -o pipefail + +if [[ "$1" == "-i" ]]; then + INPLACE_FORMAT=1 + shift 1 +else + INPLACE_FORMAT=0 +fi + +if [[ "$#" -lt 1 ]]; then + echo "Usage: tests/lint/git-black.sh [-i] <commit>" + echo "" + echo "Run black-format on files that changed since <commit>" + echo "Examples:" + echo "- Compare last one commit: tests/lint/git-black.sh HEAD~1" + echo "- Compare against upstream/master: tests/lint/git-black.sh upstream/master" + echo "You can also add -i option to do inplace format" + exit 1 +fi + +cleanup() +{ + rm -rf /tmp/$$.black-format.txt +} +trap cleanup 0 + + +if [ -x "$(command -v black)" ]; then + BLACK=black +else + echo "Cannot find black" + exit 1 +fi + +# Print out specific version + +echo "Version Information: $(${BLACK} --version)" + + +IFS=$'\n' read -a FILES -d'\n' < <(git diff --name-only HEAD $1 -- "*.py" "*.pyi") || true +echo "read returned $?" +echo "Files: $FILES" + +if [[ ${INPLACE_FORMAT} -eq 1 ]]; then + echo "Running black on Python files against revision" $1): + CMD=( "black" "${FILES[@]}" ) + echo "${CMD[@]}" + "${CMD[@]}" + exit 0 +fi + +echo "Running black in checking mode" +black --diff --check Review comment: I think diff and check at same time give that behavior if I understand correctly, check makes it return a -1 status code which should fail this entire script. ########## File path: python/tvm/relay/frontend/mxnet_qnn_op_utils.py ########## @@ -277,6 +277,8 @@ def quantize_conv_weights_bias_channel_mkldnn_from_var(weights_var, def get_mkldnn_requantize_scale_outDtype(min_output_range, max_output_range, out_dtype): + """Get the MKLDNN requantized scale.""" + quantized_out_range = ( Review comment: These are a bunch of random edits that made the results of black happier. ########## File path: tests/lint/git-black.sh ########## @@ -0,0 +1,72 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +set -e +set -u +set -o pipefail + +if [[ "$1" == "-i" ]]; then + INPLACE_FORMAT=1 + shift 1 +else + INPLACE_FORMAT=0 +fi + +if [[ "$#" -lt 1 ]]; then + echo "Usage: tests/lint/git-black.sh [-i] <commit>" + echo "" + echo "Run black-format on files that changed since <commit>" + echo "Examples:" + echo "- Compare last one commit: tests/lint/git-black.sh HEAD~1" + echo "- Compare against upstream/master: tests/lint/git-black.sh upstream/master" + echo "You can also add -i option to do inplace format" + exit 1 +fi + +cleanup() +{ + rm -rf /tmp/$$.black-format.txt +} Review comment: I think this is hold over from my copy paste from the clang-format script, we shouldn't need this. ########## File path: pyproject.toml ########## @@ -0,0 +1,46 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +[tool.black] +line-length = 100 +target-version = ['py36'] +include = '\.pyi?$' +exclude = ''' + +( + /( + \.github + | \.tvm + | \.tvm_test_data + | \.vscode + | \.venv + | cmake\/ + | conda\/ + | docker\/ + | golang\/ + | include\/ + | jvm\/ + | licenses\/ + | nnvm\/ + | rust\/ + | src\/ + | tests\/ + | vta\/ + | web\/ + )/|tests/lint/add_asf_header.py|tests/lint/check_file_type.py|python/tvm/topi/testing/pool3d_python.py|python/topi/python/test_topi_pooling.py Review comment: These two files actually trigger an internal error with black and I was going to open up a follow up issue to fix these. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
