diff --git a/CHANGELOG.md b/CHANGELOG.md index 749bef4180..ab2004794b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Changed the default values `pin_memory=False`, `shuffle=False` and `num_workers=16` to `pin_memory=True`, `shuffle=True` and `num_workers=0` of datamodules ([#701](https://github.com/PyTorchLightning/lightning-bolts/pull/701)) + ### Deprecated diff --git a/pl_bolts/datamodules/binary_mnist_datamodule.py b/pl_bolts/datamodules/binary_mnist_datamodule.py index d234f51b88..f767b21655 100644 --- a/pl_bolts/datamodules/binary_mnist_datamodule.py +++ b/pl_bolts/datamodules/binary_mnist_datamodule.py @@ -47,12 +47,12 @@ def __init__( self, data_dir: Optional[str] = None, val_split: Union[int, float] = 0.2, - num_workers: int = 16, + num_workers: int = 0, normalize: bool = False, batch_size: int = 32, seed: int = 42, - shuffle: bool = False, - pin_memory: bool = False, + shuffle: bool = True, + pin_memory: bool = True, drop_last: bool = False, *args: Any, **kwargs: Any, diff --git a/pl_bolts/datamodules/cifar10_datamodule.py b/pl_bolts/datamodules/cifar10_datamodule.py index cd809a632f..052f52fc2c 100644 --- a/pl_bolts/datamodules/cifar10_datamodule.py +++ b/pl_bolts/datamodules/cifar10_datamodule.py @@ -62,12 +62,12 @@ def __init__( self, data_dir: Optional[str] = None, val_split: Union[int, float] = 0.2, - num_workers: int = 16, + num_workers: int = 0, normalize: bool = False, batch_size: int = 32, seed: int = 42, - shuffle: bool = False, - pin_memory: bool = False, + shuffle: bool = True, + pin_memory: bool = True, drop_last: bool = False, *args: Any, **kwargs: Any, @@ -148,7 +148,7 @@ def __init__( self, data_dir: Optional[str] = None, val_split: int = 50, - num_workers: int = 16, + num_workers: int = 0, num_samples: int = 100, labels: Optional[Sequence] = (1, 5, 8), *args: Any, diff --git a/pl_bolts/datamodules/cityscapes_datamodule.py b/pl_bolts/datamodules/cityscapes_datamodule.py index f435c7c868..83d84a8ff9 100644 --- a/pl_bolts/datamodules/cityscapes_datamodule.py +++ b/pl_bolts/datamodules/cityscapes_datamodule.py @@ -66,11 +66,11 @@ def __init__( data_dir: str, quality_mode: str = 'fine', target_type: str = 'instance', - num_workers: int = 16, + num_workers: int = 0, batch_size: int = 32, seed: int = 42, - shuffle: bool = False, - pin_memory: bool = False, + shuffle: bool = True, + pin_memory: bool = True, drop_last: bool = False, *args: Any, **kwargs: Any, diff --git a/pl_bolts/datamodules/fashion_mnist_datamodule.py b/pl_bolts/datamodules/fashion_mnist_datamodule.py index f945e00912..ad543e7687 100644 --- a/pl_bolts/datamodules/fashion_mnist_datamodule.py +++ b/pl_bolts/datamodules/fashion_mnist_datamodule.py @@ -48,12 +48,12 @@ def __init__( self, data_dir: Optional[str] = None, val_split: Union[int, float] = 0.2, - num_workers: int = 16, + num_workers: int = 0, normalize: bool = False, batch_size: int = 32, seed: int = 42, - shuffle: bool = False, - pin_memory: bool = False, + shuffle: bool = True, + pin_memory: bool = True, drop_last: bool = False, *args: Any, **kwargs: Any, diff --git a/pl_bolts/datamodules/imagenet_datamodule.py b/pl_bolts/datamodules/imagenet_datamodule.py index 15494e55b7..e45ce63bd0 100644 --- a/pl_bolts/datamodules/imagenet_datamodule.py +++ b/pl_bolts/datamodules/imagenet_datamodule.py @@ -54,10 +54,10 @@ def __init__( meta_dir: Optional[str] = None, num_imgs_per_val_class: int = 50, image_size: int = 224, - num_workers: int = 16, + num_workers: int = 0, batch_size: int = 32, - shuffle: bool = False, - pin_memory: bool = False, + shuffle: bool = True, + pin_memory: bool = True, drop_last: bool = False, *args: Any, **kwargs: Any, diff --git a/pl_bolts/datamodules/kitti_datamodule.py b/pl_bolts/datamodules/kitti_datamodule.py index ee4014d67a..efefe5c6e5 100644 --- a/pl_bolts/datamodules/kitti_datamodule.py +++ b/pl_bolts/datamodules/kitti_datamodule.py @@ -26,11 +26,11 @@ def __init__( data_dir: Optional[str] = None, val_split: float = 0.2, test_split: float = 0.1, - num_workers: int = 16, + num_workers: int = 0, batch_size: int = 32, seed: int = 42, - shuffle: bool = False, - pin_memory: bool = False, + shuffle: bool = True, + pin_memory: bool = True, drop_last: bool = False, *args: Any, **kwargs: Any, diff --git a/pl_bolts/datamodules/mnist_datamodule.py b/pl_bolts/datamodules/mnist_datamodule.py index 8ba86f2403..f81ad792af 100644 --- a/pl_bolts/datamodules/mnist_datamodule.py +++ b/pl_bolts/datamodules/mnist_datamodule.py @@ -46,12 +46,12 @@ def __init__( self, data_dir: Optional[str] = None, val_split: Union[int, float] = 0.2, - num_workers: int = 16, + num_workers: int = 0, normalize: bool = False, batch_size: int = 32, seed: int = 42, - shuffle: bool = False, - pin_memory: bool = False, + shuffle: bool = True, + pin_memory: bool = True, drop_last: bool = False, *args: Any, **kwargs: Any, diff --git a/pl_bolts/datamodules/sklearn_datamodule.py b/pl_bolts/datamodules/sklearn_datamodule.py index 704f671c06..dd2ee6793a 100644 --- a/pl_bolts/datamodules/sklearn_datamodule.py +++ b/pl_bolts/datamodules/sklearn_datamodule.py @@ -153,11 +153,11 @@ def __init__( y_test=None, val_split=0.2, test_split=0.1, - num_workers=2, + num_workers=0, random_state=1234, shuffle=True, batch_size: int = 16, - pin_memory=False, + pin_memory=True, drop_last=False, *args, **kwargs, diff --git a/pl_bolts/datamodules/ssl_imagenet_datamodule.py b/pl_bolts/datamodules/ssl_imagenet_datamodule.py index 3d4c827eb7..c1a87f0023 100644 --- a/pl_bolts/datamodules/ssl_imagenet_datamodule.py +++ b/pl_bolts/datamodules/ssl_imagenet_datamodule.py @@ -24,10 +24,10 @@ def __init__( self, data_dir: str, meta_dir: Optional[str] = None, - num_workers: int = 16, + num_workers: int = 0, batch_size: int = 32, - shuffle: bool = False, - pin_memory: bool = False, + shuffle: bool = True, + pin_memory: bool = True, drop_last: bool = False, *args: Any, **kwargs: Any, diff --git a/pl_bolts/datamodules/stl10_datamodule.py b/pl_bolts/datamodules/stl10_datamodule.py index 640a57181c..8384134cf1 100644 --- a/pl_bolts/datamodules/stl10_datamodule.py +++ b/pl_bolts/datamodules/stl10_datamodule.py @@ -58,11 +58,11 @@ def __init__( data_dir: Optional[str] = None, unlabeled_val_split: int = 5000, train_val_split: int = 500, - num_workers: int = 16, + num_workers: int = 0, batch_size: int = 32, seed: int = 42, - shuffle: bool = False, - pin_memory: bool = False, + shuffle: bool = True, + pin_memory: bool = True, drop_last: bool = False, *args: Any, **kwargs: Any, diff --git a/pl_bolts/datamodules/vision_datamodule.py b/pl_bolts/datamodules/vision_datamodule.py index d15d9c59d4..8c6c5c055d 100644 --- a/pl_bolts/datamodules/vision_datamodule.py +++ b/pl_bolts/datamodules/vision_datamodule.py @@ -20,12 +20,12 @@ def __init__( self, data_dir: Optional[str] = None, val_split: Union[int, float] = 0.2, - num_workers: int = 16, + num_workers: int = 0, normalize: bool = False, batch_size: int = 32, seed: int = 42, - shuffle: bool = False, - pin_memory: bool = False, + shuffle: bool = True, + pin_memory: bool = True, drop_last: bool = False, *args: Any, **kwargs: Any, diff --git a/pl_bolts/datamodules/vocdetection_datamodule.py b/pl_bolts/datamodules/vocdetection_datamodule.py index 20834a3af3..0f98e240af 100644 --- a/pl_bolts/datamodules/vocdetection_datamodule.py +++ b/pl_bolts/datamodules/vocdetection_datamodule.py @@ -114,10 +114,10 @@ def __init__( self, data_dir: str, year: str = "2012", - num_workers: int = 16, + num_workers: int = 0, normalize: bool = False, - shuffle: bool = False, - pin_memory: bool = False, + shuffle: bool = True, + pin_memory: bool = True, drop_last: bool = False, *args: Any, **kwargs: Any,