Skip to content

Add missing epoch reshuffling in the evaluation #28

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.

Sign up for GitHub

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

Open
bryant1410 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add missing epoch reshuffling in the evaluation #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5be1dba
Add missing epoch reshuffling in the evaluation
bryant1410 Feb 22, 2024
7584de0
Update eval.py
bryant1410 Feb 22, 2024
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
10 changes: 6 additions & 4 deletions evals/image_classification_frozen/eval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def main(args_eval, resume_preempt=False):
num_classes=num_classes
).to(device)

train_loader = make_dataloader(
train_loader, dist_sampler = make_dataloader(
dataset_name=dataset_name,
root_path=root_path,
resolution=resolution,
Expand All @@ -175,7 +175,7 @@ def main(args_eval, resume_preempt=False):
world_size=world_size,
rank=rank,
training=True)
val_loader = make_dataloader(
val_loader, _ = make_dataloader(
dataset_name=dataset_name,
root_path=root_path,
resolution=resolution,
Expand Down Expand Up @@ -229,6 +229,9 @@ def save_checkpoint(epoch):
# TRAIN LOOP
for epoch in range(start_epoch, num_epochs):
logger.info('Epoch %d' % (epoch + 1))

dist_sampler.set_epoch(epoch)

train_acc = run_one_epoch(
device=device,
training=True,
Expand Down Expand Up @@ -408,7 +411,7 @@ def make_dataloader(
transforms.ToTensor(),
transforms.Normalize(normalization[0], normalization[1])])

data_loader, _ = init_data(
return init_data(
data=dataset_name,
transform=transform,
batch_size=batch_size,
Expand All @@ -420,7 +423,6 @@ def make_dataloader(
copy_data=False,
drop_last=False,
subset_file=subset_file)
return data_loader


def init_model(
Expand Down
10 changes: 6 additions & 4 deletions evals/video_classification_frozen/eval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def main(args_eval, resume_preempt=False):
num_classes=num_classes,
).to(device)

train_loader = make_dataloader(
train_loader, dist_sampler = make_dataloader(
dataset_type=dataset_type,
root_path=train_data_path,
resolution=resolution,
Expand All @@ -200,7 +200,7 @@ def main(args_eval, resume_preempt=False):
world_size=world_size,
rank=rank,
training=True)
val_loader = make_dataloader(
val_loader, _ = make_dataloader(
dataset_type=dataset_type,
root_path=val_data_path,
resolution=resolution,
Expand Down Expand Up @@ -259,6 +259,9 @@ def save_checkpoint(epoch):
# TRAIN LOOP
for epoch in range(start_epoch, num_epochs):
logger.info('Epoch %d' % (epoch + 1))

dist_sampler.set_epoch(epoch)

train_acc = run_one_epoch(
device=device,
training=True,
Expand Down Expand Up @@ -469,7 +472,7 @@ def make_dataloader(
crop_size=resolution,
)

data_loader, _ = init_data(
return init_data(
data=dataset_type,
root_path=root_path,
transform=transform,
Expand All @@ -485,7 +488,6 @@ def make_dataloader(
copy_data=False,
drop_last=False,
subset_file=subset_file)
return data_loader


def init_model(
Expand Down