Use JIT Plug-in for coverage to cover JIT'd functions and methods (#56310)

Summary:
This PR is step 2 (after https://github.com/pytorch/pytorch/issues/56708) to having JIT coverage--it actually uses the plug-in in CI!

Disclaimer: note that this will mark the entire JIT'd function/method as covered without seeking proof that the
compiled code has been executed. This means that even if the code chunk is merely compiled and not run, it will get
marked as covered.

Pull Request resolved: https://github.com/pytorch/pytorch/pull/56310

Test Plan:
We should see coverage improvements in CI after. A file to look out for would be `torch/jit/quantized.py`, which should have more coverage after this PR, which it does!
d3283ccd8c/torch/jit/quantized.py vs https://codecov.io/gh/pytorch/pytorch/src/master/torch/jit/quantized.py

More generally, the whole jit folder got ~3% increase in coverage, I believe.

Reviewed By: walterddr

Differential Revision: D28000672

Pulled By: janeyx99

fbshipit-source-id: 6712979d63a5e1224a92ee9bd9679ec62cf1cbba
This commit is contained in:
Jane Xu
2021-04-26 09:17:12 -07:00
committed by Facebook GitHub Bot
parent 1e51c05b71
commit a90a3acbee
6 changed files with 10 additions and 3 deletions

View File

@ -102,6 +102,7 @@ if [ -n "$ANACONDA_PYTHON_VERSION" ]; then
# TODO: Why is scipy pinned # TODO: Why is scipy pinned
# Pin MyPy version because new errors are likely to appear with each release # Pin MyPy version because new errors are likely to appear with each release
# Pin hypothesis to avoid flakiness: https://github.com/pytorch/pytorch/issues/31136 # Pin hypothesis to avoid flakiness: https://github.com/pytorch/pytorch/issues/31136
# Pin coverage so we can use COVERAGE_RCFILE
as_jenkins pip install --progress-bar off pytest \ as_jenkins pip install --progress-bar off pytest \
scipy==1.1.0 \ scipy==1.1.0 \
scikit-image \ scikit-image \
@ -111,7 +112,7 @@ if [ -n "$ANACONDA_PYTHON_VERSION" ]; then
llvmlite \ llvmlite \
unittest-xml-reporting \ unittest-xml-reporting \
boto3==1.16.34 \ boto3==1.16.34 \
coverage \ coverage==5.5 \
hypothesis==4.53.2 \ hypothesis==4.53.2 \
mypy==0.812 \ mypy==0.812 \
tb-nightly tb-nightly

View File

@ -1,4 +1,6 @@
[run] [run]
plugins =
coverage_plugins.jit_plugin
omit = omit =
*/tmp* */tmp*
*/Temp/* */Temp/*

View File

@ -26,6 +26,7 @@ fi
if [[ "$BUILD_ENVIRONMENT" == *coverage* ]]; then if [[ "$BUILD_ENVIRONMENT" == *coverage* ]]; then
export PYTORCH_COLLECT_COVERAGE=1 export PYTORCH_COLLECT_COVERAGE=1
export COVERAGE_RCFILE="$PWD/.coveragerc" # coverage config file needed for plug-ins and settings to work export COVERAGE_RCFILE="$PWD/.coveragerc" # coverage config file needed for plug-ins and settings to work
pip install -e tools/coverage_plugins_package # allows coverage to run with JitPlugin for JIT coverage
fi fi
if [[ "$BUILD_ENVIRONMENT" == *cuda* ]]; then if [[ "$BUILD_ENVIRONMENT" == *cuda* ]]; then

View File

@ -43,7 +43,8 @@ pip install "ninja==1.10.0.post1" future "hypothesis==4.53.2" "librosa>=0.6.2" p
:: TODO: All sharded configs run coverage. We should change that to be only one config, but right now we will just :: TODO: All sharded configs run coverage. We should change that to be only one config, but right now we will just
:: install coverage everywhere. Tracked: https://github.com/pytorch/pytorch/issues/56264 :: install coverage everywhere. Tracked: https://github.com/pytorch/pytorch/issues/56264
python -mpip install coverage python -mpip install coverage==5.5
python -mpip install -e tools/coverage_plugins_package
if %errorlevel% neq 0 ( exit /b %errorlevel% ) if %errorlevel% neq 0 ( exit /b %errorlevel% )

View File

@ -92,7 +92,8 @@ echo "TEST PASSED"
if [[ "${BUILD_ENVIRONMENT}" == "pytorch-win-vs2019-cuda10-cudnn7-py3" ]]; then if [[ "${BUILD_ENVIRONMENT}" == "pytorch-win-vs2019-cuda10-cudnn7-py3" ]]; then
pushd "$TEST_DIR" pushd "$TEST_DIR"
python -mpip install coverage python -mpip install coverage==5.5
python -mpip install -e "$PROJECT_DIR/tools/coverage_plugins_package"
echo "Generating XML coverage report" echo "Generating XML coverage report"
time python -mcoverage xml time python -mcoverage xml
popd popd

View File

@ -29,6 +29,7 @@ fi
pip install pytest scipy hypothesis # these may not be necessary pip install pytest scipy hypothesis # these may not be necessary
pip install pytest-cov # installing since `coverage run -m pytest ..` doesn't work pip install pytest-cov # installing since `coverage run -m pytest ..` doesn't work
pip install -e tools/coverage_plugins_package # allows coverage to run w/o failing due to a missing plug-in
# realpath might not be available on MacOS # realpath might not be available on MacOS
script_path=$(python -c "import os; import sys; print(os.path.realpath(sys.argv[1]))" "${BASH_SOURCE[0]}") script_path=$(python -c "import os; import sys; print(os.path.realpath(sys.argv[1]))" "${BASH_SOURCE[0]}")