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

QOL changes for generations #166

Merged
merged 21 commits into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
4 changes: 3 additions & 1 deletion bigcode_eval/evaluator.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ def generate_text(self, task_name, intermediate_generations=None):
task = tasks.get_task(task_name, self.args)
dataset = task.get_dataset()
# if args.limit is None, use all samples
n_tasks = self.args.limit if self.args.limit else len(dataset)
# if args.limit is used, make sure args.limit_start + args.limit <= len(dataset)
n_tasks = min(self.args.limit, len(dataset) - self.args.limit_start) if self.args.limit else len(dataset)
# when args.limit is None
# adjust n_tasks by args.limit_start to prevent out of bounds issues
if not self.args.limit:
Expand Down Expand Up @@ -75,6 +76,7 @@ def generate_text(self, task_name, intermediate_generations=None):
args=self.args,
curr_sample_idx=curr_sample_idx, # curr_sample_idx will added to limit_start to fix indexing
save_every_k_tasks=self.args.save_every_k_tasks,
intermediate_generations=generations,
intermediate_save_generations_path=intermediate_save_generations_path,
maxmatical marked this conversation as resolved.
Show resolved Hide resolved
)
generations.extend(new_generations)
Expand Down
4 changes: 3 additions & 1 deletion bigcode_eval/generation.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import json
from math import ceil

from typing import Optional
from typing import List, Optional

from accelerate.utils import set_seed
from torch.utils.data.dataloader import DataLoader
Expand Down Expand Up @@ -49,6 +49,7 @@ def parallel_generations(
args,
curr_sample_idx: int = 0,
save_every_k_tasks: int = -1,
intermediate_generations: Optional[List[Optional[List[Optional[str]]]]] = None,
intermediate_save_generations_path: Optional[str] = None,
):
if args.load_generations_path:
Expand Down Expand Up @@ -151,6 +152,7 @@ def parallel_generations(
postprocess=args.postprocess,
is_wrapped=is_loaded_in_8bit or is_loaded_in_4bit,
save_every_k_tasks=save_every_k_tasks,
intermediate_generations=intermediate_generations,
intermediate_save_generations_path=intermediate_save_generations_path,
**gen_kwargs,
)
Expand Down
5 changes: 4 additions & 1 deletion bigcode_eval/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ def complete_code(
postprocess=True,
is_wrapped=False,
save_every_k_tasks: int = -1,
intermediate_generations: Optional[List[Optional[List[Optional[str]]]]] = None,
intermediate_save_generations_path: Optional[str] = None,
**gen_kwargs,
):
Expand All @@ -246,6 +247,7 @@ def complete_code(
# keep track of the list of generated codes
# where len(code_gens) = n_tasks and len(code_gens[0]) = number of generated code samples
code_gens: List[List[Optional[str]]] = [[] for _ in range(n_tasks)]
intermediate_generations = [] if not intermediate_generations else intermediate_generations
gen_token_dict = defaultdict(list) # dict of list of generated tokens
for step, batch in tqdm(
enumerate(dataloader),
Expand Down Expand Up @@ -332,7 +334,8 @@ def complete_code(
gen_token_dict,
)
with open(intermediate_save_generations_path, "w") as fp:
json.dump(code_gens, fp)
intermediate_generations.extend(code_gens)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if there are multiple saving steps, I think we'll add the same generations several times into intermediate_generations.
Also this list is also extended in evaluator.py

generations.extend(new_generations)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're right, made 2 changes in the new commit

  1. instead of extending on intermediate_generations when saving which end up duplicating new generations, extend on a deepcopy instead which prevents duplications
  2. instead of extending at evaluator, return intermediate_generations.extend(code_gens) in complete_code, which makes a bit more sense with this new logic. since we never mutate intermediate_generations when saving, this will return the non-duplicated generations

json.dump(intermediate_generations, fp)
print(
f"intermediate generations were saved at {intermediate_save_generations_path}"
)
Expand Down