Merge remote-tracking branch 'origin/master'

nschaetti · Jan 17, 2019 · fa2150a · fa2150a
2 parents a2d672d + 2873bf5
commit fa2150a
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/echotorch/__init__.py b/echotorch/__init__.py
@@ -2,10 +2,10 @@
 #
 
 # Imports
-import datasets
-import models
-import nn
-import utils
+from . import datasets
+from . import models
+from . import nn
+from . import utils
 
 
 # All EchoTorch's modules

diff --git a/echotorch/datasets/__init__.py b/echotorch/datasets/__init__.py
@@ -8,5 +8,5 @@
 from .NARMADataset import NARMADataset
 
 __all__ = [
-    'LogisticMapDataset', 'MackeyGlassDataset', 'MemTestDataset', 'NARMADataset'
+   'LogisticMapDataset', 'MackeyGlassDataset', 'MemTestDataset', 'NARMADataset'
 ]
diff --git a/echotorch/models/__init__.py b/echotorch/models/__init__.py
@@ -20,5 +20,5 @@
 # Copyright Nils Schaetti, University of Neuchâtel <nils.schaetti@unine.ch>
 
 # Imports
-from HNilsNet import HNilsNet
-from NilsNet import NilsNet
+from .HNilsNet import HNilsNet
+from .NilsNet import NilsNet
diff --git a/echotorch/nn/BDESN.py b/echotorch/nn/BDESN.py
@@ -30,7 +30,7 @@
 import torch.nn as nn
 from torch.autograd import Variable
 from .BDESNCell import BDESNCell
-from RRCell import RRCell
+from .RRCell import RRCell
 
 
 # Bi-directional Echo State Network module

diff --git a/echotorch/nn/BDESNCell.py b/echotorch/nn/BDESNCell.py
@@ -28,7 +28,7 @@
 import torch.sparse
 import torch
 import torch.nn as nn
-from LiESNCell import LiESNCell
+from .LiESNCell import LiESNCell
 import numpy as np
 from torch.autograd import Variable
 

diff --git a/echotorch/nn/ESN.py b/echotorch/nn/ESN.py
@@ -30,7 +30,7 @@
 import torch.nn as nn
 from torch.autograd import Variable
 from . import ESNCell
-from RRCell import RRCell
+from .RRCell import RRCell
 
 
 # Echo State Network module

diff --git a/echotorch/nn/StackedESN.py b/echotorch/nn/StackedESN.py
@@ -31,8 +31,8 @@
 import echotorch.utils
 from torch.autograd import Variable
 from . import LiESNCell
-from RRCell import RRCell
-from ESNCell import ESNCell
+from .RRCell import RRCell
+from .ESNCell import ESNCell
 import numpy as np