You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2017/11/21 17:04:07 UTC

[tika] branch master updated (1e8008c -> 91ef9a9)

This is an automated email from the ASF dual-hosted git repository.

mattmann pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git.


    from 1e8008c  TIKA-2506 - Check config for null during DL4J Test.
     add a78717c  TIKA 2400 : # Define apiBaseUri for inceptionREST # Link wiki pages
     add 4f784fc  TIKA 2400 : # Fix formatting issues of inceptionapi.py # include logic for checking minimum confidence
     add 6b31053  TIKA 2400 : Minor changes to im2txtapi.py
     add 8a875cd  TIKA 2400 : Changes to video_util.py # Fix formatting issues # Remove unused imports
     add 712b697  TIKA 2400 : Minor change to im2txtapi.py
     add 9b94e17  TIKA 2400 : # Adjust the Object Recognition REST clients to work with changed servers
     add 07abb31  TIKA 2400 : # Few refactoring to Object Recognition REST clients
     add dead956  TIKA 2400 : Update dockerfiles
     add 92c65e0  TIKA 2400 : Update dockerfiles with namespace 'thejanw'
     add 2a81e97  TIKA 2400 : Update dockerfiles with namespace 'uscdatascience'
     add 03e7d12  TIKA 2400 : Change requests
     add 9fb3461  TIKA 2400 : # Minor reformatting # Include inception v4 definition script # Remove unwanted classify_image.py file # Get rid of the need to have tensorflow models with PYTHONPATH
     add a043cef  TIKA 2400 : Remove redundant functions + Minor refactoring
     add f6beced  TIKA 2400 : Update environment of python scripts to python3
     add 1047f64  TIKA 2400 : Changing environment of python scripts to python2
     add 690c744  TIKA 2400 : Changing environment of python scripts back to python3 for docker testing
     add d8caba1  TIKA 2400 : finalize dockerfiles + scripts
     add cc08d39  TIKA 2400 : Fix minor error in im2txt dockerfile
     new 91ef9a9  Merge pull request #208 from ThejanW/master

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../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(-)
 create mode 100644 tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/BaseTFDockerfile
 delete mode 100644 tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/classify_image.py
 create mode 100644 tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/inception_v4.py

-- 
To stop receiving notification emails like this one, please contact
['"commits@tika.apache.org" <co...@tika.apache.org>'].

[tika] 01/01: Merge pull request #208 from ThejanW/master

Posted by ma...@apache.org.
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 <ch...@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" <co...@tika.apache.org>.