Merge pull request #117 from chainer/refactor-files

Refactor directories and files
chainer · Aug 30, 2017 · d0d2d0b · d0d2d0b
2 parents d35cb9f + 30c2d6c
commit d0d2d0b
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 4 deletions.
diff --git a/chainermn/__init__.py b/chainermn/__init__.py
@@ -1,10 +1,16 @@
 import pkg_resources
 
+from chainermn import communicators  # NOQA
+from chainermn import datasets  # NOQA
+from chainermn import extensions  # NOQA
+from chainermn import links  # NOQA
+from chainermn import optimizers  # NOQA
+
 from chainermn.communicators import create_communicator  # NOQA
-from chainermn.dataset import scatter_dataset  # NOQA
-from chainermn.link import MultiNodeChainList  # NOQA
-from chainermn.multi_node_evaluator import create_multi_node_evaluator  # NOQA
-from chainermn.multi_node_optimizer import create_multi_node_optimizer  # NOQA
+from chainermn.datasets import scatter_dataset  # NOQA
+from chainermn.extensions import create_multi_node_evaluator  # NOQA
+from chainermn.links import MultiNodeChainList  # NOQA
+from chainermn.optimizers import create_multi_node_optimizer  # NOQA
 
 
 __version__ = pkg_resources.get_distribution('chainermn').version
diff --git a/chainermn/datasets/__init__.py b/chainermn/datasets/__init__.py
@@ -1 +1,2 @@
 from chainermn.datasets.empty_dataset import create_empty_dataset  # NOQA
+from chainermn.datasets.scatter_dataset import scatter_dataset  # NOQA
diff --git a/chainermn/dataset.py → chainermn/datasets/scatter_dataset.py b/chainermn/dataset.py → chainermn/datasets/scatter_dataset.py
diff --git a/chainermn/extensions/__init__.py b/chainermn/extensions/__init__.py
@@ -0,0 +1 @@
+from chainermn.extensions.multi_node_evaluator import create_multi_node_evaluator  # NOQA
diff --git a/chainermn/multi_node_evaluator.py → chainermn/extensions/multi_node_evaluator.py b/chainermn/multi_node_evaluator.py → chainermn/extensions/multi_node_evaluator.py
diff --git a/chainermn/links/__init__.py b/chainermn/links/__init__.py
@@ -1 +1,2 @@
 from chainermn.links.batch_normalization import MultiNodeBatchNormalization  # NOQA
+from chainermn.links.multi_node_chain_list import MultiNodeChainList  # NOQA
diff --git a/chainermn/link.py → chainermn/links/multi_node_chain_list.py b/chainermn/link.py → chainermn/links/multi_node_chain_list.py
diff --git a/chainermn/multi_node_optimizer.py → chainermn/optimizers.py b/chainermn/multi_node_optimizer.py → chainermn/optimizers.py