diff --git a/AB_environments/AB_baseline.conda.yaml b/AB_environments/AB_baseline.conda.yaml index d4da9c90f1..8812c65fb9 100644 --- a/AB_environments/AB_baseline.conda.yaml +++ b/AB_environments/AB_baseline.conda.yaml @@ -36,7 +36,7 @@ dependencies: - toolz ==0.12.0 - zict ==3.0.0 - xgboost ==1.7.4 - - optuna ==3.2.0 + - optuna ==3.3.0 - scipy ==1.10.1 - snowflake-connector-python ==3.0.4 - snowflake-sqlalchemy ==1.4.7 diff --git a/AB_environments/AB_sample.conda.yaml b/AB_environments/AB_sample.conda.yaml index bffb45a164..8a7cf8d9e1 100644 --- a/AB_environments/AB_sample.conda.yaml +++ b/AB_environments/AB_sample.conda.yaml @@ -41,7 +41,7 @@ dependencies: - toolz ==0.12.0 - zict ==3.0.0 - xgboost ==1.7.4 - - optuna ==3.2.0 + - optuna ==3.3.0 - scipy ==1.10.1 - snowflake-connector-python ==3.0.4 - snowflake-sqlalchemy ==1.4.7 diff --git a/ci/environment.yml b/ci/environment.yml index 3d5aa4a809..d54c831165 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -31,7 +31,7 @@ dependencies: - toolz ==0.12.0 - zict ==3.0.0 - xgboost ==1.7.4 - - optuna ==3.2.0 + - optuna ==3.3.0 - scipy ==1.10.1 - snowflake-connector-python ==3.0.4 - snowflake-sqlalchemy ==1.4.7 diff --git a/tests/workflows/test_pytorch_optuna.py b/tests/workflows/test_pytorch_optuna.py index e17aac777b..75639e45ba 100644 --- a/tests/workflows/test_pytorch_optuna.py +++ b/tests/workflows/test_pytorch_optuna.py @@ -4,7 +4,7 @@ import zipfile import pytest -from dask.distributed import PipInstall +from dask.distributed import Lock, PipInstall, get_worker from ..utils_test import wait @@ -47,23 +47,27 @@ def weights_init(m): def download_data(): import s3fs # FIXME: see above install w/ urllib3 - import here after reinstall - tmpdir = tempfile.gettempdir() - zip = pathlib.Path(tmpdir).joinpath("img_align_celeba.zip") - dataset_dir = zip.parent.joinpath("img_align_celeba") - - if zip.exists(): - print("Dataset already downloaded, returning dataset dir") + worker = get_worker() + with Lock(worker.address): + tmpdir = tempfile.gettempdir() + zip = pathlib.Path(tmpdir).joinpath("img_align_celeba.zip") + dataset_dir = zip.parent.joinpath("img_align_celeba") + + if zip.exists(): + print("Dataset already downloaded, returning dataset dir") + return dataset_dir + + print("Downloading dataset...") + fs = s3fs.S3FileSystem(anon=True) + fs.download( + "s3://coiled-datasets/CelebA-Faces/img_align_celeba.zip", str(zip) + ) + + print(f"Unzipping into {dataset_dir}") + with zipfile.ZipFile(str(zip), "r") as zipped: + zipped.extractall(dataset_dir) return dataset_dir - print("Downloading dataset...") - fs = s3fs.S3FileSystem(anon=True) - fs.download("s3://coiled-datasets/CelebA-Faces/img_align_celeba.zip", str(zip)) - - print(f"Unzipping into {dataset_dir}") - with zipfile.ZipFile(str(zip), "r") as zipped: - zipped.extractall(dataset_dir) - return dataset_dir - def get_generator(trial): import torch.nn as nn