[ci] clean up dead code related to PR test selection

This is never used and not tested, so removing it for clarity.

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

Approved by: https://github.com/janeyx99
This commit is contained in:
Michael Suo 2022-06-12 10:20:36 -07:00 committed by PyTorch MergeBot
parent 6bc0302e05
commit 943c09a53e
4 changed files with 3 additions and 69 deletions

View File

@ -82,17 +82,6 @@ function get_exit_code() {
return $retcode
}
function get_pr_change_files() {
# The fetch may fail on Docker hosts, this fetch is necessary for GHA
# accepts PR_NUMBER and extract filename as arguments
set +e
tmp_file=$(mktemp)
wget -O "$tmp_file" "https://api.github.com/repos/pytorch/pytorch/pulls/$1/files"
# this regex extracts the filename list according to the GITHUB REST API result.
sed -n "s/.*\"filename\": \"\(.*\)\",/\1/p" "$tmp_file" | tee "$2"
set -e
}
function get_bazel() {
if [[ $(uname) == "Darwin" ]]; then
# download bazel version

View File

@ -321,10 +321,6 @@ or `conda install ninja`. Alternatively, disable said tests with
PYTORCH_COLLECT_COVERAGE = bool(os.environ.get("PYTORCH_COLLECT_COVERAGE"))
ENABLE_PR_HISTORY_REORDERING = bool(
os.environ.get("ENABLE_PR_HISTORY_REORDERING", "0") == "1"
)
JIT_EXECUTOR_TESTS = [
"test_jit_profiling",
"test_jit_legacy",
@ -1033,9 +1029,7 @@ def main():
# sys.path.remove(test_directory)
if IS_CI:
selected_tests = get_reordered_tests(
selected_tests, ENABLE_PR_HISTORY_REORDERING
)
selected_tests = get_reordered_tests(selected_tests)
# downloading test cases configuration to local environment
get_test_case_configs(dirpath=test_directory)

View File

@ -241,16 +241,3 @@ def get_previous_reports_for_branch(
)
commit_index += 1
return reports
def get_previous_reports_for_pr(
pr: str, ci_job_prefix: str = ""
) -> List[Tuple[Report, str]]:
reports: List[Tuple[Report, str]] = []
logger.info(f"Grabbing reports from PR: {[pr]}")
summaries = get_test_stats_summaries_for_pr(pr=pr, job_prefix=ci_job_prefix)
for _, summary in summaries.items():
reports.extend(summary)
# sort by summary_timestamp
reports.sort(reverse=True, key=lambda s: s[1])
return reports

View File

@ -5,7 +5,6 @@ import subprocess
from tools.stats.s3_stat_parser import (
get_previous_reports_for_branch,
get_previous_reports_for_pr,
Report,
Version2Report,
HAVE_BOTO3,
@ -158,29 +157,6 @@ def _query_past_job_times(test_times_file: Optional[str] = None) -> Dict[str, fl
return job_times
def _query_failure_test_module(reports: List[Tuple["Report", str]]) -> List[str]:
test_modules: List[str] = []
if len(reports) == 0 or len(reports[0]) == 0:
return test_modules
report = reports[0][0]
v_report = cast(Version2Report, report)
assert (
"format_version" in v_report.keys() and v_report.get("format_version") == 2
), "S3 format currently handled is version 2 only"
files: Dict[str, Any] = v_report["files"]
for fname, file in files.items():
contains_failure = any(
any(
case["status"] == "errored" or case["status"] == "failed"
for _, case in suite["cases"].items()
)
for _, suite in file["suites"].items()
)
if contains_failure:
test_modules.append(fname)
return test_modules
def _query_changed_test_files() -> List[str]:
default_branch = f"origin/{os.environ.get('GIT_DEFAULT_BRANCH', 'master')}"
cmd = ["git", "diff", "--name-only", default_branch, "HEAD"]
@ -268,21 +244,9 @@ def get_specified_test_cases(filename: str, tests: List[str]) -> Dict[str, List[
return specified_test_case_dict
def get_reordered_tests(tests: List[str], is_reordering_by_pr: bool) -> List[str]:
def get_reordered_tests(tests: List[str]) -> List[str]:
"""Get the reordered test filename list based on github PR history or git changed file."""
prioritized_tests = []
# Try using historic stats from PR.
if is_reordering_by_pr and HAVE_BOTO3:
pr_number = os.environ.get("PR_NUMBER", os.environ.get("CIRCLE_PR_NUMBER", ""))
if len(pr_number):
ci_job_prefix = _get_stripped_CI_job()
s3_reports: List[Tuple["Report", str]] = get_previous_reports_for_pr(
pr_number, ci_job_prefix
)
prioritized_tests = _query_failure_test_module(s3_reports)
print("Prioritized test from previous CI info.")
# Using file changes priority if no stats found from previous PR.
prioritized_tests: List[str] = []
if len(prioritized_tests) == 0:
try:
changed_files = _query_changed_test_files()