Commit bb2262de authored by Yuxin Wu's avatar Yuxin Wu

fix #1002

parent 9a1043e1
...@@ -49,8 +49,7 @@ class Augmentor(object): ...@@ -49,8 +49,7 @@ class Augmentor(object):
This can be used in, e.g. augmentation for image, masks, keypoints altogether. This can be used in, e.g. augmentation for image, masks, keypoints altogether.
Returns: Returns:
augmented data (augmented data, augmentation params)
augmentation params: can be any type
""" """
return self._augment_return_params(d) return self._augment_return_params(d)
......
...@@ -165,6 +165,7 @@ class SyncMultiGPUTrainerReplicated(SingleCostTrainer): ...@@ -165,6 +165,7 @@ class SyncMultiGPUTrainerReplicated(SingleCostTrainer):
Supported values: ['nccl', 'hierarchical', 'cpu']. Supported values: ['nccl', 'hierarchical', 'cpu'].
Default to pick automatically by heuristics. Default to pick automatically by heuristics.
These modes may have slight (within 5%) differences in speed. These modes may have slight (within 5%) differences in speed.
"hierarchical" mode was designed for DGX-like 8GPU machines.
use_nccl: deprecated option use_nccl: deprecated option
""" """
self.devices = gpus self.devices = gpus
...@@ -173,7 +174,7 @@ class SyncMultiGPUTrainerReplicated(SingleCostTrainer): ...@@ -173,7 +174,7 @@ class SyncMultiGPUTrainerReplicated(SingleCostTrainer):
mode = 'nccl' if use_nccl else None mode = 'nccl' if use_nccl else None
log_deprecated("use_nccl option", "Use the `mode` option instead!", "2019-01-31") log_deprecated("use_nccl option", "Use the `mode` option instead!", "2019-01-31")
if mode is None: if mode is None:
mode = 'hierarchical' if len(gpus) >= 8 else 'nccl' mode = 'hierarchical' if len(gpus) == 8 else 'nccl'
mode = mode.lower() mode = mode.lower()
self._builder = SyncMultiGPUReplicatedBuilder(gpus, average, mode) self._builder = SyncMultiGPUReplicatedBuilder(gpus, average, mode)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment