Skip to content

Imagenet data setup fixes #574

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

Merged
merged 3 commits into from
Nov 15, 2023
Merged

Imagenet data setup fixes #574

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42c4481
imagenet pytorch donwload fixes
priyakasimbeg Nov 14, 2023
7b2c8a7
syntax fix
priyakasimbeg Nov 14, 2023
4c58be8
formatting
priyakasimbeg Nov 15, 2023
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
20 changes: 17 additions & 3 deletions datasets/dataset_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@ def setup_fastmri(data_dir, src_data_dir):


def download_imagenet(data_dir, imagenet_train_url, imagenet_val_url):
"""Downloads and returns the download dir."""
imagenet_train_filepath = os.path.join(data_dir, IMAGENET_TRAIN_TAR_FILENAME)
imagenet_val_filepath = os.path.join(data_dir, IMAGENET_VAL_TAR_FILENAME)

Expand Down Expand Up @@ -506,7 +507,20 @@ def setup_imagenet_pytorch(data_dir):
val_tar_file_path = os.path.join(data_dir, IMAGENET_VAL_TAR_FILENAME)
test_dir_path = os.path.join(data_dir, 'imagenet_v2')

# Setup jax dataset dir
# Check if downloaded data has been moved
manual_download_dir = os.path.join(data_dir, 'jax', 'downloads', 'manual')
if not os.path.exists(train_tar_file_path):
if os.path.exists(
os.path.join(manual_download_dir, IMAGENET_TRAIN_TAR_FILENAME)):
train_tar_file_path = os.path.join(manual_download_dir,
IMAGENET_TRAIN_TAR_FILENAME)
if not os.path.exists(val_tar_file_path):
if os.path.exists(
os.path.join(manual_download_dir, IMAGENET_VAL_TAR_FILENAME)):
val_tar_file_path = os.path.join(manual_download_dir,
IMAGENET_VAL_TAR_FILENAME)

# Setup pytorch dataset dir
imagenet_pytorch_data_dir = os.path.join(data_dir, 'pytorch')
os.makedirs(imagenet_pytorch_data_dir)
os.makedirs(os.path.join(imagenet_pytorch_data_dir, 'train'))
Expand All @@ -519,9 +533,9 @@ def setup_imagenet_pytorch(data_dir):
logging.info('Moving {} to {}'.format(val_tar_file_path,
imagenet_pytorch_data_dir))
shutil.move(val_tar_file_path, imagenet_pytorch_data_dir)
if not os.path.exists(os.path.join(imagenet_jax_data_dir, 'imagenet_v2')):
if not os.path.exists(os.path.join(imagenet_pytorch_data_dir, 'imagenet_v2')):
logging.info('Moving imagenet_v2 to {}'.format(
os.path.join(imagenet_jax_data_dir, 'imagenet_v2')))
os.path.join(imagenet_pytorch_data_dir, 'imagenet_v2')))
shutil.move(test_dir_path,
os.path.join(imagenet_pytorch_data_dir, 'imagenet_v2'))

Expand Down