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.6.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
pingsutw committed Sep 19, 2021
1 parent 33201e6 commit 0d58a01
Show file tree
Hide file tree
Showing 103 changed files with 179 additions and 179 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/build-image-locally.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# limitations under the License.
#

SUBMARINE_VERSION="0.6.0-SNAPSHOT"
SUBMARINE_VERSION="0.6.0"
FOLDER_LIST=("database" "mlflow" "submarine")
IMAGE_LIST=("apache/submarine:database-${SUBMARINE_VERSION}" "apache/submarine:mlflow-${SUBMARINE_VERSION}" "apache/submarine:server-${SUBMARINE_VERSION}")

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_docker_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 240
env:
SUBMARINE_VERSION: 0.6.0-SNAPSHOT
SUBMARINE_VERSION: 0.6.0
steps:
- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ name: Submarine
on: [push, pull_request]

env:
VERSION: "0.6.0-SNAPSHOT"
VERSION: "0.6.0"
HADOOP_VERSION: "2.9"
PROFILE: "-Phadoop-2.9"
BUILD_FLAG: "clean install -ntp -DskipTests -am"
Expand Down
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.6.0-SNAPSHOT
org.apache.submarine:submarine-core:0.6.0
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
4 changes: 2 additions & 2 deletions dev-support/database/submarine-data.sql
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ INSERT INTO `team` VALUES ('e9ca23d68d884d4ebb19d07889721234', 'admin', 'Submari
-- Records of environment
-- ----------------------------
INSERT INTO `environment` VALUES
('environment_1600862964725_0001', 'notebook-env', '{"name":"notebook-env","dockerImage":"apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT","kernelSpec":{"name":"submarine_jupyter_py3","channels":["defaults"],"condaDependencies":[],"pipDependencies":[]}}', 'admin', '2020-09-21 14:00:05', 'admin', '2020-09-21 14:00:14'),
('environment_1600862964725_0002', 'notebook-gpu-env', '{"name":"notebook-gpu-env","dockerImage":"apache/submarine:jupyter-notebook-gpu-0.6.0-SNAPSHOT","kernelSpec":{"name":"submarine_jupyter_py3","channels":["defaults"],"condaDependencies":[],"pipDependencies":[]}}', 'admin', '2021-03-28 17:00:00', 'admin', '2021-03-28 17:00:00');
('environment_1600862964725_0001', 'notebook-env', '{"name":"notebook-env","dockerImage":"apache/submarine:jupyter-notebook-0.6.0","kernelSpec":{"name":"submarine_jupyter_py3","channels":["defaults"],"condaDependencies":[],"pipDependencies":[]}}', 'admin', '2020-09-21 14:00:05', 'admin', '2020-09-21 14:00:14'),
('environment_1600862964725_0002', 'notebook-gpu-env', '{"name":"notebook-gpu-env","dockerImage":"apache/submarine:jupyter-notebook-gpu-0.6.0","kernelSpec":{"name":"submarine_jupyter_py3","channels":["defaults"],"condaDependencies":[],"pipDependencies":[]}}', 'admin', '2021-03-28 17:00:00', 'admin', '2021-03-28 17:00:00');

-- ----------------------------
-- Records of experiment_templates
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 @@ -24,7 +24,7 @@ fi
export CURRENT_PATH=$(cd "${PWD}">/dev/null; pwd)
SUBMARINE_HOME=${CURRENT_PATH}/../../..

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

cp -rf "${SUBMARINE_HOME}/dev-support/database" "${CURRENT_PATH}"
Expand Down
2 changes: 1 addition & 1 deletion dev-support/docker-images/jupyter-gpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

set -euxo pipefail

JUPYTER_IMAGE="apache/submarine:jupyter-notebook-gpu-0.6.0-SNAPSHOT"
JUPYTER_IMAGE="apache/submarine:jupyter-notebook-gpu-0.6.0"

if [ -L ${BASH_SOURCE-$0} ]; then
PWD=$(dirname $(readlink "${BASH_SOURCE-$0}"))
Expand Down
2 changes: 1 addition & 1 deletion dev-support/docker-images/jupyter/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

set -euxo pipefail

JUPYTER_IMAGE="apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT"
JUPYTER_IMAGE="apache/submarine:jupyter-notebook-0.6.0"

if [ -L ${BASH_SOURCE-$0} ]; then
PWD=$(dirname $(readlink "${BASH_SOURCE-$0}"))
Expand Down
4 changes: 2 additions & 2 deletions dev-support/docker-images/mlflow/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

set -euxo pipefail

MLFLOW_IMAGE="apache/submarine:mlflow-0.6.0-SNAPSHOT"
MLFLOW_IMAGE="apache/submarine:mlflow-0.6.0"

if [ -L ${BASH_SOURCE-$0} ]; then
PWD=$(dirname $(readlink "${BASH_SOURCE-$0}"))
Expand All @@ -29,4 +29,4 @@ export SUBMARINE_HOME=${CURRENT_PATH}/../../..
# build image
echo "Start building the ${MLFLOW_IMAGE} docker image ..."
cd ${CURRENT_PATH}
docker build -t ${MLFLOW_IMAGE} .
docker build -t ${MLFLOW_IMAGE} .
4 changes: 2 additions & 2 deletions dev-support/docker-images/operator/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

set -euxo pipefail

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

if [ -L ${BASH_SOURCE-$0} ]; then
Expand All @@ -29,7 +29,7 @@ export SUBMARINE_HOME=${CURRENT_PATH}/../../..

mkdir -p "${CURRENT_PATH}/tmp"
cp -r ${SUBMARINE_HOME}/submarine-cloud-v2/ "${CURRENT_PATH}/tmp/submarine-cloud-v2/"
cp -r ${SUBMARINE_HOME}/helm-charts/submarine/charts/ "${CURRENT_PATH}/tmp/charts"
cp -r ${SUBMARINE_HOME}/helm-charts/submarine/charts/ "${CURRENT_PATH}/tmp/charts"

cd ${CURRENT_PATH}
echo "Start building the ${SUBMARINE_IMAGE_NAME} docker image ..."
Expand Down
4 changes: 2 additions & 2 deletions dev-support/docker-images/serve/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

set -euxo pipefail

SUBMARINE_VERSION=0.6.0-SNAPSHOT
SUBMARINE_VERSION=0.6.0
SUBMARINE_IMAGE_NAME="apache/submarine:serve-${SUBMARINE_VERSION}"

if [ -L ${BASH_SOURCE-$0} ]; then
Expand All @@ -30,4 +30,4 @@ export SUBMARINE_HOME=${CURRENT_PATH}/../../..
# build image
cd ${CURRENT_PATH}
echo "Start building the ${SUBMARINE_IMAGE_NAME} docker image ..."
docker build -t ${SUBMARINE_IMAGE_NAME} .
docker build -t ${SUBMARINE_IMAGE_NAME} .
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 @@ -16,7 +16,7 @@

set -euxo pipefail

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

if [ -L ${BASH_SOURCE-$0} ]; then
Expand Down
2 changes: 1 addition & 1 deletion dev-support/examples/mnist-pytorch/DDP/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

set -euxo pipefail

SUBMARINE_VERSION=0.6.0-SNAPSHOT
SUBMARINE_VERSION=0.6.0
SUBMARINE_IMAGE_NAME="ddp:${SUBMARINE_VERSION}"

if [ -L ${BASH_SOURCE-$0} ]; then
Expand Down
4 changes: 2 additions & 2 deletions dev-support/examples/mnist-pytorch/DDP/post.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ curl -X POST -H "Content-Type: application/json" -d '
}
},
"environment": {
"image": "ddp:0.6.0-SNAPSHOT"
"image": "ddp:0.6.0"
},
"spec": {
"Master": {
Expand All @@ -39,4 +39,4 @@ curl -X POST -H "Content-Type: application/json" -d '
}
}
}
' http://127.0.0.1:32080/api/v1/experiment
' http://127.0.0.1:32080/api/v1/experiment
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

set -euxo pipefail

SUBMARINE_VERSION=0.6.0-SNAPSHOT
SUBMARINE_VERSION=0.6.0
SUBMARINE_IMAGE_NAME="mirrored:${SUBMARINE_VERSION}"

if [ -L ${BASH_SOURCE-$0} ]; then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ curl -X POST -H "Content-Type: application/json" -d '
}
},
"environment": {
"image": "mirrored:0.6.0-SNAPSHOT"
"image": "mirrored:0.6.0"
},
"spec": {
"Worker": {
Expand All @@ -35,4 +35,4 @@ curl -X POST -H "Content-Type: application/json" -d '
}
}
}
' http://127.0.0.1:32080/api/v1/experiment
' http://127.0.0.1:32080/api/v1/experiment
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

set -euxo pipefail

SUBMARINE_VERSION=0.6.0-SNAPSHOT
SUBMARINE_VERSION=0.6.0
SUBMARINE_IMAGE_NAME="multi-worker-mirrored:${SUBMARINE_VERSION}"

if [ -L ${BASH_SOURCE-$0} ]; then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ curl -X POST -H "Content-Type: application/json" -d '
}
},
"environment": {
"image": "multi-worker-mirrored:0.6.0-SNAPSHOT"
"image": "multi-worker-mirrored:0.6.0"
},
"spec": {
"Worker": {
Expand All @@ -35,4 +35,4 @@ curl -X POST -H "Content-Type: application/json" -d '
}
}
}
' http://127.0.0.1:32080/api/v1/experiment
' http://127.0.0.1:32080/api/v1/experiment
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

set -euxo pipefail

SUBMARINE_VERSION=0.6.0-SNAPSHOT
SUBMARINE_VERSION=0.6.0
SUBMARINE_IMAGE_NAME="parameter-server:${SUBMARINE_VERSION}"

if [ -L ${BASH_SOURCE-$0} ]; then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ curl -X POST -H "Content-Type: application/json" -d '
}
},
"environment": {
"image": "parameter-server:0.6.0-SNAPSHOT"
"image": "parameter-server:0.6.0"
},
"spec": {
"Ps": {
Expand All @@ -39,4 +39,4 @@ curl -X POST -H "Content-Type: application/json" -d '
}
}
}
' http://127.0.0.1:32080/api/v1/experiment
' http://127.0.0.1:32080/api/v1/experiment
2 changes: 1 addition & 1 deletion dev-support/examples/nn-pytorch/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

set -euxo pipefail

SUBMARINE_VERSION=0.6.0-SNAPSHOT
SUBMARINE_VERSION=0.6.0
SUBMARINE_IMAGE_NAME="nn-pytorch:${SUBMARINE_VERSION}"

if [ -L ${BASH_SOURCE-$0} ]; then
Expand Down
6 changes: 3 additions & 3 deletions dev-support/examples/nn-pytorch/post.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ curl -X POST -H "Content-Type: application/json" -d '
"envVars": {
"ENV_1": "ENV1"
}
},
"environment": {
"image": "nn-pytorch:0.6.0-SNAPSHOT"
"image": "nn-pytorch:0.6.0"
},
"spec": {
"Worker": {
Expand All @@ -36,4 +36,4 @@ curl -X POST -H "Content-Type: application/json" -d '
}
}
}
' http://127.0.0.1:32080/api/v1/experiment
' http://127.0.0.1:32080/api/v1/experiment
2 changes: 1 addition & 1 deletion dev-support/examples/quickstart/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

set -euxo pipefail

SUBMARINE_VERSION=0.6.0-SNAPSHOT
SUBMARINE_VERSION=0.6.0
SUBMARINE_IMAGE_NAME="apache/submarine:quickstart-${SUBMARINE_VERSION}"

if [ -L ${BASH_SOURCE-$0} ]; then
Expand Down
4 changes: 2 additions & 2 deletions dev-support/examples/quickstart/post.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ curl -X POST -H "Content-Type: application/json" -d '
}
},
"environment": {
"image": "quickstart:0.6.0-SNAPSHOT"
"image": "quickstart:0.6.0"
},
"spec": {
"Worker": {
Expand All @@ -35,4 +35,4 @@ curl -X POST -H "Content-Type: application/json" -d '
}
}
}
' http://127.0.0.1:32080/api/v1/experiment
' http://127.0.0.1:32080/api/v1/experiment
2 changes: 1 addition & 1 deletion dev-support/examples/tracking/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

set -euxo pipefail

SUBMARINE_VERSION=0.6.0-SNAPSHOT
SUBMARINE_VERSION=0.6.0
SUBMARINE_IMAGE_NAME="tracking:${SUBMARINE_VERSION}"

if [ -L ${BASH_SOURCE-$0} ]; then
Expand Down
4 changes: 2 additions & 2 deletions dev-support/examples/tracking/post.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ curl -X POST -H "Content-Type: application/json" -d '
}
},
"environment": {
"image": "tracking:0.6.0-SNAPSHOT"
"image": "tracking:0.6.0"
},
"spec": {
"Ps": {
Expand All @@ -39,4 +39,4 @@ curl -X POST -H "Content-Type: application/json" -d '
}
}
}
' http://127.0.0.1:32080/api/v1/experiment
' http://127.0.0.1:32080/api/v1/experiment
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 -euo pipefail
hadoop_v=2.9.2
spark_v=2.3.4

submarine_v=${submarine_version:-"0.6.0-SNAPSHOT"}
submarine_v=${submarine_version:-"0.6.0"}
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.6.0-SNAPSHOT"}
SUBMARINE_VERSION=${SUBMARINE_VER:-"0.6.0"}

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.6.0-SNAPSHOT
SUBMARINE_VERSION=0.6.0
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.6.0-SNAPSHOT"}
SUBMARINE_VERSION=${SUBMARINE_VER:-"0.6.0"}

# 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.6.0-SNAPSHOT"}
SUBMARINE_VERSION=${SUBMARINE_VER:-"0.6.0"}

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.6.0-SNAPSHOT
SUBMARINE_VERSION=0.6.0
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.6.0-SNAPSHOT
SUBMARINE_VERSION=0.6.0
HADOOP_VERSION=2.9
SUBMARINE_PATH=/opt/submarine-current
HADOOP_CONF_PATH=/usr/local/hadoop/etc/hadoop
Expand Down
4 changes: 2 additions & 2 deletions dev-support/misc/flask/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

set -euxo pipefail

SUBMARINE_VERSION=0.6.0-SNAPSHOT
SUBMARINE_VERSION=0.6.0
SUBMARINE_IMAGE_NAME="flask:${SUBMARINE_VERSION}"

if [ -L ${BASH_SOURCE-$0} ]; then
Expand All @@ -30,4 +30,4 @@ export SUBMARINE_HOME=${CURRENT_PATH}/../../..
# build image
cd ${CURRENT_PATH}
echo "Start building the ${SUBMARINE_IMAGE_NAME} docker image ..."
docker build -t ${SUBMARINE_IMAGE_NAME} .
docker build -t ${SUBMARINE_IMAGE_NAME} .
Loading

0 comments on commit 0d58a01

Please sign in to comment.