From 24dd4ef000077e73bf7d19f3d5813a920d064f7a Mon Sep 17 00:00:00 2001 From: iperov Date: Wed, 27 Mar 2019 10:28:07 +0400 Subject: [PATCH] get rid of random module --- samples/SampleGeneratorFace.py | 6 +++--- samples/SampleGeneratorImageTemporal.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/SampleGeneratorFace.py b/samples/SampleGeneratorFace.py index ed549cb..6bdf5ea 100644 --- a/samples/SampleGeneratorFace.py +++ b/samples/SampleGeneratorFace.py @@ -1,6 +1,5 @@ import traceback import numpy as np -import random import cv2 import multiprocessing from utils import iter_utils @@ -13,7 +12,7 @@ from samples import SampleGeneratorBase ''' arg -output_sample_types = [ +output_sample_types = [ [SampleProcessor.TypeFlags, size, (optional)random_sub_size] , ... ] @@ -119,7 +118,8 @@ class SampleGeneratorFace(SampleGeneratorBase): idx = shuffle_idxs.pop() if samples[idx] != None: if len(shuffle_idxs_2D[idx]) == 0: - shuffle_idxs_2D[idx] = random.sample( range(len(samples[idx])), len(samples[idx]) ) + a = shuffle_idxs_2D[idx] = [ *range(len(samples[idx])) ] + np.random.shuffle (a) idx2 = shuffle_idxs_2D[idx].pop() sample = samples[idx][idx2] diff --git a/samples/SampleGeneratorImageTemporal.py b/samples/SampleGeneratorImageTemporal.py index 8e647d9..5823c85 100644 --- a/samples/SampleGeneratorImageTemporal.py +++ b/samples/SampleGeneratorImageTemporal.py @@ -1,6 +1,5 @@ import traceback import numpy as np -import random import cv2 from utils import iter_utils @@ -58,7 +57,8 @@ class SampleGeneratorImageTemporal(SampleGeneratorBase): for n_batch in range(self.batch_size): if len(shuffle_idxs) == 0: - shuffle_idxs = random.sample( range(samples_sub_len), samples_sub_len ) + shuffle_idxs = [ *range(samples_sub_len) ] + np.random.shuffle (shuffle_idxs) idx = shuffle_idxs.pop()