Merge branch 'S2GRAPH-206'
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/c69a4ee9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/c69a4ee9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/c69a4ee9 Branch: refs/heads/master Commit: c69a4ee980d858e8fdfa5404fd4f976afd6a06d3 Parents: 33f4d05 f110d88 Author: DO YUNG YOON <[email protected]> Authored: Mon May 14 21:26:18 2018 +0900 Committer: DO YUNG YOON <[email protected]> Committed: Mon May 14 21:26:18 2018 +0900 ---------------------------------------------------------------------- .travis.yml | 2 +- README.md | 2 +- build.sbt | 2 +- conf/application.conf | 4 + example/common.sh | 2 + example/movielens/desc.md | 4 + example/movielens/jobdesc.template | 65 ++++- example/movielens/postprocess.sh | 37 +++ example/movielens/query/recommend_movie.graphql | 35 +++ ..._genres_and_title_with_simlar_movies.graphql | 33 +++ .../query/search_movie_by_title.graphql | 36 +++ .../movielens/schema/edge.similar.movie.graphql | 61 +++++ example/run.sh | 6 +- project/Common.scala | 4 + s2core/build.sbt | 4 +- .../core/fetcher/tensorflow/LabelImage.java | 235 +++++++++++++++++++ .../org/apache/s2graph/core/Management.scala | 7 + .../scala/org/apache/s2graph/core/S2Graph.scala | 9 +- .../core/fetcher/annoy/AnnoyModelFetcher.scala | 134 +++++++++++ .../core/fetcher/fasttext/CopyModel.scala | 140 +++++++++++ .../core/fetcher/fasttext/FastText.scala | 213 +++++++++++++++++ .../core/fetcher/fasttext/FastTextArgs.scala | 135 +++++++++++ .../core/fetcher/fasttext/FastTextFetcher.scala | 75 ++++++ .../fetcher/tensorflow/InceptionFetcher.scala | 104 ++++++++ .../core/index/LuceneIndexProvider.scala | 18 +- .../s2graph/core/storage/StorageReadable.scala | 102 -------- .../s2graph/core/fetcher/BaseFetcherTest.scala | 96 ++++++++ .../fetcher/fasttext/FastTextFetcherTest.scala | 26 ++ .../tensorflow/InceptionFetcherTest.scala | 96 ++++++++ s2jobs/build.sbt | 1 + .../apache/s2graph/s2jobs/JobDescription.scala | 15 +- .../task/custom/process/ALSModelProcess.scala | 144 ++++++++++++ .../task/custom/sink/AnnoyIndexBuildSink.scala | 40 ++++ .../apache/s2graph/s2jobs/BaseSparkTest.scala | 2 + .../custom/process/ALSModelProcessTest.scala | 167 +++++++++++++ 35 files changed, 1936 insertions(+), 120 deletions(-) ----------------------------------------------------------------------
