Fix copies main ci (#29979)

* fix copies

* nit

* style

* Update utils/check_copies.py
This commit is contained in:
Arthur 2024-04-01 12:43:58 +02:00 committed by GitHub
parent 569f6c7d43
commit fa2c49b00b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 6 deletions

View File

@ -504,7 +504,7 @@ class Qwen2MoeModelTest(ModelTesterMixin, GenerationTesterMixin, PipelineTesterM
@require_torch_gpu @require_torch_gpu
@pytest.mark.flash_attn_test @pytest.mark.flash_attn_test
@slow @slow
def test_flash_attn_2_inference_padding_right(self): def test_flash_attn_2_inference_equivalence_right_padding(self):
self.skipTest("Qwen2Moe flash attention does not support right padding") self.skipTest("Qwen2Moe flash attention does not support right padding")
# Ignore copy # Ignore copy

View File

@ -313,10 +313,12 @@ def split_code_into_blocks(
target_block_name = re.search( target_block_name = re.search(
rf"^{' ' * (indent - 4)}((class|def)\s+\S+)(\(|\:)", lines[start_index] rf"^{' ' * (indent - 4)}((class|def)\s+\S+)(\(|\:)", lines[start_index]
).groups()[0] ).groups()[0]
except ValueError: except Exception:
start_context = min(start_index - 10, 0)
end_context = min(end_index + 10, len(lines))
raise ValueError( raise ValueError(
f"Tried to split a class or function. It did not work. Error comes from line {start_index}: ```\n" f"Tried to split a class or function. It did not work. Error comes from line {start_index}: \n```\n"
+ "".join(lines[start_index:end_index]) + "".join(lines[start_context:end_context])
+ "```\n" + "```\n"
) )
@ -602,8 +604,23 @@ def check_codes_match(observed_code: str, theoretical_code: str) -> Optional[int
_re_func_match = re.compile(r"def\s+([^\(]+)\(") _re_func_match = re.compile(r"def\s+([^\(]+)\(")
for re_pattern in [_re_class_match, _re_func_match]: for re_pattern in [_re_class_match, _re_func_match]:
if re_pattern.match(observed_code_header) is not None: if re_pattern.match(observed_code_header) is not None:
observed_obj_name = re_pattern.search(observed_code_header).groups()[0] try:
theoretical_name = re_pattern.search(theoretical_code_header).groups()[0] observed_obj_name = re_pattern.search(observed_code_header).groups()[0]
except Exception:
raise ValueError(
"Tried to split a class or function. It did not work. Error comes from: \n```\n"
+ observed_code_header
+ "\n```\n"
)
try:
theoretical_name = re_pattern.search(theoretical_code_header).groups()[0]
except Exception:
raise ValueError(
"Tried to split a class or function. It did not work. Error comes from: \n```\n"
+ theoretical_code_header
+ "\n```\n"
)
theoretical_code_header = theoretical_code_header.replace(theoretical_name, observed_obj_name) theoretical_code_header = theoretical_code_header.replace(theoretical_name, observed_obj_name)
# Find the first diff. Line 0 is special since we need to compare with the function/class names ignored. # Find the first diff. Line 0 is special since we need to compare with the function/class names ignored.