Merge remote-tracking branch 'refs/remotes/origin/lag2eul' into lag2eul

map2map/data/sampler.py

@@ -38,11 +38,11 @@ class DistFieldSampler(Sampler):
         self.div_shuffle_dist = div_shuffle_dist
 
     def __iter__(self):
+        if self.shuffle:
             # deterministically shuffle based on epoch
             g = torch.Generator()
             g.manual_seed(self.epoch)
 
-        if self.shuffle:
             if self.div_data:
                 # shuffle files
                 ind = torch.randperm(self.nfile, generator=g)