Skip to content

Commit 974ce9a

Browse files
committed
update __main__.py for evaluation to fix bugs
- avoid AttributeError: 'NoneType' object has no attribute 'SIGTERM'
1 parent fde4abd commit 974ce9a

8 files changed

Lines changed: 155 additions & 116 deletions

File tree

FlagEmbedding/evaluation/air_bench/__main__.py

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,27 @@
66
)
77

88

9-
parser = HfArgumentParser((
10-
AIRBenchEvalArgs,
11-
AIRBenchEvalModelArgs
12-
))
13-
14-
eval_args, model_args = parser.parse_args_into_dataclasses()
15-
eval_args: AIRBenchEvalArgs
16-
model_args: AIRBenchEvalModelArgs
17-
18-
runner = AIRBenchEvalRunner(
19-
eval_args=eval_args,
20-
model_args=model_args
21-
)
9+
def main():
10+
parser = HfArgumentParser((
11+
AIRBenchEvalArgs,
12+
AIRBenchEvalModelArgs
13+
))
14+
15+
eval_args, model_args = parser.parse_args_into_dataclasses()
16+
eval_args: AIRBenchEvalArgs
17+
model_args: AIRBenchEvalModelArgs
18+
19+
runner = AIRBenchEvalRunner(
20+
eval_args=eval_args,
21+
model_args=model_args
22+
)
23+
24+
runner.run()
2225

23-
runner.run()
2426

25-
print("==============================================")
26-
print("Search results have been generated.")
27-
print("For computing metrics, please refer to the official AIR-Bench docs:")
28-
print("- https://github.com/AIR-Bench/AIR-Bench/blob/main/docs/submit_to_leaderboard.md")
27+
if __name__ == "__main__":
28+
main()
29+
print("==============================================")
30+
print("Search results have been generated.")
31+
print("For computing metrics, please refer to the official AIR-Bench docs:")
32+
print("- https://github.com/AIR-Bench/AIR-Bench/blob/main/docs/submit_to_leaderboard.md")

FlagEmbedding/evaluation/beir/__main__.py

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,23 @@
66
)
77

88

9-
parser = HfArgumentParser((
10-
BEIREvalArgs,
11-
BEIREvalModelArgs
12-
))
13-
14-
eval_args, model_args = parser.parse_args_into_dataclasses()
15-
eval_args: BEIREvalArgs
16-
model_args: BEIREvalModelArgs
17-
18-
runner = BEIREvalRunner(
19-
eval_args=eval_args,
20-
model_args=model_args
21-
)
9+
def main():
10+
parser = HfArgumentParser((
11+
BEIREvalArgs,
12+
BEIREvalModelArgs
13+
))
14+
15+
eval_args, model_args = parser.parse_args_into_dataclasses()
16+
eval_args: BEIREvalArgs
17+
model_args: BEIREvalModelArgs
18+
19+
runner = BEIREvalRunner(
20+
eval_args=eval_args,
21+
model_args=model_args
22+
)
23+
24+
runner.run()
25+
2226

23-
runner.run()
27+
if __name__ == "__main__":
28+
main()

FlagEmbedding/evaluation/custom/__main__.py

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,23 @@
66
)
77

88

9-
parser = HfArgumentParser((
10-
CustomEvalArgs,
11-
CustomEvalModelArgs
12-
))
13-
14-
eval_args, model_args = parser.parse_args_into_dataclasses()
15-
eval_args: CustomEvalArgs
16-
model_args: CustomEvalModelArgs
17-
18-
runner = CustomEvalRunner(
19-
eval_args=eval_args,
20-
model_args=model_args
21-
)
9+
def main():
10+
parser = HfArgumentParser((
11+
CustomEvalArgs,
12+
CustomEvalModelArgs
13+
))
14+
15+
eval_args, model_args = parser.parse_args_into_dataclasses()
16+
eval_args: CustomEvalArgs
17+
model_args: CustomEvalModelArgs
18+
19+
runner = CustomEvalRunner(
20+
eval_args=eval_args,
21+
model_args=model_args
22+
)
23+
24+
runner.run()
25+
2226

23-
runner.run()
27+
if __name__ == "__main__":
28+
main()

FlagEmbedding/evaluation/miracl/__main__.py

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,23 @@
66
)
77

88

9-
parser = HfArgumentParser((
10-
MIRACLEvalArgs,
11-
MIRACLEvalModelArgs
12-
))
13-
14-
eval_args, model_args = parser.parse_args_into_dataclasses()
15-
eval_args: MIRACLEvalArgs
16-
model_args: MIRACLEvalModelArgs
17-
18-
runner = MIRACLEvalRunner(
19-
eval_args=eval_args,
20-
model_args=model_args
21-
)
9+
def main():
10+
parser = HfArgumentParser((
11+
MIRACLEvalArgs,
12+
MIRACLEvalModelArgs
13+
))
14+
15+
eval_args, model_args = parser.parse_args_into_dataclasses()
16+
eval_args: MIRACLEvalArgs
17+
model_args: MIRACLEvalModelArgs
18+
19+
runner = MIRACLEvalRunner(
20+
eval_args=eval_args,
21+
model_args=model_args
22+
)
23+
24+
runner.run()
25+
2226

23-
runner.run()
27+
if __name__ == "__main__":
28+
main()

FlagEmbedding/evaluation/mkqa/__main__.py

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,23 @@
66
)
77

88

9-
parser = HfArgumentParser((
10-
MKQAEvalArgs,
11-
MKQAEvalModelArgs
12-
))
13-
14-
eval_args, model_args = parser.parse_args_into_dataclasses()
15-
eval_args: MKQAEvalArgs
16-
model_args: MKQAEvalModelArgs
17-
18-
runner = MKQAEvalRunner(
19-
eval_args=eval_args,
20-
model_args=model_args
21-
)
9+
def main():
10+
parser = HfArgumentParser((
11+
MKQAEvalArgs,
12+
MKQAEvalModelArgs
13+
))
14+
15+
eval_args, model_args = parser.parse_args_into_dataclasses()
16+
eval_args: MKQAEvalArgs
17+
model_args: MKQAEvalModelArgs
18+
19+
runner = MKQAEvalRunner(
20+
eval_args=eval_args,
21+
model_args=model_args
22+
)
23+
24+
runner.run()
25+
2226

23-
runner.run()
27+
if __name__ == "__main__":
28+
main()

FlagEmbedding/evaluation/mldr/__main__.py

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,23 @@
66
)
77

88

9-
parser = HfArgumentParser((
10-
MLDREvalArgs,
11-
MLDREvalModelArgs
12-
))
13-
14-
eval_args, model_args = parser.parse_args_into_dataclasses()
15-
eval_args: MLDREvalArgs
16-
model_args: MLDREvalModelArgs
17-
18-
runner = MLDREvalRunner(
19-
eval_args=eval_args,
20-
model_args=model_args
21-
)
9+
def main():
10+
parser = HfArgumentParser((
11+
MLDREvalArgs,
12+
MLDREvalModelArgs
13+
))
14+
15+
eval_args, model_args = parser.parse_args_into_dataclasses()
16+
eval_args: MLDREvalArgs
17+
model_args: MLDREvalModelArgs
18+
19+
runner = MLDREvalRunner(
20+
eval_args=eval_args,
21+
model_args=model_args
22+
)
23+
24+
runner.run()
25+
2226

23-
runner.run()
27+
if __name__ == "__main__":
28+
main()

FlagEmbedding/evaluation/msmarco/__main__.py

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,23 @@
66
)
77

88

9-
parser = HfArgumentParser((
10-
MSMARCOEvalArgs,
11-
MSMARCOEvalModelArgs
12-
))
13-
14-
eval_args, model_args = parser.parse_args_into_dataclasses()
15-
eval_args: MSMARCOEvalArgs
16-
model_args: MSMARCOEvalModelArgs
17-
18-
runner = MSMARCOEvalRunner(
19-
eval_args=eval_args,
20-
model_args=model_args
21-
)
9+
def main():
10+
parser = HfArgumentParser((
11+
MSMARCOEvalArgs,
12+
MSMARCOEvalModelArgs
13+
))
14+
15+
eval_args, model_args = parser.parse_args_into_dataclasses()
16+
eval_args: MSMARCOEvalArgs
17+
model_args: MSMARCOEvalModelArgs
18+
19+
runner = MSMARCOEvalRunner(
20+
eval_args=eval_args,
21+
model_args=model_args
22+
)
23+
24+
runner.run()
25+
2226

23-
runner.run()
27+
if __name__ == "__main__":
28+
main()

FlagEmbedding/evaluation/mteb/__main__.py

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,23 @@
66
)
77

88

9-
parser = HfArgumentParser((
10-
MTEBEvalArgs,
11-
MTEBEvalModelArgs
12-
))
13-
14-
eval_args, model_args = parser.parse_args_into_dataclasses()
15-
eval_args: MTEBEvalArgs
16-
model_args: MTEBEvalModelArgs
17-
18-
runner = MTEBEvalRunner(
19-
eval_args=eval_args,
20-
model_args=model_args
21-
)
9+
def main():
10+
parser = HfArgumentParser((
11+
MTEBEvalArgs,
12+
MTEBEvalModelArgs
13+
))
14+
15+
eval_args, model_args = parser.parse_args_into_dataclasses()
16+
eval_args: MTEBEvalArgs
17+
model_args: MTEBEvalModelArgs
18+
19+
runner = MTEBEvalRunner(
20+
eval_args=eval_args,
21+
model_args=model_args
22+
)
23+
24+
runner.run()
25+
2226

23-
runner.run()
27+
if __name__ == "__main__":
28+
main()

0 commit comments

Comments
 (0)