From 9c9796e637612a5d3b478ccc28d49344e39e0878 Mon Sep 17 00:00:00 2001 From: Sunyanan Choochotkaew Date: Fri, 26 Jul 2024 15:10:22 +0900 Subject: [PATCH] change default pipeline name to std_v0.7.11 Signed-off-by: Sunyanan Choochotkaew --- .github/workflows/collect-train.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/push-to-main.yml | 2 +- .github/workflows/train.yml | 2 +- hack/aws_helper.sh | 2 +- manifests/base/patch/patch-estimator-sidecar.yaml | 2 +- manifests/test/patch-estimator-sidecar.yaml | 4 ++-- model_training/tekton/examples/single-train/dyn-power.yaml | 2 +- src/util/loader.py | 7 ++++--- tests/estimator_model_request_test.py | 2 +- 10 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/collect-train.yml b/.github/workflows/collect-train.yml index 9365effa..e9e773d0 100644 --- a/.github/workflows/collect-train.yml +++ b/.github/workflows/collect-train.yml @@ -28,7 +28,7 @@ jobs: instance_type: [i3.metal] uses: ./.github/workflows/train-model.yml with: - pipeline_name: std_v0.7 + pipeline_name: std_v0.7.11 instance_type: ${{ matrix.instance_type }} ami_id: 'ami-0e4d0bb9670ea8db0' github_repo: ${{ github.repository }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a73df246..4993be14 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -196,7 +196,7 @@ jobs: docker_secret: ${{ needs.check-secret.outputs.docker-secret }} image_repo: ${{ vars.IMAGE_REPO || 'docker.io/library' }} image_tag: ${{ needs.check-branch.outputs.tag }} - pipeline_name: std_v0.7 + pipeline_name: std_v0.7.11 integration-test-internal-only: needs: [check-secret, check-branch, check-change, base-image] diff --git a/.github/workflows/push-to-main.yml b/.github/workflows/push-to-main.yml index 73f44bbd..b6bae980 100644 --- a/.github/workflows/push-to-main.yml +++ b/.github/workflows/push-to-main.yml @@ -78,7 +78,7 @@ jobs: instance_type: [i3.metal] uses: ./.github/workflows/train-model.yml with: - pipeline_name: std_v0.7 + pipeline_name: std_v0.7.11 instance_type: ${{ matrix.instance_type }} ami_id: 'ami-0e4d0bb9670ea8db0' github_repo: ${{ github.repository }} diff --git a/.github/workflows/train.yml b/.github/workflows/train.yml index 26fa223e..9d89323d 100644 --- a/.github/workflows/train.yml +++ b/.github/workflows/train.yml @@ -31,7 +31,7 @@ jobs: instance_type: [i3.metal] uses: ./.github/workflows/train-model.yml with: - pipeline_name: std_v0.7 + pipeline_name: std_v0.7.11 instance_type: ${{ matrix.instance_type }} ami_id: 'ami-0e4d0bb9670ea8db0' github_repo: ${{ github.repository }} diff --git a/hack/aws_helper.sh b/hack/aws_helper.sh index ddcd5bb9..b9075428 100755 --- a/hack/aws_helper.sh +++ b/hack/aws_helper.sh @@ -28,7 +28,7 @@ HOST_MNT_PATH="${HOST_MNT_PATH:-/mnt}" MACHINE_SPEC_DIR="machine_spec" MACHINE_ID="" -PIPELINE_NAME="${PIPELINE_NAME:-std_v0.7}" +PIPELINE_NAME="${PIPELINE_NAME:-std_v0.7.11}" POWER_SOURCE="${POWER_SOURCE:-rapl-sysfs}" MODEL_TYPE="${MODEL_TYPE:-AbsPower}" FEATURE_NAME="${FEATURE_NAME:-BPFOnly}" diff --git a/manifests/base/patch/patch-estimator-sidecar.yaml b/manifests/base/patch/patch-estimator-sidecar.yaml index 4eda1aba..cf0f819e 100644 --- a/manifests/base/patch/patch-estimator-sidecar.yaml +++ b/manifests/base/patch/patch-estimator-sidecar.yaml @@ -6,7 +6,7 @@ metadata: data: MODEL_CONFIG: | NODE_COMPONENTS_ESTIMATOR=true - NODE_COMPONENTS_INIT_URL=https://raw.githubusercontent.com/sustainable-computing-io/kepler-model-db/main/models/v0.7/ec2/intel_rapl/AbsPower/BPFOnly/GradientBoostingRegressorTrainer_0.zip + NODE_COMPONENTS_INIT_URL=https://raw.githubusercontent.com/sustainable-computing-io/kepler-model-db/main/models/v0.7/ec2-0.7.11/rapl-sysfs/AbsPower/BPFOnly/GradientBoostingRegressorTrainer_0.zip NODE_TOTAL_ESTIMATOR=true NODE_TOTAL_INIT_URL=https://raw.githubusercontent.com/sustainable-computing-io/kepler-model-db/main/models/v0.7/specpower/acpi/AbsPower/BPFOnly/GradientBoostingRegressorTrainer_0.zip --- diff --git a/manifests/test/patch-estimator-sidecar.yaml b/manifests/test/patch-estimator-sidecar.yaml index 6edb9b24..0f0dad2a 100644 --- a/manifests/test/patch-estimator-sidecar.yaml +++ b/manifests/test/patch-estimator-sidecar.yaml @@ -1,6 +1,6 @@ data: MODEL_CONFIG: | NODE_COMPONENTS_ESTIMATOR=true - NODE_COMPONENTS_INIT_URL=http://model-db.kepler.svc.cluster.local:8110/std_v0.7/intel_rapl/AbsPower/BPFOnly/GradientBoostingRegressorTrainer_0.zip + NODE_COMPONENTS_INIT_URL=http://model-db.kepler.svc.cluster.local:8110/std_v0.7.11/rapl-sysfs/AbsPower/BPFOnly/GradientBoostingRegressorTrainer_0.zip NODE_TOTAL_ESTIMATOR=true - NODE_TOTAL_INIT_URL=http://model-db.kepler.svc.cluster.local:8110/std_v0.7/acpi/AbsPower/BPFOnly/GradientBoostingRegressorTrainer_0.zip \ No newline at end of file + NODE_TOTAL_INIT_URL=http://model-db.kepler.svc.cluster.local:8110/std_v0.7.11/acpi/AbsPower/BPFOnly/GradientBoostingRegressorTrainer_0.zip \ No newline at end of file diff --git a/model_training/tekton/examples/single-train/dyn-power.yaml b/model_training/tekton/examples/single-train/dyn-power.yaml index 7765bdbf..e42951d3 100644 --- a/model_training/tekton/examples/single-train/dyn-power.yaml +++ b/model_training/tekton/examples/single-train/dyn-power.yaml @@ -1,5 +1,5 @@ # example-dyn-train-pipeline: -# running pipelines with all default value to train DynPower model (intel_rapl, BPFOnly) +# running pipelines with all default value to train DynPower model (rapl-sysfs, BPFOnly) apiVersion: tekton.dev/v1 kind: PipelineRun metadata: diff --git a/src/util/loader.py b/src/util/loader.py index e0eda811..821a29f2 100644 --- a/src/util/loader.py +++ b/src/util/loader.py @@ -9,7 +9,8 @@ import requests import codecs -version = 0.7 +major_version = "0.7" +version = "0.7.11" FILTER_ITEM_DELIMIT = ';' VALUE_DELIMIT = ':' @@ -24,10 +25,10 @@ ## default_train_output_pipeline: a default pipeline name which is output from the training pipeline default_train_output_pipeline = "std_v{}".format(version) default_pipelines = { - "rapl-sysfs": "ec2-0.7.11", + "rapl-sysfs": "ec2-{}".format(version), "acpi": "specpower" } -base_model_url = "https://raw.githubusercontent.com/sustainable-computing-io/kepler-model-db/main/models/v{}".format(version) +base_model_url = "https://raw.githubusercontent.com/sustainable-computing-io/kepler-model-db/main/models/v{}".format(major_version) def get_pipeline_url(model_topurl, pipeline_name): file_ext = ".zip" return os.path.join(model_topurl, pipeline_name + file_ext) diff --git a/tests/estimator_model_request_test.py b/tests/estimator_model_request_test.py index e3c2e017..34d2e454 100644 --- a/tests/estimator_model_request_test.py +++ b/tests/estimator_model_request_test.py @@ -21,7 +21,7 @@ os.environ['MODEL_SERVER_URL'] = 'http://localhost:8100' model_topurl = 'http://localhost:{}'.format(file_server_port) os.environ['MODEL_TOPURL'] = model_topurl -os.environ['INITIAL_PIPELINE_URL'] = os.path.join(model_topurl, "std_v0.7") +os.environ['INITIAL_PIPELINE_URL'] = os.path.join(model_topurl, "std_v0.7.11") server_path = os.path.join(os.path.dirname(__file__), '../src') util_path = os.path.join(os.path.dirname(__file__), '../src/util')