You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marvin.apache.org by yi...@apache.org on 2019/05/20 13:01:37 UTC
[incubator-marvin] branch develop updated (f928d0d -> 0ba44e4)
This is an automated email from the ASF dual-hosted git repository.
yifeizhang pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-marvin.git.
from f928d0d Merge pull request #20 from Wei-1/develop
add 01d1255 Adding support for building docker images. Initial support for R engines.
add 768b2d2 Fixing travis
add d5ac4db Merge branch 'develop' into feature/MARVIN-1
new 0ba44e4 Merge pull request #21 from apache/feature/MARVIN-1
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:
.travis.yml | 2 +-
Makefile | 49 ++++++++++++
.../.github/ISSUE_TEMPLATE/bug_report.md | 0
.../.github/ISSUE_TEMPLATE/custom.md | 0
.../.github/ISSUE_TEMPLATE/feature_request.md | 0
{engine-executor => engine-server}/.gitignore | 0
.../CODE_OF_CONDUCT.md | 0
{engine-executor => engine-server}/Makefile | 0
{engine-executor => engine-server}/NOTICE | 0
.../PULL_REQUEST_TEMPLATE.md | 0
{engine-executor => engine-server}/README.md | 0
{engine-executor => engine-server}/build.sbt | 2 +-
engine-server/build/Dockerfile | 89 +++++++++++++++++++++
engine-server/build/docker-python/Dockerfile | 59 ++++++++++++++
engine-server/build/docker-r/Dockerfile | 61 ++++++++++++++
.../build/marvin-engine-server-assembly.jar | Bin 0 -> 94184375 bytes
engine-server/build/python-toolbox.tgz | Bin 0 -> 693248 bytes
.../project/assembly.sbt | 0
.../project/build.properties | 0
.../project/plugins.sbt | 0
.../project/scalapb.sbt | 0
{engine-executor => engine-server}/sonatype.sbt | 0
.../src/main/protobuf/actions.proto | 0
.../src/main}/resources/EngineActionSchema.json | 0
.../src/main}/resources/EngineMetadataSchema.json | 0
.../src/main/resources/application.conf | 0
.../src/main/resources/docs/favicon-16x16.png | Bin
.../src/main/resources/docs/favicon-32x32.png | Bin
.../src/main/resources/docs/index.html | 0
.../src/main/resources/docs/oauth2-redirect.html | 0
.../src/main/resources/docs/swagger-ui-bundle.js | 0
.../main/resources/docs/swagger-ui-bundle.js.map | 0
.../resources/docs/swagger-ui-standalone-preset.js | 0
.../docs/swagger-ui-standalone-preset.js.map | 0
.../src/main/resources/docs/swagger-ui.css | 0
.../src/main/resources/docs/swagger-ui.css.map | 0
.../src/main/resources/docs/swagger-ui.js | 0
.../src/main/resources/docs/swagger-ui.js.map | 0
.../src/main/resources/log4j.properties | 0
.../marvin/artifact/manager/ArtifactFSSaver.scala | 0
.../artifact/manager/ArtifactHdfsSaver.scala | 0
.../marvin/artifact/manager/ArtifactS3Saver.scala | 0
.../marvin/artifact/manager/ArtifactSaver.scala | 0
.../exception/MarvinEExecutorException.scala | 0
.../org/marvin/executor/EngineExecutorApp.scala | 0
.../org/marvin/executor/actions/BatchAction.scala | 0
.../org/marvin/executor/actions/OnlineAction.scala | 0
.../marvin/executor/actions/PipelineAction.scala | 0
.../scala/org/marvin/executor/api/GenericAPI.scala | 0
.../marvin/executor/api/GenericAPIHandlers.scala | 0
.../executor/manager/ExecutorClusterListener.scala | 0
.../marvin/executor/manager/ExecutorManager.scala | 0
.../marvin/executor/proxies/BatchActionProxy.scala | 0
.../org/marvin/executor/proxies/EngineProxy.scala | 0
.../executor/proxies/OnlineActionProxy.scala | 0
.../executor/statemachine/PredictorFSM.scala | 0
.../scala/org/marvin/model/BatchExecution.scala | 0
.../src/main/scala/org/marvin/model/Metadata.scala | 0
.../org/marvin/util/ConfigurationContext.scala | 0
.../src/main/scala/org/marvin/util/JsonUtil.scala | 0
.../main/scala/org/marvin/util/LocalCache.scala | 0
.../main/scala/org/marvin/util/ProtocolUtil.scala | 0
.../src/test}/resources/EngineActionSchema.json | 0
.../src/test}/resources/EngineMetadataSchema.json | 0
.../src/test/resources/application.conf | 0
.../src/test/resources/engine_home/docs.yaml | 0
.../src/test/resources/engine_home/engine.metadata | 0
.../src/test/resources/engine_home/engine.params | 0
.../resources/engine_home/predictor-message.schema | 0
.../src/test/resources/metadataToValidate.json | 0
.../resources/metadataToValidateWithError.json | 0
.../resources/metadataToValidateWithRefError.json | 0
.../src/test/resources/test-invalid.json | 0
.../src/test/resources/test.json | 0
.../artifact/manager/ArtifactS3SaverTest.scala | 0
.../artifact/manager/ArtifactSaverTest.scala | 0
.../marvin/executor/EngineExecutorAppTest.scala | 0
.../marvin/executor/actions/BatchActionTest.scala | 0
.../marvin/executor/actions/OnlineActionTest.scala | 0
.../org/marvin/executor/api/GenericAPITest.scala | 0
.../executor/manager/ExecutorManagerTest.scala | 0
.../executor/proxies/BatchActionProxyTest.scala | 0
.../executor/proxies/OnlineActionProxyTest.scala | 0
.../executor/statemachine/PredictorFSMTest.scala | 0
.../scala/org/marvin/fixtures/MetadataMock.scala | 0
.../test/scala/org/marvin/util/JsonUtilTest.scala | 0
.../scala/org/marvin/util/LocalCacheTest.scala | 0
.../scala/org/marvin/util/ProtocolUtilTest.scala | 0
python-toolbox/{setup.cfg => .dev} | 0
python-toolbox/setup.py | 3 +-
90 files changed, 262 insertions(+), 3 deletions(-)
create mode 100644 Makefile
rename {engine-executor => engine-server}/.github/ISSUE_TEMPLATE/bug_report.md (100%)
rename {engine-executor => engine-server}/.github/ISSUE_TEMPLATE/custom.md (100%)
rename {engine-executor => engine-server}/.github/ISSUE_TEMPLATE/feature_request.md (100%)
rename {engine-executor => engine-server}/.gitignore (100%)
rename {engine-executor => engine-server}/CODE_OF_CONDUCT.md (100%)
rename {engine-executor => engine-server}/Makefile (100%)
rename {engine-executor => engine-server}/NOTICE (100%)
rename {engine-executor => engine-server}/PULL_REQUEST_TEMPLATE.md (100%)
rename {engine-executor => engine-server}/README.md (100%)
rename {engine-executor => engine-server}/build.sbt (98%)
create mode 100644 engine-server/build/Dockerfile
create mode 100644 engine-server/build/docker-python/Dockerfile
create mode 100644 engine-server/build/docker-r/Dockerfile
create mode 100644 engine-server/build/marvin-engine-server-assembly.jar
create mode 100644 engine-server/build/python-toolbox.tgz
rename {engine-executor => engine-server}/project/assembly.sbt (100%)
rename {engine-executor => engine-server}/project/build.properties (100%)
rename {engine-executor => engine-server}/project/plugins.sbt (100%)
rename {engine-executor => engine-server}/project/scalapb.sbt (100%)
rename {engine-executor => engine-server}/sonatype.sbt (100%)
rename {engine-executor => engine-server}/src/main/protobuf/actions.proto (100%)
rename {engine-executor/src/test => engine-server/src/main}/resources/EngineActionSchema.json (100%)
rename {engine-executor/src/test => engine-server/src/main}/resources/EngineMetadataSchema.json (100%)
rename {engine-executor => engine-server}/src/main/resources/application.conf (100%)
rename {engine-executor => engine-server}/src/main/resources/docs/favicon-16x16.png (100%)
rename {engine-executor => engine-server}/src/main/resources/docs/favicon-32x32.png (100%)
rename {engine-executor => engine-server}/src/main/resources/docs/index.html (100%)
rename {engine-executor => engine-server}/src/main/resources/docs/oauth2-redirect.html (100%)
rename {engine-executor => engine-server}/src/main/resources/docs/swagger-ui-bundle.js (100%)
rename {engine-executor => engine-server}/src/main/resources/docs/swagger-ui-bundle.js.map (100%)
rename {engine-executor => engine-server}/src/main/resources/docs/swagger-ui-standalone-preset.js (100%)
rename {engine-executor => engine-server}/src/main/resources/docs/swagger-ui-standalone-preset.js.map (100%)
rename {engine-executor => engine-server}/src/main/resources/docs/swagger-ui.css (100%)
rename {engine-executor => engine-server}/src/main/resources/docs/swagger-ui.css.map (100%)
rename {engine-executor => engine-server}/src/main/resources/docs/swagger-ui.js (100%)
rename {engine-executor => engine-server}/src/main/resources/docs/swagger-ui.js.map (100%)
rename {engine-executor => engine-server}/src/main/resources/log4j.properties (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/artifact/manager/ArtifactFSSaver.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/artifact/manager/ArtifactHdfsSaver.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/artifact/manager/ArtifactS3Saver.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/artifact/manager/ArtifactSaver.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/exception/MarvinEExecutorException.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/executor/EngineExecutorApp.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/executor/actions/BatchAction.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/executor/actions/OnlineAction.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/executor/actions/PipelineAction.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/executor/api/GenericAPI.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/executor/api/GenericAPIHandlers.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/executor/manager/ExecutorClusterListener.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/executor/manager/ExecutorManager.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/executor/proxies/BatchActionProxy.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/executor/proxies/EngineProxy.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/executor/proxies/OnlineActionProxy.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/executor/statemachine/PredictorFSM.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/model/BatchExecution.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/model/Metadata.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/util/ConfigurationContext.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/util/JsonUtil.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/util/LocalCache.scala (100%)
rename {engine-executor => engine-server}/src/main/scala/org/marvin/util/ProtocolUtil.scala (100%)
rename {engine-executor/src/main => engine-server/src/test}/resources/EngineActionSchema.json (100%)
rename {engine-executor/src/main => engine-server/src/test}/resources/EngineMetadataSchema.json (100%)
rename {engine-executor => engine-server}/src/test/resources/application.conf (100%)
rename {engine-executor => engine-server}/src/test/resources/engine_home/docs.yaml (100%)
rename {engine-executor => engine-server}/src/test/resources/engine_home/engine.metadata (100%)
rename {engine-executor => engine-server}/src/test/resources/engine_home/engine.params (100%)
rename {engine-executor => engine-server}/src/test/resources/engine_home/predictor-message.schema (100%)
rename {engine-executor => engine-server}/src/test/resources/metadataToValidate.json (100%)
rename {engine-executor => engine-server}/src/test/resources/metadataToValidateWithError.json (100%)
rename {engine-executor => engine-server}/src/test/resources/metadataToValidateWithRefError.json (100%)
rename {engine-executor => engine-server}/src/test/resources/test-invalid.json (100%)
rename {engine-executor => engine-server}/src/test/resources/test.json (100%)
rename {engine-executor => engine-server}/src/test/scala/org/marvin/artifact/manager/ArtifactS3SaverTest.scala (100%)
rename {engine-executor => engine-server}/src/test/scala/org/marvin/artifact/manager/ArtifactSaverTest.scala (100%)
rename {engine-executor => engine-server}/src/test/scala/org/marvin/executor/EngineExecutorAppTest.scala (100%)
rename {engine-executor => engine-server}/src/test/scala/org/marvin/executor/actions/BatchActionTest.scala (100%)
rename {engine-executor => engine-server}/src/test/scala/org/marvin/executor/actions/OnlineActionTest.scala (100%)
rename {engine-executor => engine-server}/src/test/scala/org/marvin/executor/api/GenericAPITest.scala (100%)
rename {engine-executor => engine-server}/src/test/scala/org/marvin/executor/manager/ExecutorManagerTest.scala (100%)
rename {engine-executor => engine-server}/src/test/scala/org/marvin/executor/proxies/BatchActionProxyTest.scala (100%)
rename {engine-executor => engine-server}/src/test/scala/org/marvin/executor/proxies/OnlineActionProxyTest.scala (100%)
rename {engine-executor => engine-server}/src/test/scala/org/marvin/executor/statemachine/PredictorFSMTest.scala (100%)
rename {engine-executor => engine-server}/src/test/scala/org/marvin/fixtures/MetadataMock.scala (100%)
rename {engine-executor => engine-server}/src/test/scala/org/marvin/util/JsonUtilTest.scala (100%)
rename {engine-executor => engine-server}/src/test/scala/org/marvin/util/LocalCacheTest.scala (100%)
rename {engine-executor => engine-server}/src/test/scala/org/marvin/util/ProtocolUtilTest.scala (100%)
copy python-toolbox/{setup.cfg => .dev} (100%)
[incubator-marvin] 01/01: Merge pull request #21 from
apache/feature/MARVIN-1
Posted by yi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yifeizhang pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-marvin.git
commit 0ba44e482994a03e94f8a09c8479b9253b7c60f4
Merge: f928d0d d5ac4db
Author: Yifei Zhang <yi...@gmail.com>
AuthorDate: Mon May 20 10:01:33 2019 -0300
Merge pull request #21 from apache/feature/MARVIN-1
Adding support for building docker images.
.travis.yml | 2 +-
Makefile | 49 ++++++++++++
.../.github/ISSUE_TEMPLATE/bug_report.md | 0
.../.github/ISSUE_TEMPLATE/custom.md | 0
.../.github/ISSUE_TEMPLATE/feature_request.md | 0
{engine-executor => engine-server}/.gitignore | 0
.../CODE_OF_CONDUCT.md | 0
{engine-executor => engine-server}/Makefile | 0
{engine-executor => engine-server}/NOTICE | 0
.../PULL_REQUEST_TEMPLATE.md | 0
{engine-executor => engine-server}/README.md | 0
{engine-executor => engine-server}/build.sbt | 2 +-
engine-server/build/Dockerfile | 89 +++++++++++++++++++++
engine-server/build/docker-python/Dockerfile | 59 ++++++++++++++
engine-server/build/docker-r/Dockerfile | 61 ++++++++++++++
.../build/marvin-engine-server-assembly.jar | Bin 0 -> 94184375 bytes
engine-server/build/python-toolbox.tgz | Bin 0 -> 693248 bytes
.../project/assembly.sbt | 0
.../project/build.properties | 0
.../project/plugins.sbt | 0
.../project/scalapb.sbt | 0
{engine-executor => engine-server}/sonatype.sbt | 0
.../src/main/protobuf/actions.proto | 0
.../src/main}/resources/EngineActionSchema.json | 0
.../src/main}/resources/EngineMetadataSchema.json | 0
.../src/main/resources/application.conf | 0
.../src/main/resources/docs/favicon-16x16.png | Bin
.../src/main/resources/docs/favicon-32x32.png | Bin
.../src/main/resources/docs/index.html | 0
.../src/main/resources/docs/oauth2-redirect.html | 0
.../src/main/resources/docs/swagger-ui-bundle.js | 0
.../main/resources/docs/swagger-ui-bundle.js.map | 0
.../resources/docs/swagger-ui-standalone-preset.js | 0
.../docs/swagger-ui-standalone-preset.js.map | 0
.../src/main/resources/docs/swagger-ui.css | 0
.../src/main/resources/docs/swagger-ui.css.map | 0
.../src/main/resources/docs/swagger-ui.js | 0
.../src/main/resources/docs/swagger-ui.js.map | 0
.../src/main/resources/log4j.properties | 0
.../marvin/artifact/manager/ArtifactFSSaver.scala | 0
.../artifact/manager/ArtifactHdfsSaver.scala | 0
.../marvin/artifact/manager/ArtifactS3Saver.scala | 0
.../marvin/artifact/manager/ArtifactSaver.scala | 0
.../exception/MarvinEExecutorException.scala | 0
.../org/marvin/executor/EngineExecutorApp.scala | 0
.../org/marvin/executor/actions/BatchAction.scala | 0
.../org/marvin/executor/actions/OnlineAction.scala | 0
.../marvin/executor/actions/PipelineAction.scala | 0
.../scala/org/marvin/executor/api/GenericAPI.scala | 0
.../marvin/executor/api/GenericAPIHandlers.scala | 0
.../executor/manager/ExecutorClusterListener.scala | 0
.../marvin/executor/manager/ExecutorManager.scala | 0
.../marvin/executor/proxies/BatchActionProxy.scala | 0
.../org/marvin/executor/proxies/EngineProxy.scala | 0
.../executor/proxies/OnlineActionProxy.scala | 0
.../executor/statemachine/PredictorFSM.scala | 0
.../scala/org/marvin/model/BatchExecution.scala | 0
.../src/main/scala/org/marvin/model/Metadata.scala | 0
.../org/marvin/util/ConfigurationContext.scala | 0
.../src/main/scala/org/marvin/util/JsonUtil.scala | 0
.../main/scala/org/marvin/util/LocalCache.scala | 0
.../main/scala/org/marvin/util/ProtocolUtil.scala | 0
.../src/test}/resources/EngineActionSchema.json | 0
.../src/test}/resources/EngineMetadataSchema.json | 0
.../src/test/resources/application.conf | 0
.../src/test/resources/engine_home/docs.yaml | 0
.../src/test/resources/engine_home/engine.metadata | 0
.../src/test/resources/engine_home/engine.params | 0
.../resources/engine_home/predictor-message.schema | 0
.../src/test/resources/metadataToValidate.json | 0
.../resources/metadataToValidateWithError.json | 0
.../resources/metadataToValidateWithRefError.json | 0
.../src/test/resources/test-invalid.json | 0
.../src/test/resources/test.json | 0
.../artifact/manager/ArtifactS3SaverTest.scala | 0
.../artifact/manager/ArtifactSaverTest.scala | 0
.../marvin/executor/EngineExecutorAppTest.scala | 0
.../marvin/executor/actions/BatchActionTest.scala | 0
.../marvin/executor/actions/OnlineActionTest.scala | 0
.../org/marvin/executor/api/GenericAPITest.scala | 0
.../executor/manager/ExecutorManagerTest.scala | 0
.../executor/proxies/BatchActionProxyTest.scala | 0
.../executor/proxies/OnlineActionProxyTest.scala | 0
.../executor/statemachine/PredictorFSMTest.scala | 0
.../scala/org/marvin/fixtures/MetadataMock.scala | 0
.../test/scala/org/marvin/util/JsonUtilTest.scala | 0
.../scala/org/marvin/util/LocalCacheTest.scala | 0
.../scala/org/marvin/util/ProtocolUtilTest.scala | 0
python-toolbox/.dev | 0
python-toolbox/setup.py | 3 +-
90 files changed, 262 insertions(+), 3 deletions(-)