Fix some numpy 1.16 compatibility issues.

FutureWarning: arrays to stack must be passed as a "sequence" type such as list or tuple. Support for non-sequence iterables such as generators is deprecated as of NumPy 1.16 and will raise an error in the future.

FutureWarning: Using a non-tuple sequence for multidimensional indexing is deprecated; use `arr[tuple(seq)]` instead of `arr[seq]`. In the future this will be interpreted as an array index, `arr[np.array(seq)]`, which will result either in an error or a different
PiperOrigin-RevId: 265922609

pysc2/lib/features.py

@@ -1150,15 +1150,15 @@ def or_zeros(layer, size):
     if aif.feature_dimensions:
       with sw("feature_screen"):
         out["feature_screen"] = named_array.NamedNumpyArray(
-            np.stack(or_zeros(f.unpack(obs.observation),
-                              aif.feature_dimensions.screen)
-                     for f in SCREEN_FEATURES),
+            np.stack([or_zeros(f.unpack(obs.observation),
+                               aif.feature_dimensions.screen)
+                      for f in SCREEN_FEATURES]),
             names=[ScreenFeatures, None, None])
       with sw("feature_minimap"):
         out["feature_minimap"] = named_array.NamedNumpyArray(
-            np.stack(or_zeros(f.unpack(obs.observation),
-                              aif.feature_dimensions.minimap)
-                     for f in MINIMAP_FEATURES),
+            np.stack([or_zeros(f.unpack(obs.observation),
+                               aif.feature_dimensions.minimap)
+                      for f in MINIMAP_FEATURES]),
             names=[MinimapFeatures, None, None])
 
     if aif.rgb_dimensions:

pysc2/lib/np_util.py

@@ -25,7 +25,7 @@ def summarize_array_diffs(lhs, rhs):
   result = []
   indices = np.transpose(np.nonzero(lhs - rhs))
   for row in indices:
-    index = list(np.array([e]) for e in row.tolist())
+    index = tuple(np.array([e]) for e in row.tolist())
     lhs_element = lhs[index]
     rhs_element = rhs[index]
     result.append("{}: {} -> {}".format(

pysc2/tests/render_test.py

@@ -86,11 +86,11 @@ def or_zeros(layer, size):
         rgb_screen = features.Feature.unpack_rgb_image(obs.render_data.map)
         rgb_minimap = features.Feature.unpack_rgb_image(obs.render_data.minimap)
         fl_screen = np.stack(
-            or_zeros(f.unpack(obs), interface.feature_layer.resolution)
-            for f in features.SCREEN_FEATURES)
+            [or_zeros(f.unpack(obs), interface.feature_layer.resolution)
+             for f in features.SCREEN_FEATURES])
         fl_minimap = np.stack(
-            or_zeros(f.unpack(obs), interface.feature_layer.minimap_resolution)
-            for f in features.MINIMAP_FEATURES)
+            [or_zeros(f.unpack(obs), interface.feature_layer.minimap_resolution)
+             for f in features.MINIMAP_FEATURES])
 
         # Right shapes.
         self.assertEqual(rgb_screen.shape, (256, 256, 3))