make code compatible with mxnet 1.5.0, update requirements

lostella · Aug 26, 2019 · f21a4ef · f21a4ef
1 parent 4740da0
commit f21a4ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -1,8 +1,8 @@
 boto3==1.*
 holidays==0.9.*
 matplotlib==3.*
-mxnet>=1.3.1,<1.5.*
-numpy==1.14.*
+mxnet>=1.3.1
+numpy>=1.14.0
 pandas>=0.25.0
 pydantic==0.28.*
 tqdm>=4.23.0

diff --git a/src/gluonts/model/wavenet/_network.py b/src/gluonts/model/wavenet/_network.py
@@ -108,7 +108,7 @@ def hybrid_forward(self, F, x):
         u = self.conv_sigmoid(x) * self.conv_tanh(x)
         s = self.skip(u)
         if not self.return_dense_out:
-            return s, F.zeros(shape=(0,))
+            return s, F.array([])
         output = self.residue(u)
         output = output + F.slice_axis(
             x, begin=(self.kernel_size - 1) * self.dilation, end=None, axis=-1
@@ -381,9 +381,9 @@ def is_last_layer(i):
             _, o = self.residuals[i](o)
             if not is_last_layer(i):
                 o_chunk = F.slice_axis(o, begin=-sz - 1, end=-1, axis=-1)
+                queues.append(blow_up(o_chunk))
             else:
-                o_chunk = o
-            queues.append(blow_up(o_chunk))
+                queues.append(o)
 
         res = F.slice_axis(past_target, begin=-2, end=None, axis=-1)
         res = blow_up(res)