Skip to content

[cherry-pick] fix the bug that _DataLoaderIterMultiProcess use time to generate the seed #43702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 22, 2022
Merged

[cherry-pick] fix the bug that _DataLoaderIterMultiProcess use time to generate the seed #43702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion python/paddle/fluid/dataloader/dataloader_iter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,8 @@ def __init__(self, loader):
# see _try_put_indices
self._thread_lock = threading.Lock()

self._base_seed = np.random.randint(low=0, high=sys.maxsize)

# init workers and indices queues and put 2 indices in each indices queue
self._init_workers()
for _ in range(self._outstanding_capacity):
Expand Down Expand Up @@ -404,7 +406,8 @@ def _init_workers(self):
self._data_queue, self._workers_done_event,
self._auto_collate_batch, self._collate_fn,
self._drop_last, self._worker_init_fn, i,
self._num_workers, self._use_shared_memory))
self._num_workers, self._use_shared_memory,
self._base_seed))
worker.daemon = True
worker.start()
self._workers.append(worker)
Expand Down
13 changes: 10 additions & 3 deletions python/paddle/fluid/dataloader/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ def mix(x, y):

def _worker_loop(dataset, dataset_kind, indices_queue, out_queue, done_event,
auto_collate_batch, collate_fn, drop_last, init_fn, worker_id,
num_workers, use_shared_memory):
num_workers, use_shared_memory, base_seed):
try:
# NOTE: [ mmap files clear ] When the child process exits unexpectedly,
# some shared memory objects may have been applied for but have not yet
Expand All @@ -269,14 +269,21 @@ def _worker_loop(dataset, dataset_kind, indices_queue, out_queue, done_event,
try:
import numpy as np
import time
import random
except ImportError:
pass
else:
np.random.seed(_generate_states(int(time.time()), worker_id))
seed = base_seed + worker_id
random.seed(seed)
paddle.seed(seed)
np.random.seed(_generate_states(base_seed, worker_id))

global _worker_info
_worker_info = WorkerInfo(
id=worker_id, num_workers=num_workers, dataset=dataset)
id=worker_id,
num_workers=num_workers,
dataset=dataset,
seed=base_seed)

init_exception = None
try:
Expand Down
6 changes: 4 additions & 2 deletions python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_exception.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,11 @@ def _collate_fn(sample_list):
for i in range(10):
indices_queue.put([i, i + 10])
indices_queue.put(None)
base_seed = 1234
_worker_loop(loader._dataset, 0, indices_queue,
loader._data_queue, loader._workers_done_event,
True, _collate_fn, True, _init_fn, 0, 1,
loader._use_shared_memory)
loader._use_shared_memory, base_seed)
self.assertTrue(False)
except AssertionError:
pass
Expand Down Expand Up @@ -222,10 +223,11 @@ def _collate_fn(sample_list):
indices_queue.put([i, i + 10])
indices_queue.put(None)
loader._workers_done_event.set()
base_seed = 1234
_worker_loop(loader._dataset, 0, indices_queue,
loader._data_queue, loader._workers_done_event,
True, _collate_fn, True, _init_fn, 0, 1,
loader._use_shared_memory)
loader._use_shared_memory, base_seed)
self.assertTrue(True)
except AssertionError:
pass
Expand Down