This is an automated email from the ASF dual-hosted git repository.
weichen pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-marvin.git
commit 862675d0383335b4192d4cb87eb90e7f773fc321
Merge: 27e0545 c9890bc
Author: Yifei Zhang <yifei.z.l...@gmail.com>
AuthorDate: Fri Jun 7 18:05:40 2019 -0300
Merge pull request #4 from apache/develop
update develop branch from Apache repo
.travis.yml | 2 +-
Makefile | 49 ++++++++++
README.md | 4 +-
engine-executor/CODE_OF_CONDUCT.md | 2 +-
engine-executor/Makefile | 2 +-
engine-executor/NOTICE | 4 +-
engine-executor/PULL_REQUEST_TEMPLATE.md | 2 +-
engine-executor/README.md | 2 +-
engine-executor/build.sbt | 2 +-
.../build}/Dockerfile | 99 +++++++--------------
engine-executor/build/docker-python/Dockerfile | 59 ++++++++++++
engine-executor/build/docker-r/Dockerfile | 63 +++++++++++++
.../build/marvin-engine-server-assembly.jar | Bin 0 -> 94184375 bytes
engine-executor/build/python-toolbox.tgz | Bin 0 -> 693248 bytes
engine-executor/sonatype.sbt | 4 +-
engine-executor/src/main/protobuf/actions.proto | 2 +-
.../marvin/artifact/manager/ArtifactFSSaver.scala | 2 +-
.../artifact/manager/ArtifactHdfsSaver.scala | 2 +-
.../marvin/artifact/manager/ArtifactS3Saver.scala | 2 +-
.../marvin/artifact/manager/ArtifactSaver.scala | 2 +-
.../exception/MarvinEExecutorException.scala | 2 +-
.../org/marvin/executor/EngineExecutorApp.scala | 2 +-
.../org/marvin/executor/actions/BatchAction.scala | 2 +-
.../org/marvin/executor/actions/OnlineAction.scala | 2 +-
.../marvin/executor/actions/PipelineAction.scala | 2 +-
.../scala/org/marvin/executor/api/GenericAPI.scala | 2 +-
.../marvin/executor/api/GenericAPIHandlers.scala | 2 +-
.../marvin/executor/manager/ExecutorManager.scala | 2 +-
.../marvin/executor/proxies/BatchActionProxy.scala | 2 +-
.../org/marvin/executor/proxies/EngineProxy.scala | 2 +-
.../executor/proxies/OnlineActionProxy.scala | 2 +-
.../executor/statemachine/PredictorFSM.scala | 2 +-
.../scala/org/marvin/model/BatchExecution.scala | 2 +-
.../src/main/scala/org/marvin/model/Metadata.scala | 2 +-
.../org/marvin/util/ConfigurationContext.scala | 2 +-
.../src/main/scala/org/marvin/util/JsonUtil.scala | 2 +-
.../main/scala/org/marvin/util/LocalCache.scala | 2 +-
.../main/scala/org/marvin/util/ProtocolUtil.scala | 2 +-
.../src/test/resources/engine_home/docs.yaml | 6 +-
.../artifact/manager/ArtifactSaverTest.scala | 2 +-
.../marvin/executor/EngineExecutorAppTest.scala | 2 +-
.../marvin/executor/actions/BatchActionTest.scala | 2 +-
.../marvin/executor/actions/OnlineActionTest.scala | 2 +-
.../org/marvin/executor/api/GenericAPITest.scala | 2 +-
.../executor/manager/ExecutorManagerTest.scala | 2 +-
.../executor/statemachine/PredictorFSMTest.scala | 2 +-
.../scala/org/marvin/fixtures/MetadataMock.scala | 2 +-
.../test/scala/org/marvin/util/JsonUtilTest.scala | 2 +-
.../scala/org/marvin/util/LocalCacheTest.scala | 2 +-
.../scala/org/marvin/util/ProtocolUtilTest.scala | 2 +-
.../image-classification-engine/Makefile | 2 +-
.../image-classification-engine/README.md | 3 +-
.../image-classification-engine/docs.yaml | 4 +-
...assification_engine_prediction_feedback_py.html | 2 +-
.../prediction/feedback.py | 2 +-
.../image-classification-engine/setup.py | 6 +-
public-engines/iris-species-engine/Makefile | 2 +-
public-engines/iris-species-engine/docs.yaml | 4 +-
.../prediction/feedback.py | 2 +-
public-engines/iris-species-engine/setup.py | 4 +-
public-engines/kaggle-titanic-engine/Dockerfile | 9 +-
public-engines/kaggle-titanic-engine/docs.yaml | 4 +-
.../marvin_titanic_engine/prediction/feedback.py | 2 +-
public-engines/kaggle-titanic-engine/setup.py | 6 +-
public-engines/mnist-keras-engine/Dockerfile | 8 +-
public-engines/mnist-keras-engine/docs.yaml | 4 +-
.../prediction/feedback.py | 2 +-
public-engines/mnist-keras-engine/setup.py | 4 +-
public-engines/nlp-ner-engine/Dockerfile | 8 +-
public-engines/nlp-ner-engine/docs.yaml | 4 +-
.../marvin_nlp_ner_engine/prediction/feedback.py | 2 +-
public-engines/nlp-ner-engine/setup.py | 2 +-
.../product-classifier-engine/Dockerfile | 8 +-
public-engines/product-classifier-engine/docs.yaml | 4 +-
.../prediction/feedback.py | 2 +-
public-engines/product-classifier-engine/setup.py | 4 +-
public-engines/sample-engine/Makefile | 2 +-
.../sample-engine/marvin_sample_engine/__init__.py | 2 +-
.../marvin_sample_engine/_compatibility.py | 2 +-
.../sample-engine/marvin_sample_engine/_logging.py | 2 +-
.../marvin_sample_engine/data_handler/__init__.py | 2 +-
.../data_handler/acquisitor_and_cleaner.py | 2 +-
.../data_handler/training_preparator.py | 2 +-
.../marvin_sample_engine/prediction/__init__.py | 2 +-
.../prediction/prediction_preparator.py | 2 +-
.../marvin_sample_engine/prediction/predictor.py | 2 +-
.../marvin_sample_engine/training/__init__.py | 2 +-
.../training/metrics_evaluator.py | 2 +-
.../marvin_sample_engine/training/trainer.py | 2 +-
public-engines/sample-engine/setup.py | 8 +-
public-engines/sample-engine/tests/conftest.py | 2 +-
.../data_handler/test_acquisitor_and_cleaner.py | 2 +-
.../tests/data_handler/test_training_preparator.py | 2 +-
.../tests/prediction/test_prediction_preparator.py | 2 +-
.../tests/prediction/test_predictor.py | 2 +-
.../tests/training/test_metrics_evaluator.py | 2 +-
.../sample-engine/tests/training/test_trainer.py | 2 +-
public-engines/sms-spam-engine/Dockerfile | 8 +-
public-engines/sms-spam-engine/docs.yaml | 4 +-
.../marvin_sms_spam_engine/prediction/feedback.py | 2 +-
public-engines/sms-spam-engine/setup.py | 4 +-
python-toolbox/.dev | 0
python-toolbox/.gitignore | 1 +
python-toolbox/CODE_OF_CONDUCT.md | 2 +-
python-toolbox/Makefile | 2 +-
python-toolbox/NOTICE | 4 +-
python-toolbox/PULL_REQUEST_TEMPLATE.md | 2 +-
python-toolbox/README.md | 5 +-
python-toolbox/bin/marvin | 2 +-
python-toolbox/marvin_python_toolbox/__init__.py | 2 +-
.../marvin_python_toolbox/_compatibility.py | 2 +-
python-toolbox/marvin_python_toolbox/_logging.py | 2 +-
.../marvin_python_toolbox/common/__init__.py | 2 +-
.../marvin_python_toolbox/common/config.py | 2 +-
.../marvin_python_toolbox/common/data.py | 2 +-
.../common/data_source_provider.py | 2 +-
.../marvin_python_toolbox/common/exceptions.py | 2 +-
.../marvin_python_toolbox/common/http_client.py | 2 +-
.../marvin_python_toolbox/common/profiling.py | 2 +-
.../marvin_python_toolbox/common/utils.py | 2 +-
python-toolbox/marvin_python_toolbox/config.py | 2 +-
python-toolbox/marvin_python_toolbox/decorators.py | 2 +-
.../marvin_python_toolbox/engine_base/__init__.py | 2 +-
.../engine_base/engine_base_action.py | 2 +-
.../engine_base/engine_base_data_handler.py | 2 +-
.../engine_base/engine_base_prediction.py | 2 +-
.../engine_base/engine_base_training.py | 2 +-
.../engine_base/protos/actions.proto | 2 +-
.../engine_base/serializers/__init__.py | 2 +-
.../engine_base/serializers/keras_serializer.py | 2 +-
.../engine_base/stubs/__init__.py | 2 +-
.../notebook_extensions/jupyter_notebook_config.py | 2 +-
.../extras/notebook_extensions/main.js | 2 +-
python-toolbox/marvin_python_toolbox/loader.py | 2 +-
python-toolbox/marvin_python_toolbox/manage.py | 2 +-
.../marvin_python_toolbox/management/__init__.py | 2 +-
.../marvin_python_toolbox/management/engine.py | 4 +-
.../marvin_python_toolbox/management/hive.py | 2 +-
.../marvin_python_toolbox/management/notebook.py | 2 +-
.../marvin_python_toolbox/management/pkg.py | 2 +-
.../management/templates/python-engine/Dockerfile | 6 --
.../management/templates/python-engine/Makefile | 6 +-
.../management/templates/python-engine/docs.yaml | 2 +-
.../project_package/prediction/feedback.py | 2 +-
.../marvin_python_toolbox/management/test.py | 2 +-
python-toolbox/setup.py | 11 +--
python-toolbox/tests/common/test_config.py | 2 +-
python-toolbox/tests/common/test_data.py | 2 +-
.../tests/common/test_data_source_provider.py | 2 +-
python-toolbox/tests/common/test_http_client.py | 2 +-
python-toolbox/tests/common/test_profiling.py | 2 +-
python-toolbox/tests/common/test_utils.py | 2 +-
python-toolbox/tests/conftest.py | 2 +-
.../serializers/test_keras_serializer.py | 2 +-
.../tests/engine_base/test_engine_base_action.py | 2 +-
.../engine_base/test_engine_base_data_handler.py | 2 +-
.../engine_base/test_engine_base_prediction.py | 2 +-
.../tests/engine_base/test_engine_base_training.py | 2 +-
python-toolbox/tests/management/test_engine.py | 2 +-
python-toolbox/tests/management/test_hive.py | 2 +-
python-toolbox/tests/management/test_notebook.py | 2 +-
python-toolbox/tests/management/test_pkg.py | 2 +-
python-toolbox/tests/test_loader.py | 2 +-
163 files changed, 395 insertions(+), 288 deletions(-)
