diff --git a/vehicle-detection/darkflow/net/ops/convolution.py b/vehicle-detection/darkflow/net/ops/convolution.py index 09eac6b..58b0677 100644 --- a/vehicle-detection/darkflow/net/ops/convolution.py +++ b/vehicle-detection/darkflow/net/ops/convolution.py @@ -85,8 +85,9 @@ def batchnorm(self, layer, inp): 'updates_collections' : None, 'is_training': layer.h['is_training'] }) - v = tf.__version__.split('.')[1] - if int(v) < 12: key = 'initializers' + v_ma = tf.__version__.split('.')[0] + v_mi = tf.__version__.split('.')[1] + if int(v_ma) < 1 & int(v_mi) < 12: key = 'initializers' else: key = 'param_initializers' args.update({key : layer.w}) return slim.batch_norm(inp, **args) diff --git a/vehicle-detection/darkflow/net/ops/simple.py b/vehicle-detection/darkflow/net/ops/simple.py index ea41228..2353f5f 100644 --- a/vehicle-detection/darkflow/net/ops/simple.py +++ b/vehicle-detection/darkflow/net/ops/simple.py @@ -13,7 +13,7 @@ def forward(self): assert this is not None, \ 'Routing to non-existence {}'.format(r) routes_out += [this.out] - self.out = tf.concat(3, routes_out) + self.out = tf.concat(axis=3, values=routes_out) def speak(self): msg = 'concat {}'