From 509856cb4f82eba72c415c96008c7588b6c8f844 Mon Sep 17 00:00:00 2001 From: Yin Li Date: Sat, 18 Jul 2020 18:07:38 -0400 Subject: [PATCH] Revert "Deprecate GroupedRandomSampler for use of memmap in place of cache" This reverts commit bbf77c9f91ad04fc865e5ffd56270fddbdc56f43. --- map2map/data/__init__.py | 1 + map2map/data/sampler.py | 3 --- map2map/train.py | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/map2map/data/__init__.py b/map2map/data/__init__.py index 0fe6e8a..fe313f0 100644 --- a/map2map/data/__init__.py +++ b/map2map/data/__init__.py @@ -1 +1,2 @@ from .fields import FieldDataset +from .sampler import GroupedRandomSampler diff --git a/map2map/data/sampler.py b/map2map/data/sampler.py index f0cb05b..9bf3436 100644 --- a/map2map/data/sampler.py +++ b/map2map/data/sampler.py @@ -1,6 +1,3 @@ -""" -Deprecated for use of memmap in place of cache -""" from itertools import chain import torch from torch.utils.data import Sampler diff --git a/map2map/train.py b/map2map/train.py index f975fbe..f76a8b0 100644 --- a/map2map/train.py +++ b/map2map/train.py @@ -14,7 +14,7 @@ from torch.utils.data.distributed import DistributedSampler from torch.utils.data import DataLoader from torch.utils.tensorboard import SummaryWriter -from .data import FieldDataset +from .data import FieldDataset, GroupedRandomSampler from .data.figures import plt_slices from . import models from .models import narrow_cast, resample, Lag2Eul