This is an automated email from the ASF dual-hosted git repository. mattmann pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tika.git
commit 91ef9a972783b8638c2f31f904d5a0b9fdfa6074 Merge: 1e8008c cc08d39 Author: Chris Mattmann <chris.mattm...@gmail.com> AuthorDate: Tue Nov 21 09:04:04 2017 -0800 Merge pull request #208 from ThejanW/master Fix for TIKA-2400 Standardizing current Object Recognition REST parsers .../captioning/tf/TensorflowRESTCaptioner.java | 10 +- .../recognition/ObjectRecognitionParser.java | 39 +- .../recognition/tf/TensorflowRESTRecogniser.java | 49 ++- .../tf/TensorflowRESTVideoRecogniser.java | 80 ++-- .../tika/parser/captioning/tf/Im2txtRestDockerfile | 48 +-- .../apache/tika/parser/captioning/tf/im2txtapi.py | 32 +- .../tika/parser/recognition/tf/BaseTFDockerfile | 50 +++ .../parser/recognition/tf/InceptionRestDockerfile | 51 +-- .../recognition/tf/InceptionVideoRestDockerfile | 118 +++--- .../tika/parser/recognition/tf/classify_image.py | 253 ------------ .../tika/parser/recognition/tf/inception_v4.py | 362 ++++++++++++++++ .../tika/parser/recognition/tf/inceptionapi.py | 459 +++++++++------------ .../tika/parser/recognition/tf/video_util.py | 108 ++--- .../parser/recognition/tika-config-tflow-rest.xml | 1 + .../recognition/tika-config-tflow-video-rest.xml | 6 +- 15 files changed, 905 insertions(+), 761 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@tika.apache.org" <commits@tika.apache.org>.