From 957877ad3fae729ef11e4fcea7e20e72e2f6a694 Mon Sep 17 00:00:00 2001
From: Sven Mika <sven@anyscale.io>
Date: Sun, 11 Oct 2020 12:49:47 +0200
Subject: [PATCH] Tf version of VisionNet (ray/rllib/model/tf/vision_net.py)
 crashes iff len(conv-filters)=1. (#11330)

---
 rllib/models/tf/visionnet.py    | 6 ++++--
 rllib/models/torch/visionnet.py | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rllib/models/tf/visionnet.py b/rllib/models/tf/visionnet.py
index 2bb5cf43f..857929b11 100644
--- a/rllib/models/tf/visionnet.py
+++ b/rllib/models/tf/visionnet.py
@@ -20,6 +20,8 @@ class VisionNetwork(TFModelV2):
         activation = get_activation_fn(
             self.model_config.get("conv_activation"), framework="tf")
         filters = self.model_config["conv_filters"]
+        assert len(filters) > 0,\
+            "Must provide at least 1 entry in `conv_filters`!"
         no_final_linear = self.model_config.get("no_final_linear")
         vf_share_layers = self.model_config.get("vf_share_layers")
 
@@ -64,7 +66,7 @@ class VisionNetwork(TFModelV2):
                 activation=activation,
                 padding="valid",
                 data_format="channels_last",
-                name="conv{}".format(i + 1))(last_layer)
+                name="conv{}".format(len(filters)))(last_layer)
 
             # num_outputs defined. Use that to create an exact
             # `num_output`-sized (1,1)-Conv2D.
@@ -122,7 +124,7 @@ class VisionNetwork(TFModelV2):
                 activation=activation,
                 padding="valid",
                 data_format="channels_last",
-                name="conv_value_{}".format(i + 1))(last_layer)
+                name="conv_value_{}".format(len(filters)))(last_layer)
             last_layer = tf.keras.layers.Conv2D(
                 1, [1, 1],
                 activation=None,
diff --git a/rllib/models/torch/visionnet.py b/rllib/models/torch/visionnet.py
index 477a8d018..a283f0378 100644
--- a/rllib/models/torch/visionnet.py
+++ b/rllib/models/torch/visionnet.py
@@ -24,6 +24,8 @@ class VisionNetwork(TorchModelV2, nn.Module):
 
         activation = self.model_config.get("conv_activation")
         filters = self.model_config["conv_filters"]
+        assert len(filters) > 0,\
+            "Must provide at least 1 entry in `conv_filters`!"
         no_final_linear = self.model_config.get("no_final_linear")
         vf_share_layers = self.model_config.get("vf_share_layers")