This is an automated email from the ASF dual-hosted git repository. emergentorder pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/predictionio.git
commit 92cab7a5faaa8c39f46e0f107e67e4aacc97dbe2 Merge: 0faf78a 93f5aa6 Author: Alex Merritt <[email protected]> AuthorDate: Mon Jun 17 12:18:04 2019 -0400 Merge .travis.yml | 11 +- PMC.md | 69 ++++----- README.md | 4 +- RELEASE.md | 56 +++++++- bin/pio-shell | 1 - bin/pio-start-all | 2 - build.sbt | 63 ++++---- conf/pio-env.sh.template | 6 - conf/pio-vendors.sh | 14 +- .../controller/IdentityPreparator.scala | 2 +- .../predictionio/controller/LAlgorithm.scala | 6 +- .../predictionio/controller/LAverageServing.scala | 2 +- .../predictionio/controller/LDataSource.scala | 4 +- .../predictionio/controller/LFirstServing.scala | 2 +- .../predictionio/controller/LPreparator.scala | 2 +- .../apache/predictionio/controller/LServing.scala | 4 +- .../LocalFileSystemPersistentModel.scala | 4 +- .../apache/predictionio/controller/Metric.scala | 22 +-- .../predictionio/controller/MetricEvaluator.scala | 2 +- .../predictionio/controller/P2LAlgorithm.scala | 6 +- .../predictionio/controller/PAlgorithm.scala | 6 +- .../predictionio/controller/PDataSource.scala | 4 +- .../predictionio/controller/PPreparator.scala | 2 +- .../predictionio/workflow/CleanupFunctions.scala | 4 +- .../workflow/EngineServerPluginContext.scala | 19 ++- .../workflow/EngineServerPluginsActor.scala | 2 +- .../predictionio/workflow/FakeWorkflow.scala | 6 +- .../predictionio/workflow/JsonExtractor.scala | 9 +- data/build.sbt | 1 + .../predictionio/data/store/LEventStore.scala | 138 ++++++++++++++++-- .../data/store/java/LJavaEventStore.scala | 134 ++++++++++++++++- python/pypio/__init__.py => docker/.ivy2/.keep | 6 - docker/JUPYTER.md | 160 +++++++++++++++++++++ docker/README.md | 26 +++- docker/charts/README.md | 59 ++++++++ .../shell.py => docker/charts/postgresql.yaml | 12 +- .../charts/predictionio/.helmignore | 27 +++- .../charts/predictionio/Chart.yaml | 15 +- docker/charts/predictionio/templates/NOTES.txt | 31 ++++ docker/charts/predictionio/templates/_helpers.tpl | 36 +++++ .../predictionio/templates/pio-deployment.yaml | 75 ++++++++++ .../charts/predictionio/templates/pio-service.yaml | 26 +++- docker/charts/predictionio/values.yaml | 53 +++++++ docker/charts/predictionio_postgresql.yaml | 41 ++++++ .../shell.py => docker/charts/spark/.helmignore | 27 +++- .../__init__.py => docker/charts/spark/Chart.yaml | 18 ++- docker/charts/spark/README.md | 99 +++++++++++++ docker/charts/spark/templates/NOTES.txt | 24 ++++ docker/charts/spark/templates/_helpers.tpl | 43 ++++++ .../spark/templates/spark-master-deployment.yaml | 95 ++++++++++++ .../charts/spark/templates/spark-sql-test.yaml | 21 ++- .../spark/templates/spark-worker-deployment.yaml | 57 ++++++++ .../charts/spark/templates/spark-worker-hpa.yaml | 30 +++- docker/charts/spark/values.yaml | 63 ++++++++ .../docker-compose.jupyter.yml | 22 ++- docker/jupyter/Dockerfile | 100 +++++++++++++ .../shell.py => docker/jupyter/fix-permissions | 23 ++- docker/jupyter/jupyter_notebook_config.py | 18 +++ docker/jupyter/requirements.txt | 14 ++ .../utils.py => docker/jupyter/start-jupyter.sh | 30 ++-- docker/jupyter/start.sh | 81 +++++++++++ docker/pio/Dockerfile | 6 +- docs/manual/data/versions.yml | 6 +- .../{install => archived}/launch-aws.html.md.erb | 0 .../community/contribute-documentation.html.md | 2 +- docs/manual/source/datacollection/plugin.html.md | 4 +- docs/manual/source/deploy/plugin.html.md | 4 +- docs/manual/source/index.html.md.erb | 4 +- .../manual/source/install/config-datastore.html.md | 59 -------- docs/manual/source/install/index.html.md.erb | 11 +- .../source/install/install-docker.html.md.erb | 127 ++++++++++++++++ .../source/install/install-sourcecode.html.md.erb | 21 ++- .../shared/install/_elasticsearch.html.erb | 2 +- .../source/partials/shared/install/_spark.html.erb | 2 +- docs/manual/source/resources/upgrade.html.md | 106 ++++++++++++-- docs/manual/source/start/index.html.md | 2 +- .../recommendation/quickstart.html.md.erb | 20 +-- .../predictionio/e2/engine/PythonEngine.scala | 96 +++++++++++++ examples/scala-parallel-classification/README.md | 4 +- .../add-algorithm/build.sbt | 6 +- .../add-algorithm/project/assembly.sbt | 2 +- .../add-algorithm/project/build.properties | 2 +- .../src/main/scala/NaiveBayesAlgorithm.scala | 2 + .../src/main/scala/PrecisionEvaluation.scala | 1 + .../add-algorithm/src/main/scala/Preparator.scala | 1 + .../src/main/scala/RandomForestAlgorithm.scala | 2 + .../reading-custom-properties/build.sbt | 6 +- .../reading-custom-properties/project/assembly.sbt | 2 +- .../project/build.properties | 2 +- .../src/main/scala/NaiveBayesAlgorithm.scala | 2 + .../src/main/scala/PrecisionEvaluation.scala | 1 + .../src/main/scala/Preparator.scala | 1 + .../README.md | 4 +- .../adjust-score/build.sbt | 6 +- .../adjust-score/project/assembly.sbt | 2 +- .../adjust-score/project/build.properties | 2 +- .../src/main/scala/ECommAlgorithm.scala | 2 + .../adjust-score/src/main/scala/Preparator.scala | 1 + .../train-with-rate-event/build.sbt | 6 +- .../train-with-rate-event/project/assembly.sbt | 2 +- .../train-with-rate-event/project/build.properties | 2 +- examples/scala-parallel-recommendation/README.md | 4 +- .../blacklist-items/build.sbt | 6 +- .../blacklist-items/project/assembly.sbt | 2 +- .../blacklist-items/project/build.properties | 2 +- .../src/main/scala/ALSAlgorithm.scala | 2 + .../blacklist-items/src/main/scala/ALSModel.scala | 1 + .../src/main/scala/Evaluation.scala | 2 + .../src/main/scala/Preparator.scala | 1 + .../customize-data-prep/build.sbt | 6 +- .../customize-data-prep/project/assembly.sbt | 2 +- .../customize-data-prep/project/build.properties | 2 +- .../src/main/scala/ALSAlgorithm.scala | 2 + .../src/main/scala/ALSModel.scala | 1 + .../src/main/scala/Evaluation.scala | 2 + .../src/main/scala/Preparator.scala | 1 + .../customize-serving/build.sbt | 6 +- .../customize-serving/project/assembly.sbt | 2 +- .../customize-serving/project/build.properties | 2 +- .../src/main/scala/ALSAlgorithm.scala | 2 + .../src/main/scala/ALSModel.scala | 1 + .../src/main/scala/Evaluation.scala | 2 + .../src/main/scala/Preparator.scala | 1 + .../reading-custom-events/build.sbt | 6 +- .../reading-custom-events/project/assembly.sbt | 2 +- .../reading-custom-events/project/build.properties | 2 +- .../src/main/scala/ALSAlgorithm.scala | 2 + .../src/main/scala/ALSModel.scala | 1 + .../src/main/scala/Evaluation.scala | 2 + .../src/main/scala/Preparator.scala | 1 + .../train-with-view-event/build.sbt | 6 +- .../train-with-view-event/project/assembly.sbt | 2 +- .../train-with-view-event/project/build.properties | 2 +- .../src/main/scala/ALSAlgorithm.scala | 2 + .../src/main/scala/ALSModel.scala | 1 + .../src/main/scala/Evaluation.scala | 2 + .../src/main/scala/Preparator.scala | 1 + examples/scala-parallel-similarproduct/README.md | 4 +- .../multi-events-multi-algos/build.sbt | 6 +- .../multi-events-multi-algos/project/assembly.sbt | 2 +- .../project/build.properties | 2 +- .../src/main/scala/ALSAlgorithm.scala | 2 + .../src/main/scala/CooccurrenceAlgorithm.scala | 2 + .../src/main/scala/Preparator.scala | 1 + .../recommended-user/build.sbt | 6 +- .../recommended-user/project/assembly.sbt | 2 +- .../recommended-user/project/build.properties | 2 +- .../src/main/scala/ALSAlgorithm.scala | 2 + .../src/main/scala/Preparator.scala | 1 + .../return-item-properties/build.sbt | 6 +- .../return-item-properties/project/assembly.sbt | 2 +- .../project/build.properties | 2 +- .../src/main/scala/ALSAlgorithm.scala | 2 + .../src/main/scala/CooccurrenceAlgorithm.scala | 2 + .../src/main/scala/Preparator.scala | 1 + .../rid-user-set-event/build.sbt | 6 +- .../rid-user-set-event/project/assembly.sbt | 2 +- .../rid-user-set-event/project/build.properties | 2 +- .../src/main/scala/ALSAlgorithm.scala | 2 + .../src/main/scala/CooccurrenceAlgorithm.scala | 2 + .../src/main/scala/Preparator.scala | 1 + .../train-with-rate-event/build.sbt | 6 +- .../train-with-rate-event/project/assembly.sbt | 2 +- .../train-with-rate-event/project/build.properties | 2 +- .../src/main/scala/ALSAlgorithm.scala | 2 + .../src/main/scala/CooccurrenceAlgorithm.scala | 2 + .../src/main/scala/Preparator.scala | 1 + project/PIOBuild.scala | 1 - project/plugins.sbt | 2 +- python/pypio/__init__.py | 9 ++ python/pypio/data/eventstore.py | 4 +- python/pypio/pypio.py | 111 ++++++++++++++ python/pypio/utils.py | 40 +++++- storage/elasticsearch/build.sbt | 6 +- .../data/storage/elasticsearch/ESAccessKeys.scala | 5 +- .../data/storage/elasticsearch/ESApps.scala | 8 +- .../data/storage/elasticsearch/ESChannels.scala | 7 +- .../storage/elasticsearch/ESEngineInstances.scala | 42 +++--- .../elasticsearch/ESEvaluationInstances.scala | 8 +- .../data/storage/elasticsearch/ESLEvents.scala | 5 +- .../data/storage/elasticsearch/ESSequences.scala | 6 +- .../data/storage/elasticsearch/ESUtils.scala | 20 +-- storage/elasticsearch1/.gitignore | 1 - storage/elasticsearch1/build.sbt | 38 ----- .../data/storage/elasticsearch/ESAccessKeys.scala | 119 --------------- .../data/storage/elasticsearch/ESApps.scala | 130 ----------------- .../data/storage/elasticsearch/ESChannels.scala | 117 --------------- .../storage/elasticsearch/ESEngineInstances.scala | 158 -------------------- .../elasticsearch/ESEvaluationInstances.scala | 136 ------------------ .../data/storage/elasticsearch/ESSequences.scala | 64 --------- .../data/storage/elasticsearch/ESUtils.scala | 48 ------- .../data/storage/elasticsearch/StorageClient.scala | 50 ------- .../data/storage/elasticsearch/package.scala | 25 ---- .../src/test/resources/application.conf | 28 ---- .../data/storage/s3/StorageClient.scala | 8 +- tests/docker-files/env-conf/pio-env.sh | 11 +- .../engines/recommendation-engine/build.sbt | 4 +- .../apache/predictionio/tools/RunWorkflow.scala | 32 ++--- .../predictionio/tools/commands/Engine.scala | 27 ++-- 199 files changed, 2418 insertions(+), 1485 deletions(-) diff --cc .travis.yml index 42662de,c807165..13e6ec3 --- a/.travis.yml +++ b/.travis.yml @@@ -99,7 -96,12 +96,7 @@@ env - BUILD_TYPE=Integration METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS PIO_SCALA_VERSION=2.11.12 - PIO_SPARK_VERSION=2.3.2 - PIO_SPARK_VERSION=2.3.3 - PIO_HADOOP_VERSION=2.7.7 - - BUILD_TYPE=Integration - METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS - PIO_SCALA_VERSION=2.11.12 + PIO_SPARK_VERSION=2.4.0 PIO_HADOOP_VERSION=2.7.7 - BUILD_TYPE=LicenseCheck diff --cc build.sbt index 9efed21,082521b..3e063bf --- a/build.sbt +++ b/build.sbt @@@ -16,28 -16,9 +16,28 @@@ */ import PIOBuild._ +lazy val scalaSparkDepsVersion = Map( + "2.11" -> Map( + "2.0" -> Map( + "akka" -> "2.5.16", + "hadoop" -> "2.7.7", + "json4s" -> "3.2.11"), + "2.1" -> Map( + "akka" -> "2.5.17", + "hadoop" -> "2.7.7", + "json4s" -> "3.2.11"), + "2.2" -> Map( + "akka" -> "2.5.17", + "hadoop" -> "2.7.7", + "json4s" -> "3.2.11"), + "2.3" -> Map( + "akka" -> "2.5.17", + "hadoop" -> "2.7.7", + "json4s" -> "3.2.11"))) + name := "apache-predictionio-parent" - version in ThisBuild := "0.14.0-SNAPSHOT" + version in ThisBuild := "0.15.0-SNAPSHOT" organization in ThisBuild := "org.apache.predictionio" diff --cc docs/manual/source/install/install-sourcecode.html.md.erb index 9a1e456,60f8772..b3e4149 --- a/docs/manual/source/install/install-sourcecode.html.md.erb +++ b/docs/manual/source/install/install-sourcecode.html.md.erb @@@ -100,13 -100,10 +100,15 @@@ and complete information ### Building Run the following at the directory where you downloaded the source code to build -Apache PredictionIO®. -As an example, if you want to build PredictionIO to support Scala 2.11.12, -Spark 2.4.0, and Elasticsearch 6.4.2, you can do ++ +Apache PredictionIO®. By default, the build will be against + +* Scala 2.11.8 +* Spark 2.1.1 +* Hadoop 2.7.7 +* Elasticsearch 5.6.9 + + ``` $ tar zxvf apache-predictionio-<%= data.versions.pio %>.tar.gz $ cd apache-predictionio-<%= data.versions.pio %>
