Skip to content

Commit 6690a4c

Browse files
author
Sunil Thaha
authored
Merge pull request #325 from sunya-ch/bump-kepler-0.7.11
bump kepler version 0.7.11
2 parents 57e75ef + 71452b5 commit 6690a4c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+85
-62
lines changed

.github/workflows/pr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
- '**/*.md'
1919

2020
env:
21-
TAG: "v0.7.7"
21+
TAG: "v0.7.11"
2222

2323
jobs:
2424
check-branch:
@@ -207,7 +207,7 @@ jobs:
207207
docker_secret: ${{ needs.check-secret.outputs.docker-secret }}
208208
image_repo: ${{ vars.IMAGE_REPO || 'docker.io/library' }}
209209
image_tag: ${{ needs.check-branch.outputs.tag }}
210-
kepler_tag: release-0.7.7
210+
kepler_tag: release-0.7.11
211211
additional_opts: " TEST"
212212

213213
integration-test-with-exporter:
@@ -219,7 +219,7 @@ jobs:
219219
docker_secret: ${{ needs.check-secret.outputs.docker-secret }}
220220
image_repo: ${{ vars.IMAGE_REPO || 'docker.io/library' }}
221221
image_tag: ${{ needs.check-branch.outputs.tag }}
222-
kepler_tag: release-0.7.7
222+
kepler_tag: release-0.7.11
223223
additional_opts: ""
224224

225225
integration-test-with-exporter-and-db:
@@ -231,7 +231,7 @@ jobs:
231231
docker_secret: ${{ needs.check-secret.outputs.docker-secret }}
232232
image_repo: ${{ vars.IMAGE_REPO || 'docker.io/library' }}
233233
image_tag: ${{ needs.check-branch.outputs.tag }}
234-
kepler_tag: release-0.7.7
234+
kepler_tag: release-0.7.11
235235
additional_opts: " DB"
236236

237237
verify_model_training_script:

.github/workflows/tekton-test.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
- name: MACHINE_ID
155155
value: test
156156
- name: ENERGY_SOURCE
157-
value: intel_rapl
157+
value: trained_power_model
158158
- name: FEATURE_GROUP
159159
value: BPFOnly
160160
- name: TRAINERS
@@ -190,6 +190,8 @@ jobs:
190190
value: ${{ inputs.trainers }}
191191
- name: DYN_TRAINERS
192192
value: ${{ inputs.trainers }}
193+
- name: ENERGY_SOURCE
194+
value: trained_power_model
193195
pipelineRef:
194196
name: complete-retrain-pipeline
195197
EOF

.github/workflows/train-model.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ on:
4545
description: 'Target energy source'
4646
required: false
4747
type: string
48-
default: intel_rapl
48+
default: rapl-sysfs
4949
feature_group:
5050
description: 'Target feature group'
5151
required: false

cmd/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Use kepler model server function as a standalone docker container.
4040
├── profile # if --profile is providied
4141
│   ├── acpi.json
4242
│   └── rapl.json
43-
├── <energy_source> # provided by --energy-source (default: intel_rapl)
43+
├── <energy_source> # provided by --energy-source (default: rapl-sysfs)
4444
│   ├── <model_type> # AbsPower or DynPower
4545
│   │   ├── <feature_group> # e.g., BPFOnly
4646
│   │   │   ├── <model_name>

cmd/cmd_plot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ def _plot_models(models, cpu_ms_max, energy_source, output_folder, name, max_plo
206206
main_feature_col = BPF_FEATURES[0]
207207
predicted_col = {
208208
"acpi": "default_platform_power",
209-
"intel_rapl": "default_package_power"
209+
"rapl-sysfs": "default_package_power"
210210
}
211211

212212
num_bins = len(cpu_ms_max)//cpu_time_bin_num + 1

cmd/cmd_util.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def summary_validation(validate_df):
6161
"bpf": "kepler_container_bpf_cpu_time_ms_total",
6262
}
6363
metric_to_validate_power = {
64-
"intel_rapl": "kepler_node_package_joules_total",
64+
"rapl-sysfs": "kepler_node_package_joules_total",
6565
"acpi": "kepler_node_platform_joules_total"
6666
}
6767
for metric, query in metric_to_validate_pod.items():
@@ -101,6 +101,7 @@ def get_validate_df(data_path, benchmark_filename, query_response):
101101
items = []
102102
query_results = prom_responses_to_results(query_response)
103103
container_queries = [query for query in query_results.keys() if "container" in query]
104+
print("Container Queries: ", container_queries)
104105
status_data = load_json(data_path, benchmark_filename)
105106
if status_data is None or status_data.get("status", None) == None:
106107
# select all with keyword
@@ -166,6 +167,7 @@ def get_validate_df(data_path, benchmark_filename, query_response):
166167
item["total"] = filtered_df[query].max()
167168
items += [item]
168169
energy_queries = [query for query in query_results.keys() if "_joules" in query]
170+
print("Energy Queries: ", container_queries)
169171
for energy_source, energy_components in PowerSourceMap.items():
170172
for component in energy_components:
171173
query = energy_component_to_query(component)
@@ -217,6 +219,8 @@ def get_validate_df(data_path, benchmark_filename, query_response):
217219
validate_df = pd.DataFrame(items)
218220
if not validate_df.empty:
219221
print(validate_df.groupby(["scenarioID", "query"]).sum()[["count", ">0"]])
222+
else:
223+
print("Validate dataframe is empty.")
220224
return validate_df
221225

222226
def check_ot_fg(args, valid_fg):

cmd/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@ def plot_scenario(args):
879879
parser.add_argument("--target-hints", type=str, help="Specify dynamic workload container name hints (used by TrainIsolator)")
880880
parser.add_argument("--bg-hints", type=str, help="Specify background workload container name hints (used by TrainIsolator)")
881881
parser.add_argument("--abs-pipeline-name", type=str, help="Specify AbsPower model pipeline (used by TrainIsolator)", default="")
882-
parser.add_argument("-e", "--energy-source", type=str, help="Specify energy source.", default="intel_rapl")
882+
parser.add_argument("-e", "--energy-source", type=str, help="Specify energy source.", default="rapl-sysfs")
883883
parser.add_argument("--abs-trainers", type=str, help="Specify trainer names for train command (use comma(,) as delimiter).", default="default")
884884
parser.add_argument("--dyn-trainers", type=str, help="Specify trainer names for train command (use comma(,) as delimiter).", default="default")
885885
parser.add_argument("--trainers", type=str, help="Specify trainer names for train_from_data command (use comma(,) as delimiter).", default="XgboostFitTrainer")

hack/aws_helper.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ MACHINE_SPEC_DIR="machine_spec"
2929
MACHINE_ID=""
3030

3131
PIPELINE_NAME="${PIPELINE_NAME:-std_v0.7}"
32-
POWER_SOURCE="${POWER_SOURCE:-intel_rapl}"
32+
POWER_SOURCE="${POWER_SOURCE:-rapl-sysfs}"
3333
MODEL_TYPE="${MODEL_TYPE:-AbsPower}"
3434
FEATURE_NAME="${FEATURE_NAME:-BPFOnly}"
3535
TRAINER_NAME="${TRAINER_NAME:-XgboostFitTrainer_0}"

manifests/kepler/patch/patch-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ spec:
1717
containers:
1818
- name: kepler-exporter
1919
imagePullPolicy: IfNotPresent
20-
image: quay.io/sustainable_computing_io/kepler:release-0.7.7
20+
image: quay.io/sustainable_computing_io/kepler:release-0.7.11

model_training/deployment/kepler.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,7 @@ spec:
190190
spec:
191191
containers:
192192
- args:
193-
- /usr/bin/kepler -v=1 -kernel-source-dir=/usr/share/kepler/kernel_sources
194-
-redfish-cred-file-path=/etc/redfish/redfish.csv
193+
- /usr/bin/kepler -v=1 -redfish-cred-file-path=/etc/redfish/redfish.csv
195194
command:
196195
- /bin/sh
197196
- -c
@@ -204,7 +203,7 @@ spec:
204203
valueFrom:
205204
fieldRef:
206205
fieldPath: spec.nodeName
207-
image: quay.io/sustainable_computing_io/kepler:release-0.7.7
206+
image: quay.io/sustainable_computing_io/kepler:release-0.7.11
208207
imagePullPolicy: IfNotPresent
209208
livenessProbe:
210209
failureThreshold: 5

0 commit comments

Comments
 (0)