From 3193e8679dba60a4d96bac1f82a36226cf82572a Mon Sep 17 00:00:00 2001 From: Noha Ihab <49988746+NohaIhab@users.noreply.github.com> Date: Tue, 9 Jul 2024 13:52:48 +0300 Subject: [PATCH] chore: update manifests for KF 1.9.0-rc.2 (#208) * chore: update manifests for KF 1.9.0-rc.2 --- charms/katib-controller/metadata.yaml | 2 +- .../src/default-custom-images.json | 34 +++++++++---------- .../tests/integration/test_charm.py | 19 +++++++---- charms/katib-db-manager/metadata.yaml | 2 +- charms/katib-ui/metadata.yaml | 2 +- .../experiments/bayesian-optimization.yaml | 2 +- tests/assets/crs/experiments/cmaes.yaml | 2 +- tests/assets/crs/experiments/darts-cpu.yaml | 2 +- tests/assets/crs/experiments/enas-cpu.yaml | 2 +- .../experiments/file-metrics-collector.yaml | 2 +- .../assets/crs/experiments/grid-example.yaml | 2 +- tests/assets/crs/experiments/hyperband.yaml | 2 +- tests/assets/crs/experiments/median-stop.yaml | 2 +- tests/assets/crs/experiments/random.yaml | 2 +- tests/assets/crs/experiments/simple-pbt.yaml | 2 +- .../tfjob-mnist-with-summaries.yaml | 2 +- 16 files changed, 44 insertions(+), 37 deletions(-) diff --git a/charms/katib-controller/metadata.yaml b/charms/katib-controller/metadata.yaml index cc4c122a..a0710c9f 100755 --- a/charms/katib-controller/metadata.yaml +++ b/charms/katib-controller/metadata.yaml @@ -15,7 +15,7 @@ resources: type: oci-image description: OCI image for katb-controller auto-fetch: true - upstream-source: docker.io/kubeflowkatib/katib-controller:v0.17.0-rc.0 + upstream-source: docker.io/kubeflowkatib/katib-controller:v0.17.0-rc.1 provides: metrics-endpoint: interface: prometheus_scrape diff --git a/charms/katib-controller/src/default-custom-images.json b/charms/katib-controller/src/default-custom-images.json index 127dfd8c..d2abacc2 100644 --- a/charms/katib-controller/src/default-custom-images.json +++ b/charms/katib-controller/src/default-custom-images.json @@ -1,20 +1,20 @@ { "default_trial_template": "docker.io/ubuntu:22.04", - "default_trial_template_enas": "docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.17.0-rc.0", - "default_trial_template_pytorch": "docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.17.0-rc.0", - "early_stopping__medianstop": "docker.io/kubeflowkatib/earlystopping-medianstop:v0.17.0-rc.0", - "metrics_collector_sidecar__stdout": "docker.io/kubeflowkatib/file-metrics-collector:v0.17.0-rc.0", - "metrics_collector_sidecar__file": "docker.io/kubeflowkatib/file-metrics-collector:v0.17.0-rc.0", - "metrics_collector_sidecar__tensorflow_event": "docker.io/kubeflowkatib/tfevent-metrics-collector:v0.17.0-rc.0", - "suggestion__random": "docker.io/kubeflowkatib/suggestion-hyperopt:v0.17.0-rc.0", - "suggestion__tpe": "docker.io/kubeflowkatib/suggestion-hyperopt:v0.17.0-rc.0", - "suggestion__grid": "docker.io/kubeflowkatib/suggestion-optuna:v0.17.0-rc.0", - "suggestion__hyperband": "docker.io/kubeflowkatib/suggestion-hyperband:v0.17.0-rc.0", - "suggestion__bayesianoptimization": "docker.io/kubeflowkatib/suggestion-skopt:v0.17.0-rc.0", - "suggestion__cmaes": "docker.io/kubeflowkatib/suggestion-goptuna:v0.17.0-rc.0", - "suggestion__sobol": "docker.io/kubeflowkatib/suggestion-goptuna:v0.17.0-rc.0", - "suggestion__multivariate_tpe": "docker.io/kubeflowkatib/suggestion-optuna:v0.17.0-rc.0", - "suggestion__enas": "docker.io/kubeflowkatib/suggestion-enas:v0.17.0-rc.0", - "suggestion__darts": "docker.io/kubeflowkatib/suggestion-darts:v0.17.0-rc.0", - "suggestion__pbt": "docker.io/kubeflowkatib/suggestion-pbt:v0.17.0-rc.0" + "default_trial_template_enas": "docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.17.0-rc.1", + "default_trial_template_pytorch": "docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.17.0-rc.1", + "early_stopping__medianstop": "docker.io/kubeflowkatib/earlystopping-medianstop:v0.17.0-rc.1", + "metrics_collector_sidecar__stdout": "docker.io/kubeflowkatib/file-metrics-collector:v0.17.0-rc.1", + "metrics_collector_sidecar__file": "docker.io/kubeflowkatib/file-metrics-collector:v0.17.0-rc.1", + "metrics_collector_sidecar__tensorflow_event": "docker.io/kubeflowkatib/tfevent-metrics-collector:v0.17.0-rc.1", + "suggestion__random": "docker.io/kubeflowkatib/suggestion-hyperopt:v0.17.0-rc.1", + "suggestion__tpe": "docker.io/kubeflowkatib/suggestion-hyperopt:v0.17.0-rc.1", + "suggestion__grid": "docker.io/kubeflowkatib/suggestion-optuna:v0.17.0-rc.1", + "suggestion__hyperband": "docker.io/kubeflowkatib/suggestion-hyperband:v0.17.0-rc.1", + "suggestion__bayesianoptimization": "docker.io/kubeflowkatib/suggestion-skopt:v0.17.0-rc.1", + "suggestion__cmaes": "docker.io/kubeflowkatib/suggestion-goptuna:v0.17.0-rc.1", + "suggestion__sobol": "docker.io/kubeflowkatib/suggestion-goptuna:v0.17.0-rc.1", + "suggestion__multivariate_tpe": "docker.io/kubeflowkatib/suggestion-optuna:v0.17.0-rc.1", + "suggestion__enas": "docker.io/kubeflowkatib/suggestion-enas:v0.17.0-rc.1", + "suggestion__darts": "docker.io/kubeflowkatib/suggestion-darts:v0.17.0-rc.1", + "suggestion__pbt": "docker.io/kubeflowkatib/suggestion-pbt:v0.17.0-rc.1" } diff --git a/charms/katib-controller/tests/integration/test_charm.py b/charms/katib-controller/tests/integration/test_charm.py index 87e37a19..83532410 100644 --- a/charms/katib-controller/tests/integration/test_charm.py +++ b/charms/katib-controller/tests/integration/test_charm.py @@ -22,22 +22,29 @@ KATIB_CONFIG = "katib-config" KATIB_DB_MANAGER = "katib-db-manager" KATIB_DB_MANAGER_CHANNEL = "latest/edge" +KATIB_VERSION = "v0.17.0-rc.1" TRIAL_TEMPLATE = "trial-template" EXPECTED_KATIB_CONFIG = { - "katib-config.yaml": "---\napiVersion: config.kubeflow.org/v1beta1\nkind: KatibConfig\ninit:\n controller:\n webhookPort: 443\n trialResources:\n - Job.v1.batch\n - TFJob.v1.kubeflow.org\n - PyTorchJob.v1.kubeflow.org\n - MPIJob.v1.kubeflow.org\n - XGBoostJob.v1.kubeflow.org\n - MXJob.v1.kubeflow.org\nruntime:\n metricsCollectors:\n - kind: StdOut\n image: docker.io/kubeflowkatib/file-metrics-collector:v0.17.0-rc.0\n - kind: File\n image: docker.io/kubeflowkatib/file-metrics-collector:v0.17.0-rc.0\n - kind: TensorFlowEvent\n image: docker.io/kubeflowkatib/tfevent-metrics-collector:v0.17.0-rc.0\n resources:\n limits:\n memory: 1Gi\n suggestions:\n - algorithmName: random\n image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.17.0-rc.0\n - algorithmName: tpe\n image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.17.0-rc.0\n - algorithmName: grid\n image: docker.io/kubeflowkatib/suggestion-optuna:v0.17.0-rc.0\n - algorithmName: hyperband\n image: docker.io/kubeflowkatib/suggestion-hyperband:v0.17.0-rc.0\n - algorithmName: bayesianoptimization\n image: docker.io/kubeflowkatib/suggestion-skopt:v0.17.0-rc.0\n - algorithmName: cmaes\n image: docker.io/kubeflowkatib/suggestion-goptuna:v0.17.0-rc.0\n - algorithmName: sobol\n image: docker.io/kubeflowkatib/suggestion-goptuna:v0.17.0-rc.0\n - algorithmName: multivariate-tpe\n image: docker.io/kubeflowkatib/suggestion-optuna:v0.17.0-rc.0\n - algorithmName: enas\n image: docker.io/kubeflowkatib/suggestion-enas:v0.17.0-rc.0\n resources:\n limits:\n memory: 400Mi\n - algorithmName: darts\n image: docker.io/kubeflowkatib/suggestion-darts:v0.17.0-rc.0\n - algorithmName: pbt\n image: docker.io/kubeflowkatib/suggestion-pbt:v0.17.0-rc.0\n persistentVolumeClaimSpec:\n accessModes:\n - ReadWriteMany\n resources:\n requests:\n storage: 5Gi\n earlyStoppings:\n - algorithmName: medianstop\n image: docker.io/kubeflowkatib/earlystopping-medianstop:v0.17.0-rc.0", # noqa: E501 + "katib-config.yaml": "---\napiVersion: config.kubeflow.org/v1beta1\nkind: KatibConfig\ninit:\n controller:\n webhookPort: 443\n trialResources:\n - Job.v1.batch\n - TFJob.v1.kubeflow.org\n - PyTorchJob.v1.kubeflow.org\n - MPIJob.v1.kubeflow.org\n - XGBoostJob.v1.kubeflow.org\n - MXJob.v1.kubeflow.org\nruntime:\n metricsCollectors:\n - kind: StdOut\n image: docker.io/kubeflowkatib/file-metrics-collector:%(katib_version)s\n - kind: File\n image: docker.io/kubeflowkatib/file-metrics-collector:%(katib_version)s\n - kind: TensorFlowEvent\n image: docker.io/kubeflowkatib/tfevent-metrics-collector:%(katib_version)s\n resources:\n limits:\n memory: 1Gi\n suggestions:\n - algorithmName: random\n image: docker.io/kubeflowkatib/suggestion-hyperopt:%(katib_version)s\n - algorithmName: tpe\n image: docker.io/kubeflowkatib/suggestion-hyperopt:%(katib_version)s\n - algorithmName: grid\n image: docker.io/kubeflowkatib/suggestion-optuna:%(katib_version)s\n - algorithmName: hyperband\n image: docker.io/kubeflowkatib/suggestion-hyperband:%(katib_version)s\n - algorithmName: bayesianoptimization\n image: docker.io/kubeflowkatib/suggestion-skopt:%(katib_version)s\n - algorithmName: cmaes\n image: docker.io/kubeflowkatib/suggestion-goptuna:%(katib_version)s\n - algorithmName: sobol\n image: docker.io/kubeflowkatib/suggestion-goptuna:%(katib_version)s\n - algorithmName: multivariate-tpe\n image: docker.io/kubeflowkatib/suggestion-optuna:%(katib_version)s\n - algorithmName: enas\n image: docker.io/kubeflowkatib/suggestion-enas:%(katib_version)s\n resources:\n limits:\n memory: 400Mi\n - algorithmName: darts\n image: docker.io/kubeflowkatib/suggestion-darts:%(katib_version)s\n - algorithmName: pbt\n image: docker.io/kubeflowkatib/suggestion-pbt:%(katib_version)s\n persistentVolumeClaimSpec:\n accessModes:\n - ReadWriteMany\n resources:\n requests:\n storage: 5Gi\n earlyStoppings:\n - algorithmName: medianstop\n image: docker.io/kubeflowkatib/earlystopping-medianstop:%(katib_version)s" # noqa: E501 + % {"katib_version": KATIB_VERSION}, } EXPECTED_KATIB_CONFIG_CHANGED = { - "katib-config.yaml": "---\napiVersion: config.kubeflow.org/v1beta1\nkind: KatibConfig\ninit:\n controller:\n webhookPort: 443\n trialResources:\n - Job.v1.batch\n - TFJob.v1.kubeflow.org\n - PyTorchJob.v1.kubeflow.org\n - MPIJob.v1.kubeflow.org\n - XGBoostJob.v1.kubeflow.org\n - MXJob.v1.kubeflow.org\nruntime:\n metricsCollectors:\n - kind: StdOut\n image: docker.io/kubeflowkatib/file-metrics-collector:v0.17.0-rc.0\n - kind: File\n image: docker.io/kubeflowkatib/file-metrics-collector:v0.17.0-rc.0\n - kind: TensorFlowEvent\n image: docker.io/kubeflowkatib/tfevent-metrics-collector:v0.17.0-rc.0\n resources:\n limits:\n memory: 1Gi\n suggestions:\n - algorithmName: random\n image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.17.0-rc.0\n - algorithmName: tpe\n image: docker.io/kubeflowkatib/suggestion-hyperopt:v0.17.0-rc.0\n - algorithmName: grid\n image: docker.io/kubeflowkatib/suggestion-optuna:v0.17.0-rc.0\n - algorithmName: hyperband\n image: docker.io/kubeflowkatib/suggestion-hyperband:v0.17.0-rc.0\n - algorithmName: bayesianoptimization\n image: docker.io/kubeflowkatib/suggestion-skopt:v0.17.0-rc.0\n - algorithmName: cmaes\n image: docker.io/kubeflowkatib/suggestion-goptuna:v0.17.0-rc.0\n - algorithmName: sobol\n image: docker.io/kubeflowkatib/suggestion-goptuna:v0.17.0-rc.0\n - algorithmName: multivariate-tpe\n image: docker.io/kubeflowkatib/suggestion-optuna:v0.17.0-rc.0\n - algorithmName: enas\n image: docker.io/kubeflowkatib/suggestion-enas:v0.17.0-rc.0\n resources:\n limits:\n memory: 400Mi\n - algorithmName: darts\n image: docker.io/kubeflowkatib/suggestion-darts:v0.17.0-rc.0\n - algorithmName: pbt\n image: docker.io/kubeflowkatib/suggestion-pbt:v0.17.0-rc.0\n persistentVolumeClaimSpec:\n accessModes:\n - ReadWriteMany\n resources:\n requests:\n storage: 5Gi\n earlyStoppings:\n - algorithmName: medianstop\n image: custom:2.1", # noqa: E501 + "katib-config.yaml": "---\napiVersion: config.kubeflow.org/v1beta1\nkind: KatibConfig\ninit:\n controller:\n webhookPort: 443\n trialResources:\n - Job.v1.batch\n - TFJob.v1.kubeflow.org\n - PyTorchJob.v1.kubeflow.org\n - MPIJob.v1.kubeflow.org\n - XGBoostJob.v1.kubeflow.org\n - MXJob.v1.kubeflow.org\nruntime:\n metricsCollectors:\n - kind: StdOut\n image: docker.io/kubeflowkatib/file-metrics-collector:%(katib_version)s\n - kind: File\n image: docker.io/kubeflowkatib/file-metrics-collector:%(katib_version)s\n - kind: TensorFlowEvent\n image: docker.io/kubeflowkatib/tfevent-metrics-collector:%(katib_version)s\n resources:\n limits:\n memory: 1Gi\n suggestions:\n - algorithmName: random\n image: docker.io/kubeflowkatib/suggestion-hyperopt:%(katib_version)s\n - algorithmName: tpe\n image: docker.io/kubeflowkatib/suggestion-hyperopt:%(katib_version)s\n - algorithmName: grid\n image: docker.io/kubeflowkatib/suggestion-optuna:%(katib_version)s\n - algorithmName: hyperband\n image: docker.io/kubeflowkatib/suggestion-hyperband:%(katib_version)s\n - algorithmName: bayesianoptimization\n image: docker.io/kubeflowkatib/suggestion-skopt:%(katib_version)s\n - algorithmName: cmaes\n image: docker.io/kubeflowkatib/suggestion-goptuna:%(katib_version)s\n - algorithmName: sobol\n image: docker.io/kubeflowkatib/suggestion-goptuna:%(katib_version)s\n - algorithmName: multivariate-tpe\n image: docker.io/kubeflowkatib/suggestion-optuna:%(katib_version)s\n - algorithmName: enas\n image: docker.io/kubeflowkatib/suggestion-enas:%(katib_version)s\n resources:\n limits:\n memory: 400Mi\n - algorithmName: darts\n image: docker.io/kubeflowkatib/suggestion-darts:%(katib_version)s\n - algorithmName: pbt\n image: docker.io/kubeflowkatib/suggestion-pbt:%(katib_version)s\n persistentVolumeClaimSpec:\n accessModes:\n - ReadWriteMany\n resources:\n requests:\n storage: 5Gi\n earlyStoppings:\n - algorithmName: medianstop\n image: custom:2.1" # noqa: E501 + % {"katib_version": KATIB_VERSION}, } EXPECTED_TRIAL_TEMPLATE = { "defaultTrialTemplate.yaml": 'apiVersion: batch/v1\nkind: Job\nspec:\n template:\n spec:\n containers:\n - name: training-container\n image: docker.io/ubuntu:22.04\n command:\n - "python3"\n - "/opt/some-script.py"\n - "--batch-size=64"\n - "--lr=${trialParameters.learningRate}"\n - "--num-layers=${trialParameters.numberLayers}"\n - "--optimizer=${trialParameters.optimizer}"\n restartPolicy: Never', # noqa: E501 - "enasCPUTemplate": 'apiVersion: batch/v1\nkind: Job\nspec:\n template:\n spec:\n containers:\n - name: training-container\n image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.17.0-rc.0\n command:\n - python3\n - -u\n - RunTrial.py\n - --num_epochs=1\n - "--architecture=\\"${trialParameters.neuralNetworkArchitecture}\\""\n - "--nn_config=\\"${trialParameters.neuralNetworkConfig}\\""\n restartPolicy: Never', # noqa: E501 - "pytorchJobTemplate": 'apiVersion: kubeflow.org/v1\nkind: PyTorchJob\nspec:\n pytorchReplicaSpecs:\n Master:\n replicas: 1\n restartPolicy: OnFailure\n template:\n spec:\n containers:\n - name: pytorch\n image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.17.0-rc.0\n command:\n - "python3"\n - "/opt/pytorch-mnist/mnist.py"\n - "--epochs=1"\n - "--lr=${trialParameters.learningRate}"\n - "--momentum=${trialParameters.momentum}"\n Worker:\n replicas: 2\n restartPolicy: OnFailure\n template:\n spec:\n containers:\n - name: pytorch\n image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.17.0-rc.0\n command:\n - "python3"\n - "/opt/pytorch-mnist/mnist.py"\n - "--epochs=1"\n - "--lr=${trialParameters.learningRate}"\n - "--momentum=${trialParameters.momentum}"', # noqa: E501 + "enasCPUTemplate": 'apiVersion: batch/v1\nkind: Job\nspec:\n template:\n spec:\n containers:\n - name: training-container\n image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:%(katib_version)s\n command:\n - python3\n - -u\n - RunTrial.py\n - --num_epochs=1\n - "--architecture=\\"${trialParameters.neuralNetworkArchitecture}\\""\n - "--nn_config=\\"${trialParameters.neuralNetworkConfig}\\""\n restartPolicy: Never' # noqa: E501 + % {"katib_version": KATIB_VERSION}, + "pytorchJobTemplate": 'apiVersion: kubeflow.org/v1\nkind: PyTorchJob\nspec:\n pytorchReplicaSpecs:\n Master:\n replicas: 1\n restartPolicy: OnFailure\n template:\n spec:\n containers:\n - name: pytorch\n image: docker.io/kubeflowkatib/pytorch-mnist-cpu:%(katib_version)s\n command:\n - "python3"\n - "/opt/pytorch-mnist/mnist.py"\n - "--epochs=1"\n - "--lr=${trialParameters.learningRate}"\n - "--momentum=${trialParameters.momentum}"\n Worker:\n replicas: 2\n restartPolicy: OnFailure\n template:\n spec:\n containers:\n - name: pytorch\n image: docker.io/kubeflowkatib/pytorch-mnist-cpu:%(katib_version)s\n command:\n - "python3"\n - "/opt/pytorch-mnist/mnist.py"\n - "--epochs=1"\n - "--lr=${trialParameters.learningRate}"\n - "--momentum=${trialParameters.momentum}"' # noqa: E501 + % {"katib_version": KATIB_VERSION}, } EXPECTED_TRIAL_TEMPLATE_CHANGED = { "defaultTrialTemplate.yaml": 'apiVersion: batch/v1\nkind: Job\nspec:\n template:\n spec:\n containers:\n - name: training-container\n image: custom:1.0\n command:\n - "python3"\n - "/opt/some-script.py"\n - "--batch-size=64"\n - "--lr=${trialParameters.learningRate}"\n - "--num-layers=${trialParameters.numberLayers}"\n - "--optimizer=${trialParameters.optimizer}"\n restartPolicy: Never', # noqa: E501 - "enasCPUTemplate": 'apiVersion: batch/v1\nkind: Job\nspec:\n template:\n spec:\n containers:\n - name: training-container\n image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.17.0-rc.0\n command:\n - python3\n - -u\n - RunTrial.py\n - --num_epochs=1\n - "--architecture=\\"${trialParameters.neuralNetworkArchitecture}\\""\n - "--nn_config=\\"${trialParameters.neuralNetworkConfig}\\""\n restartPolicy: Never', # noqa: E501 - "pytorchJobTemplate": 'apiVersion: kubeflow.org/v1\nkind: PyTorchJob\nspec:\n pytorchReplicaSpecs:\n Master:\n replicas: 1\n restartPolicy: OnFailure\n template:\n spec:\n containers:\n - name: pytorch\n image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.17.0-rc.0\n command:\n - "python3"\n - "/opt/pytorch-mnist/mnist.py"\n - "--epochs=1"\n - "--lr=${trialParameters.learningRate}"\n - "--momentum=${trialParameters.momentum}"\n Worker:\n replicas: 2\n restartPolicy: OnFailure\n template:\n spec:\n containers:\n - name: pytorch\n image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.17.0-rc.0\n command:\n - "python3"\n - "/opt/pytorch-mnist/mnist.py"\n - "--epochs=1"\n - "--lr=${trialParameters.learningRate}"\n - "--momentum=${trialParameters.momentum}"', # noqa: E501 + "enasCPUTemplate": 'apiVersion: batch/v1\nkind: Job\nspec:\n template:\n spec:\n containers:\n - name: training-container\n image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:%(katib_version)s\n command:\n - python3\n - -u\n - RunTrial.py\n - --num_epochs=1\n - "--architecture=\\"${trialParameters.neuralNetworkArchitecture}\\""\n - "--nn_config=\\"${trialParameters.neuralNetworkConfig}\\""\n restartPolicy: Never' # noqa: E501 + % {"katib_version": KATIB_VERSION}, + "pytorchJobTemplate": 'apiVersion: kubeflow.org/v1\nkind: PyTorchJob\nspec:\n pytorchReplicaSpecs:\n Master:\n replicas: 1\n restartPolicy: OnFailure\n template:\n spec:\n containers:\n - name: pytorch\n image: docker.io/kubeflowkatib/pytorch-mnist-cpu:%(katib_version)s\n command:\n - "python3"\n - "/opt/pytorch-mnist/mnist.py"\n - "--epochs=1"\n - "--lr=${trialParameters.learningRate}"\n - "--momentum=${trialParameters.momentum}"\n Worker:\n replicas: 2\n restartPolicy: OnFailure\n template:\n spec:\n containers:\n - name: pytorch\n image: docker.io/kubeflowkatib/pytorch-mnist-cpu:%(katib_version)s\n command:\n - "python3"\n - "/opt/pytorch-mnist/mnist.py"\n - "--epochs=1"\n - "--lr=${trialParameters.learningRate}"\n - "--momentum=${trialParameters.momentum}"' # noqa: E501 + % {"katib_version": KATIB_VERSION}, } diff --git a/charms/katib-db-manager/metadata.yaml b/charms/katib-db-manager/metadata.yaml index 7fb8c4dc..24f66d28 100755 --- a/charms/katib-db-manager/metadata.yaml +++ b/charms/katib-db-manager/metadata.yaml @@ -18,7 +18,7 @@ resources: type: oci-image description: Backing OCI image auto-fetch: true - upstream-source: docker.io/kubeflowkatib/katib-db-manager:v0.17.0-rc.0 + upstream-source: docker.io/kubeflowkatib/katib-db-manager:v0.17.0-rc.1 requires: relational-db: interface: mysql_client diff --git a/charms/katib-ui/metadata.yaml b/charms/katib-ui/metadata.yaml index 202a13bc..4581596e 100755 --- a/charms/katib-ui/metadata.yaml +++ b/charms/katib-ui/metadata.yaml @@ -15,7 +15,7 @@ resources: type: oci-image description: Backing OCI image auto-fetch: true - upstream-source: docker.io/kubeflowkatib/katib-ui:v0.17.0-rc.0 + upstream-source: docker.io/kubeflowkatib/katib-ui:v0.17.0-rc.1 requires: ingress: interface: ingress diff --git a/tests/assets/crs/experiments/bayesian-optimization.yaml b/tests/assets/crs/experiments/bayesian-optimization.yaml index c88b2e93..270e3f8c 100644 --- a/tests/assets/crs/experiments/bayesian-optimization.yaml +++ b/tests/assets/crs/experiments/bayesian-optimization.yaml @@ -60,7 +60,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/mxnet-mnist:v0.17.0-rc.0 + image: docker.io/kubeflowkatib/mxnet-mnist:v0.17.0-rc.1 command: - "python3" - "/opt/mxnet-mnist/mnist.py" diff --git a/tests/assets/crs/experiments/cmaes.yaml b/tests/assets/crs/experiments/cmaes.yaml index 46802b5c..dcc58424 100644 --- a/tests/assets/crs/experiments/cmaes.yaml +++ b/tests/assets/crs/experiments/cmaes.yaml @@ -60,7 +60,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/mxnet-mnist:v0.17.0-rc.0 + image: docker.io/kubeflowkatib/mxnet-mnist:v0.17.0-rc.1 command: - "python3" - "/opt/mxnet-mnist/mnist.py" diff --git a/tests/assets/crs/experiments/darts-cpu.yaml b/tests/assets/crs/experiments/darts-cpu.yaml index 60dd4470..1d8ab71e 100644 --- a/tests/assets/crs/experiments/darts-cpu.yaml +++ b/tests/assets/crs/experiments/darts-cpu.yaml @@ -63,7 +63,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/darts-cnn-cifar10-cpu:v0.17.0-rc.0 + image: docker.io/kubeflowkatib/darts-cnn-cifar10-cpu:v0.17.0-rc.1 command: - python3 - run_trial.py diff --git a/tests/assets/crs/experiments/enas-cpu.yaml b/tests/assets/crs/experiments/enas-cpu.yaml index c5445939..15b6e3b1 100644 --- a/tests/assets/crs/experiments/enas-cpu.yaml +++ b/tests/assets/crs/experiments/enas-cpu.yaml @@ -133,7 +133,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.17.0-rc.0 + image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.17.0-rc.1 command: - python3 - -u diff --git a/tests/assets/crs/experiments/file-metrics-collector.yaml b/tests/assets/crs/experiments/file-metrics-collector.yaml index 908f4639..42216da8 100644 --- a/tests/assets/crs/experiments/file-metrics-collector.yaml +++ b/tests/assets/crs/experiments/file-metrics-collector.yaml @@ -57,7 +57,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.17.0-rc.0 + image: docker.io/kubeflowkatib/pytorch-mnist-cpu:v0.17.0-rc.1 command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/tests/assets/crs/experiments/grid-example.yaml b/tests/assets/crs/experiments/grid-example.yaml index c71bd29f..908ffb0c 100644 --- a/tests/assets/crs/experiments/grid-example.yaml +++ b/tests/assets/crs/experiments/grid-example.yaml @@ -58,7 +58,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/mxnet-mnist:v0.17.0-rc.0 + image: docker.io/kubeflowkatib/mxnet-mnist:v0.17.0-rc.1 command: - "python3" - "/opt/mxnet-mnist/mnist.py" diff --git a/tests/assets/crs/experiments/hyperband.yaml b/tests/assets/crs/experiments/hyperband.yaml index 49f0a01e..edcd9d70 100644 --- a/tests/assets/crs/experiments/hyperband.yaml +++ b/tests/assets/crs/experiments/hyperband.yaml @@ -72,7 +72,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/mxnet-mnist:v0.17.0-rc.0 + image: docker.io/kubeflowkatib/mxnet-mnist:v0.17.0-rc.1 command: - "python3" - "/opt/mxnet-mnist/mnist.py" diff --git a/tests/assets/crs/experiments/median-stop.yaml b/tests/assets/crs/experiments/median-stop.yaml index 3b0a4244..dd0e10df 100644 --- a/tests/assets/crs/experiments/median-stop.yaml +++ b/tests/assets/crs/experiments/median-stop.yaml @@ -55,7 +55,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/mxnet-mnist:v0.17.0-rc.0 + image: docker.io/kubeflowkatib/mxnet-mnist:v0.17.0-rc.1 command: - "python3" - "/opt/mxnet-mnist/mnist.py" diff --git a/tests/assets/crs/experiments/random.yaml b/tests/assets/crs/experiments/random.yaml index b40ece63..b09ceb48 100644 --- a/tests/assets/crs/experiments/random.yaml +++ b/tests/assets/crs/experiments/random.yaml @@ -57,7 +57,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/mxnet-mnist:v0.17.0-rc.0 + image: docker.io/kubeflowkatib/mxnet-mnist:v0.17.0-rc.1 command: - "python3" - "/opt/mxnet-mnist/mnist.py" diff --git a/tests/assets/crs/experiments/simple-pbt.yaml b/tests/assets/crs/experiments/simple-pbt.yaml index 221f44af..6f13faff 100644 --- a/tests/assets/crs/experiments/simple-pbt.yaml +++ b/tests/assets/crs/experiments/simple-pbt.yaml @@ -46,7 +46,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/simple-pbt:v0.17.0-rc.0 + image: docker.io/kubeflowkatib/simple-pbt:v0.17.0-rc.1 command: - "python3" - "/opt/pbt/pbt_test.py" diff --git a/tests/assets/crs/experiments/tfjob-mnist-with-summaries.yaml b/tests/assets/crs/experiments/tfjob-mnist-with-summaries.yaml index 80822e00..f4cdf79e 100644 --- a/tests/assets/crs/experiments/tfjob-mnist-with-summaries.yaml +++ b/tests/assets/crs/experiments/tfjob-mnist-with-summaries.yaml @@ -59,7 +59,7 @@ spec: spec: containers: - name: tensorflow - image: docker.io/kubeflowkatib/tf-mnist-with-summaries:v0.17.0-rc.0 + image: docker.io/kubeflowkatib/tf-mnist-with-summaries:v0.17.0-rc.1 command: - "python" - "/opt/tf-mnist-with-summaries/mnist.py"