Resolved merge conflicts

This commit is contained in:
Chantal D Gama Rose 2025-03-14 14:18:23 -07:00
parent 3b3195d8e6
commit eebb0f6e61
8 changed files with 0 additions and 124 deletions

View file

@ -226,8 +226,6 @@ def get_distribution_template() -> DistributionTemplate:
"chat_completion_input": {"type": "string"},
},
),
<<<<<<< HEAD
=======
DatasetInput(
dataset_id="bfcl",
provider_id="huggingface",
@ -244,7 +242,6 @@ def get_distribution_template() -> DistributionTemplate:
"chat_completion_input": {"type": "string"},
},
),
>>>>>>> upstream/main
]
default_benchmarks = [
@ -268,14 +265,11 @@ def get_distribution_template() -> DistributionTemplate:
dataset_id="math_500",
scoring_functions=["basic::regex_parser_math_response"],
),
<<<<<<< HEAD
=======
BenchmarkInput(
benchmark_id="meta-reference-bfcl",
dataset_id="bfcl",
scoring_functions=["basic::bfcl"],
),
>>>>>>> upstream/main
]
return DistributionTemplate(
name=name,