Skip to content
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.

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

Add rcp-bypass granularity #354

Merged
merged 1 commit into from
Jan 23, 2024
Merged
Changes from all commits
Commits
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
26 changes: 24 additions & 2 deletions mlperf_logging/package_checker/package_checker.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def check_training_result_files(folder, usage, ruleset, quiet, werror,
"""
allowed_benchmarks = get_allowed_benchmarks(usage, ruleset)
benchmark_file_counts = get_result_file_counts(usage)

global_rcp_bypass = rcp_bypass

seed_checker = SeedChecker(ruleset)
too_many_errors = False
Expand All @@ -55,6 +55,15 @@ def check_training_result_files(folder, usage, ruleset, quiet, werror,
benchmark_folders.extend(_get_sub_folders(scaling_folder))
else:
benchmark_folders = _get_sub_folders(system_folder)
# Set system wide rcp-bypass
params_path = os.path.join(system_folder, "package_checker_params")
system_rcp_bypass = False
if os.path.exists(params_path):
with open(params_path) as f:
lines = f.readlines()
for line in lines:
if line == "rcp-bypass":
system_rcp_bypass = True
for benchmark_folder in benchmark_folders:
folder_parts = benchmark_folder.split('/')
benchmark = folder_parts[-1]
Expand Down Expand Up @@ -85,6 +94,18 @@ def check_training_result_files(folder, usage, ruleset, quiet, werror,
any_pattern = '{folder}/*'.format(folder=benchmark_folder)
all_files = glob.glob(any_pattern, recursive=True)

# Set system wide rcp-bypass
params_files = []
params_path = os.path.join(benchmark_folder, "package_checker_params")
result_rcp_bypass = False
if os.path.exists(params_path):
params_files.append(params_path)
with open(params_path) as f:
lines = f.readlines()
for line in lines:
if line == "rcp-bypass":
result_rcp_bypass = True

# Find all source codes for this benchmark.
source_files = find_source_files_under(
os.path.join(folder, 'benchmarks', benchmark))
Expand All @@ -110,7 +131,7 @@ def check_training_result_files(folder, usage, ruleset, quiet, werror,
'found %d, expected %d',
benchmark_folder, len(result_files), benchmark_file_counts[benchmark])
too_many_errors = True
if len(all_files) > len(result_files):
if len(all_files) > len(result_files) + len(params_files):
logging.warning('Detected %d total files in directory %s, but some do not conform '
'to naming convention, should you rename them to result_*.txt ?',len(all_files), benchmark_folder)

Expand Down Expand Up @@ -162,6 +183,7 @@ def check_training_result_files(folder, usage, ruleset, quiet, werror,
# Run RCP checker for >= 1.0.0
if ruleset in {'1.0.0', '1.1.0', '2.0.0', '2.1.0', '3.0.0', '3.1.0'} and division == 'closed' and benchmark != 'minigo':
# Now go again through result files to do RCP checks
rcp_bypass = (global_rcp_bypass or system_rcp_bypass or result_rcp_bypass)
rcp_pass, rcp_msg, _ = rcp_checker.check_directory(
benchmark_folder,
usage,
Expand Down