You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by th...@apache.org on 2017/04/20 20:37:48 UTC

[tika] branch master updated (77d5745 -> dd51591)

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

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

      from  77d5745   TIKA-2024 -- another location where the original source path might be recorded
      adds  236db96   fix for TIKA-2306 contributed by kranthigv
      adds  0c0bd4b   fix for TIKA-2306 contributed by kranthigv
      adds  cb8f8f5   fix the image
      adds  c7f27b5   inceptionapi.py file added for REST API feature
      adds  1fc82e8   fix the destination directory
      adds  900e4cf   fix no variables to save
      adds  0341a5d   unexpected argument
      adds  b9f496c   undefined variable
      adds  f8c51ba   undefined variable
      adds  d199692   undefined variable
      adds  0eedec8   Working inceptionapi.py without comments
      adds  09cb2df   fix for TIKA-2306 contributed by kranthigv
      adds  f92809a   fix for TIKA-2306 contributed by kranthigv
      adds  be773ca   fix for TIKA-2306 contributed by kranthigv
      adds  75a2ae1   Changed models repo to a forked repo for future compatibility
      adds  cc34967   Update python code styling
      adds  653abaa   Updated dockerfile to launch the service
       new  6205742   Merge branch 'TIKA-2307' of https://github.com/KranthiGV/tika into KranthiGV-TIKA-2306
      adds  dbdead5   Merge remote-tracking branch 'origin/master' into TIKA-2306
      adds  84fb6fe   Updated model repo link to official tensorflow's
      adds  db8c814   Reduced disk I/O
      adds  09698c6   Remove redundancy. Not updating classify_image.py since it has no effect on runtime performance
       new  d6b3ca4   Merge branch 'TIKA-2306' of https://github.com/KranthiGV/tika into KranthiGV-TIKA-2306
       new  834920e   Updated URL to point to ASF repo
       new  dd51591   Merge branch 'KranthiGV-TIKA-2307'

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


Summary of changes:
 .../recognition/tf/TensorflowRESTRecogniser.java   |   4 +-
 .../parser/recognition/tf/InceptionRestDockerfile  |  26 +-
 .../tika/parser/recognition/tf/classify_image.py   | 303 ++++++++++++---------
 .../tika/parser/recognition/tf/inceptionapi.py     | 303 ++++++++++++---------
 .../recognition/ObjectRecognitionParserTest.java   |   4 +-
 .../tf/TensorflowImageRecParserTest.java           |   2 +-
 6 files changed, 371 insertions(+), 271 deletions(-)

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

[tika] 04/04: Merge branch 'KranthiGV-TIKA-2307'

Posted by th...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit dd515914e5b2986247834307eb7c922c3c2c50a9
Merge: 77d5745 834920e
Author: Thamme Gowda <th...@apache.org>
AuthorDate: Thu Apr 20 13:35:58 2017 -0700

    Merge branch 'KranthiGV-TIKA-2307'

 .../recognition/tf/TensorflowRESTRecogniser.java   |   4 +-
 .../parser/recognition/tf/InceptionRestDockerfile  |  26 +-
 .../tika/parser/recognition/tf/classify_image.py   | 303 ++++++++++++---------
 .../tika/parser/recognition/tf/inceptionapi.py     | 303 ++++++++++++---------
 .../recognition/ObjectRecognitionParserTest.java   |   4 +-
 .../tf/TensorflowImageRecParserTest.java           |   2 +-
 6 files changed, 371 insertions(+), 271 deletions(-)

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

[tika] 01/04: Merge branch 'TIKA-2307' of https://github.com/KranthiGV/tika into KranthiGV-TIKA-2306

Posted by th...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 6205742a935ddd73093aa10a6601c14a259998a0
Merge: 3aab15f 653abaa
Author: Thamme Gowda <th...@apache.org>
AuthorDate: Thu Apr 13 20:24:48 2017 -0700

    Merge branch 'TIKA-2307' of https://github.com/KranthiGV/tika into KranthiGV-TIKA-2306

 .../recognition/tf/TensorflowRESTRecogniser.java   |   4 +-
 .../parser/recognition/tf/InceptionRestDockerfile  |  24 +-
 .../tika/parser/recognition/tf/classify_image.py   | 303 +++++++++++---------
 .../tika/parser/recognition/tf/inceptionapi.py     | 309 ++++++++++++---------
 .../recognition/ObjectRecognitionParserTest.java   |   4 +-
 .../tf/TensorflowImageRecParserTest.java           |   2 +-
 6 files changed, 374 insertions(+), 272 deletions(-)

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

[tika] 03/04: Updated URL to point to ASF repo

Posted by th...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 834920e769e674b0af8024fdb6067ee12651d196
Author: Thamme Gowda <th...@apache.org>
AuthorDate: Thu Apr 20 13:31:12 2017 -0700

    Updated URL to point to ASF repo
---
 .../org/apache/tika/parser/recognition/tf/InceptionRestDockerfile      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/InceptionRestDockerfile b/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/InceptionRestDockerfile
index 753ec33..c4f93ad 100644
--- a/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/InceptionRestDockerfile
+++ b/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/InceptionRestDockerfile
@@ -32,9 +32,8 @@ RUN \
 RUN wget https://github.com/tensorflow/models/archive/c15fada28113eca32dc98d6e3bec4755d0d5b4c2.zip && \
 	unzip c15fada28113eca32dc98d6e3bec4755d0d5b4c2.zip 
 
-# TODO: Change the URL to Apache/Tika Repo when this PR gets merged
 RUN \
-  wget https://raw.githubusercontent.com/KranthiGV/tika/TIKA-2306/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/inceptionapi.py -O /usr/bin/inceptionapi.py && \
+  wget https://raw.githubusercontent.com/apache/tika/TIKA-2306/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/inceptionapi.py -O /usr/bin/inceptionapi.py && \
   chmod +x /usr/bin/inceptionapi.py
 
 # clean up cache, so we can publish smaller image to hub

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

[tika] 02/04: Merge branch 'TIKA-2306' of https://github.com/KranthiGV/tika into KranthiGV-TIKA-2306

Posted by th...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit d6b3ca4f74584b1912f9a6945ecd46d8fa14b303
Merge: 6205742 09698c6
Author: Thamme Gowda <th...@apache.org>
AuthorDate: Fri Apr 14 13:05:12 2017 -0700

    Merge branch 'TIKA-2306' of https://github.com/KranthiGV/tika into KranthiGV-TIKA-2306

 .../parser/recognition/tf/InceptionRestDockerfile  | 11 ++--
 .../tika/parser/recognition/tf/classify_image.py   |  2 +-
 .../tika/parser/recognition/tf/inceptionapi.py     | 62 +++++++++++-----------
 3 files changed, 37 insertions(+), 38 deletions(-)

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