-
Notifications
You must be signed in to change notification settings - Fork 441
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support custom metrics collector kind (#908)
* Support custom metrics collector kind * Fix python image version for v1alpha2
- Loading branch information
1 parent
c95c144
commit 2df906e
Showing
9 changed files
with
211 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| apiVersion: "kubeflow.org/v1alpha3" | ||
| kind: Experiment | ||
| metadata: | ||
| namespace: kubeflow | ||
| labels: | ||
| controller-tools.k8s.io: "1.0" | ||
| name: custom-metricscollector-example | ||
| spec: | ||
| objective: | ||
| type: maximize | ||
| goal: 0.99 | ||
| objectiveMetricName: accuracy | ||
| metricsCollectorSpec: | ||
| source: | ||
| fileSystemPath: | ||
| path: "/katib/mnist.log" | ||
| kind: File | ||
| collector: | ||
| kind: Custom | ||
| customCollector: | ||
| args: | ||
| - -m | ||
| - accuracy | ||
| - -s | ||
| - katib-manager.kubeflow:6789 | ||
| - -path | ||
| - /katib/mnist.log | ||
| image: liuhougangxa/custom-metrics-collector:latest | ||
| imagePullPolicy: Always | ||
| name: custom-metrics-logger-and-collector | ||
| env: | ||
| - name: TrialNamePrefix | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: metadata.name | ||
| algorithm: | ||
| algorithmName: random | ||
| parallelTrialCount: 3 | ||
| maxTrialCount: 12 | ||
| maxFailedTrialCount: 3 | ||
| parameters: | ||
| - name: --lr | ||
| parameterType: double | ||
| feasibleSpace: | ||
| min: "0.01" | ||
| max: "0.03" | ||
| - name: --momentum | ||
| parameterType: double | ||
| feasibleSpace: | ||
| min: "0.3" | ||
| max: "0.7" | ||
| trialTemplate: | ||
| goTemplate: | ||
| rawTemplate: |- | ||
| apiVersion: batch/v1 | ||
| kind: Job | ||
| metadata: | ||
| name: {{.Trial}} | ||
| namespace: {{.NameSpace}} | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: {{.Trial}} | ||
| image: docker.io/liuhougangxa/pytorch-mnist | ||
| imagePullPolicy: Always | ||
| command: | ||
| - "python" | ||
| - "/var/mnist.py" | ||
| - "--epochs=1" | ||
| {{- with .HyperParameters}} | ||
| {{- range .}} | ||
| - "{{.Name}}={{.Value}}" | ||
| {{- end}} | ||
| {{- end}} | ||
| restartPolicy: Never |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Copyright 2018 The Kubernetes Authors. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # This shell script is used to build a cluster and create a namespace from our | ||
| # argo workflow | ||
|
|
||
| set -o errexit | ||
| set -o nounset | ||
| set -o pipefail | ||
|
|
||
| CLUSTER_NAME="${CLUSTER_NAME}" | ||
| ZONE="${GCP_ZONE}" | ||
| PROJECT="${GCP_PROJECT}" | ||
| NAMESPACE="${DEPLOY_NAMESPACE}" | ||
| REGISTRY="${GCP_REGISTRY}" | ||
| GO_DIR=${GOPATH}/src/github.com/${REPO_OWNER}/${REPO_NAME} | ||
|
|
||
| echo "Activating service-account" | ||
| gcloud auth activate-service-account --key-file=${GOOGLE_APPLICATION_CREDENTIALS} | ||
|
|
||
| echo "Configuring kubectl" | ||
|
|
||
| echo "CLUSTER_NAME: ${CLUSTER_NAME}" | ||
| echo "ZONE: ${GCP_ZONE}" | ||
| echo "PROJECT: ${GCP_PROJECT}" | ||
|
|
||
| gcloud --project ${PROJECT} container clusters get-credentials ${CLUSTER_NAME} \ | ||
| --zone ${ZONE} | ||
| kubectl config set-context $(kubectl config current-context) --namespace=default | ||
| USER=`gcloud config get-value account` | ||
|
|
||
| echo "All Katib components are running." | ||
| kubectl version | ||
| kubectl cluster-info | ||
| echo "Katib deployments" | ||
| kubectl -n kubeflow get deploy | ||
| echo "Katib services" | ||
| kubectl -n kubeflow get svc | ||
| echo "Katib pods" | ||
| kubectl -n kubeflow get pod | ||
|
|
||
| cd ${GO_DIR}/test/e2e/v1alpha3 | ||
|
|
||
| echo "Running e2e custom metricscollector experiment" | ||
| export KUBECONFIG=$HOME/.kube/config | ||
| ./run-e2e-experiment ../../../examples/v1alpha3/custom-metricscollector-example.yaml | ||
| kubectl -n kubeflow describe suggestion | ||
| kubectl delete -f ../../../examples/v1alpha3/custom-metricscollector-example.yaml | ||
| kubectl describe pods | ||
| kubectl describe deploy | ||
| exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters