pytorch/caffe2/python/helpers/array_helpers.py
Luke Yeager 03de05229e brew.concat: don't set both order and axis
Summary:
Was https://github.com/caffe2/caffe2/pull/1151.

pooyadavoodi says this was causing problems for him. I don't remember the details.
Closes https://github.com/caffe2/caffe2/pull/1184

Differential Revision: D5794711

Pulled By: akyrola

fbshipit-source-id: 4d75f2a9b30881ba662141c352ac556cb5d3cce6
2017-09-08 10:34:34 -07:00

25 lines
767 B
Python

## @package arra_helpers
# Module caffe2.python.helpers.array_helpers
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
def concat(model, blobs_in, blob_out, **kwargs):
"""Depth Concat."""
if kwargs.get('order') and kwargs.get('axis'):
raise ValueError("Don't set both order and axis")
return model.net.Concat(
blobs_in,
[blob_out, "_" + blob_out + "_concat_dims"],
**kwargs
)[0]
def depth_concat(model, blobs_in, blob_out, **kwargs):
"""The old depth concat function - we should move to use concat."""
print("DepthConcat is deprecated. use Concat instead.")
return concat(blobs_in, blob_out, **kwargs)