Skip to content
This repository has been archived by the owner on Jul 10, 2024. It is now read-only.

Commit

Permalink
Preparing for 0.5.0 development
Browse files Browse the repository at this point in the history
  • Loading branch information
jiwq committed Jul 4, 2020
1 parent ca2af0f commit 919d8c0
Show file tree
Hide file tree
Showing 66 changed files with 99 additions and 99 deletions.
2 changes: 1 addition & 1 deletion LICENSE-binary
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ org.apache.hadoop:hadoop-hdfs-client:2.9.2
org.apache.htrace:htrace-core4:4.1.0-incubating
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.apache.submarine:submarine-core:0.4.0
org.apache.submarine:submarine-core:0.5.0-SNAPSHOT
org.apache.zookeeper:zookeeper:3.4.6
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
Expand Down
2 changes: 1 addition & 1 deletion dev-support/docker-images/database/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fi
export CURRENT_PATH=$(cd "${PWD}">/dev/null; pwd)
SUBMARINE_HOME=${CURRENT_PATH}/../../..

SUBMARINE_VERSION="0.4.0"
SUBMARINE_VERSION="0.5.0-SNAPSHOT"
SUBMARINE_IMAGE_NAME="apache/submarine:database-${SUBMARINE_VERSION}"

cp -rf "${SUBMARINE_HOME}/docs/database" "${CURRENT_PATH}"
Expand Down
2 changes: 1 addition & 1 deletion dev-support/docker-images/operator/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
set -eo pipefail
set -x

SUBMARINE_VERSION=0.4.0
SUBMARINE_VERSION=0.5.0-SNAPSHOT
SUBMARINE_IMAGE_NAME="apache/submarine:operator-${SUBMARINE_VERSION}"

if [ -L ${BASH_SOURCE-$0} ]; then
Expand Down
2 changes: 1 addition & 1 deletion dev-support/docker-images/submarine/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
set -eo pipefail
set -x

SUBMARINE_VERSION=0.4.0
SUBMARINE_VERSION=0.5.0-SNAPSHOT
SUBMARINE_IMAGE_NAME="apache/submarine:server-${SUBMARINE_VERSION}"

if [ -L ${BASH_SOURCE-$0} ]; then
Expand Down
2 changes: 1 addition & 1 deletion dev-support/mini-submarine/build_mini-submarine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set -e
hadoop_v=2.9.2
spark_v=2.3.4

submarine_v=${submarine_version:-"0.4.0"}
submarine_v=${submarine_version:-"0.5.0-SNAPSHOT"}
echo "Using submarine version: $submarine_v"

image_name="local/mini-submarine:${submarine_v}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ else
WORKER_CMD="myvenv.zip/venv/bin/python mnist_distributed.py --steps 2 --data_dir /tmp/data --working_dir /tmp/mode"
fi

SUBMARINE_VERSION=${SUBMARINE_VER:-"0.4.0"}
SUBMARINE_VERSION=${SUBMARINE_VER:-"0.5.0-SNAPSHOT"}

HADOOP_VERSION=2.9

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ else
JAVA_CMD="java"
fi

SUBMARINE_VERSION=0.4.0
SUBMARINE_VERSION=0.5.0-SNAPSHOT
HADOOP_VERSION=2.9
SUBMARINE_PATH=/opt/submarine-current
HADOOP_CONF_PATH=/usr/local/hadoop/etc/hadoop
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

# Below are configurable variables, please adapt base on your local environment.
# Version of submarine jar
SUBMARINE_VERSION=${SUBMARINE_VER:-"0.4.0"}
SUBMARINE_VERSION=${SUBMARINE_VER:-"0.5.0-SNAPSHOT"}

# Version of affiliated Hadoop version for this Submarine jar.
SUBMARINE_HADOOP_VERSION=2.9
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ else
WORKER_CMD="myvenv.zip/venv/bin/python mnist_distributed.py --steps 2 --data_dir /tmp/data --working_dir /tmp/mode"
fi

SUBMARINE_VERSION=${SUBMARINE_VER:-"0.4.0"}
SUBMARINE_VERSION=${SUBMARINE_VER:-"0.5.0-SNAPSHOT"}

HADOOP_VERSION=2.9

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ else
JAVA_CMD="java"
fi

SUBMARINE_VERSION=0.4.0
SUBMARINE_VERSION=0.5.0-SNAPSHOT
HADOOP_VERSION=2.9
SUBMARINE_PATH=/opt/submarine-current
HADOOP_CONF_PATH=/usr/local/hadoop/etc/hadoop
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ else
JAVA_CMD="java"
fi

SUBMARINE_VERSION=0.4.0
SUBMARINE_VERSION=0.5.0-SNAPSHOT
HADOOP_VERSION=2.9
SUBMARINE_PATH=/opt/submarine-current
HADOOP_CONF_PATH=/usr/local/hadoop/etc/hadoop
Expand Down
2 changes: 1 addition & 1 deletion dev-support/pysubmarine/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"name" : "Apache 2.0",
"url" : "http://www.apache.org/licenses/LICENSE-2.0.html"
},
"version" : "0.4.0"
"version" : "0.5.0-SNAPSHOT"
},
"servers" : [ {
"url" : "/api"
Expand Down
2 changes: 1 addition & 1 deletion dev-support/pysubmarine/swagger_config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"packageName" : "submarine.experiment",
"projectName" : "submarine.experiment",
"packageVersion": "0.4.0"
"packageVersion": "0.5.0-SNAPSHOT"
}
4 changes: 2 additions & 2 deletions helm-charts/submarine/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#

apiVersion: v2
appVersion: "0.4.0"
appVersion: "0.5.0-SNAPSHOT"
description: Submarine is Cloud Native Machine Learning Platform.
name: submarine
version: 0.4.0
version: 0.5.0-SNAPSHOT
icon: https://submarine.apache.org/assets/themes/submarine/img/submarine_white_logo.png

4 changes: 2 additions & 2 deletions helm-charts/submarine/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ submarine:
imagePullPolicy: IfNotPresent
replicas: 1
name: submarine-server
image: apache/submarine:server-0.4.0
image: apache/submarine:server-0.5.0-SNAPSHOT
servicePort: 8080
database:
imagePullPolicy: IfNotPresent
replicas: 1
name: submarine-database
image: apache/submarine:database-0.4.0
image: apache/submarine:database-0.5.0-SNAPSHOT
servicePort: 3306
mysqlRootPassword: password

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<groupId>org.apache.submarine</groupId>
<artifactId>submarine</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Submarine</name>
<description>Submarine project</description>
Expand Down
4 changes: 2 additions & 2 deletions submarine-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
<parent>
<groupId>org.apache.submarine</groupId>
<artifactId>submarine</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>submarine-all</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<name>Submarine: All</name>

<dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions submarine-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
<parent>
<artifactId>submarine</artifactId>
<groupId>org.apache.submarine</groupId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>submarine-client</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<name>Submarine: Client</name>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion submarine-cloud/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ GOCLEAN=$(GOCMD) clean
GOTEST=$(GOCMD) test
GOGET=$(GOCMD) get
BINARY_NAME=submarine-operator
VERSION="0.4.0"
VERSION="0.5.0-SNAPSHOT"
BuildGitBranch=$(git rev-parse --abbrev-ref HEAD)
BuildGitRev=$(git rev-list --count HEAD)
BuildGitCommit=$(git rev-parse HEAD)
Expand Down
2 changes: 1 addition & 1 deletion submarine-cloud/hack/deploy-submarine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set -e
ROOT=$(unset CDPATH && cd $(dirname "${BASH_SOURCE[0]}")/.. && pwd)
cd $ROOT
SUBMARINE_HOME=${ROOT}/..
SUBMARINE_VERSION="0.4.0"
SUBMARINE_VERSION="0.5.0-SNAPSHOT"

source $ROOT/hack/lib.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
spec:
containers:
- name: submarine-database
image: apache/submarine:database-0.4.0
image: apache/submarine:database-0.5.0-SNAPSHOT
ports:
- containerPort: 3306
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
serviceAccountName: "submarine-node"
containers:
- name: submarine-node
image: "apache/submarine:server-0.4.0"
image: "apache/submarine:server-0.5.0-SNAPSHOT"
args: []
imagePullPolicy: IfNotPresent
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
serviceAccountName: "submarine-operator"
containers:
- name: op
image: "apache/submarine:operator-0.4.0"
image: "apache/submarine:operator-0.5.0-SNAPSHOT"
imagePullPolicy: IfNotPresent
args: ["--v=7", "--logtostderr=true", "--alsologtostderr"]
resources:
Expand Down
4 changes: 2 additions & 2 deletions submarine-cloud/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<parent>
<groupId>org.apache.submarine</groupId>
<artifactId>submarine</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
</parent>
<artifactId>submarine-cloud</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<name>Submarine: Cloud</name>
<packaging>pom</packaging>

Expand Down
4 changes: 2 additions & 2 deletions submarine-commons/commons-cluster/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.submarine</groupId>
<artifactId>submarine-commons</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>submarine-commons-cluster</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<name>Submarine: Commons Cluster</name>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions submarine-commons/commons-metastore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.submarine</groupId>
<artifactId>submarine-commons</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.apache.submarine</groupId>
<artifactId>submarine-commons-metastore</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<name>Submarine: Commons MetaStore</name>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions submarine-commons/commons-rpc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.submarine</groupId>
<artifactId>submarine-commons</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.apache.submarine</groupId>
<artifactId>submarine-commons-rpc</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<name>Submarine: Commons RPC</name>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions submarine-commons/commons-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.submarine</groupId>
<artifactId>submarine-commons</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>org.apache.submarine</groupId>
<artifactId>submarine-commons-runtime</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<name>Submarine: Commons Runtime</name>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions submarine-commons/commons-unixusersync/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.submarine</groupId>
<artifactId>submarine-commons</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.apache.submarine</groupId>
<artifactId>submarine-commons-unixusersync</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<name>Submarine: Commons Unixusersync</name>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions submarine-commons/commons-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
<parent>
<groupId>org.apache.submarine</groupId>
<artifactId>submarine-commons</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.apache.submarine</groupId>
<artifactId>submarine-commons-utils</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<name>Submarine: Commons Utils</name>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions submarine-commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
<parent>
<groupId>org.apache.submarine</groupId>
<artifactId>submarine</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>org.apache.submarine</groupId>
<artifactId>submarine-commons</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Submarine: Commons</name>

Expand Down
4 changes: 2 additions & 2 deletions submarine-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
<parent>
<groupId>org.apache.submarine</groupId>
<artifactId>submarine</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>submarine-dist</artifactId>
<version>0.4.0</version>
<version>0.5.0-SNAPSHOT</version>
<name>Submarine: Dist</name>
<packaging>pom</packaging>

Expand Down
2 changes: 1 addition & 1 deletion submarine-sdk/pysubmarine/example/pytorch/run_deepfm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PYTHONPATH=$HOME/workspace/submarine/submarine-sdk/pysubmarine

HADOOP_CONF_PATH=${HADOOP_CONF_PATH:-$HADOOP_CONF_DIR}

SUBMARINE_VERSION=0.4.0
SUBMARINE_VERSION=0.5.0-SNAPSHOT
SUBMARINE_HADOOP_VERSION=2.9
SUBMARINE_JAR=/opt/submarine-dist-${SUBMARINE_VERSION}-hadoop-${SUBMARINE_HADOOP_VERSION}/submarine-dist-${SUBMARINE_VERSION}-hadoop-${SUBMARINE_HADOOP_VERSION}/submarine-all-${SUBMARINE_VERSION}-hadoop-${SUBMARINE_HADOOP_VERSION}.jar

Expand Down
2 changes: 1 addition & 1 deletion submarine-sdk/pysubmarine/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

setup(
name='pysubmarine',
version='0.4.0',
version='0.5.0-SNAPSHOT',
description="A python SDK for submarine",
url="https://github.com/apache/submarine",
packages=find_packages(exclude=['tests', 'tests.*']),
Expand Down
4 changes: 2 additions & 2 deletions submarine-sdk/pysubmarine/submarine/experiment/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501
The version of the OpenAPI document: 0.4.0
The version of the OpenAPI document: 0.5.0-SNAPSHOT
Contact: dev@submarine.apache.org
Generated by: https://openapi-generator.tech
"""
Expand All @@ -43,4 +43,4 @@
from submarine.experiment.models.experiment_task_spec import ExperimentTaskSpec
from submarine.experiment.models.json_response import JsonResponse

__version__ = "0.4.0"
__version__ = "0.5.0-SNAPSHOT"
Loading

0 comments on commit 919d8c0

Please sign in to comment.