update experiment naming

Signed-off-by: Lenson <[email protected]>
vhive-serverless · Feb 27, 2025 · 3190451 · 3190451
1 parent 02ee380
commit 3190451
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/tools/multi_loader/common/utils.go b/tools/multi_loader/common/utils.go
@@ -111,7 +111,6 @@ func UpdateExperimentWithSweepIndices(experiment *types.LoaderExperiment, sweepO
 	paths := SplitPath(experiment.Config["OutputPathPrefix"].(string))
 	// update the last two paths with the sweep indices
 	paths[len(paths)-2] = paths[len(paths)-2] + experimentPostFix
-	paths[len(paths)-1] = paths[len(paths)-1] + experimentPostFix
 
 	experiment.Config["OutputPathPrefix"] = path.Join(paths...)
 

diff --git a/tools/multi_loader/common/utils_test.go b/tools/multi_loader/common/utils_test.go
@@ -78,7 +78,7 @@ func TestUpdateExperimentWithSweepIndices(t *testing.T) {
 	assert.Equal(t, "test_experiment"+expectedPostfix, experiment.Name)
 
 	// Check OutputPathPrefix
-	expectedOutputPathPrefix := path.Join("first", "second"+expectedPostfix, "third"+expectedPostfix)
+	expectedOutputPathPrefix := path.Join("first", "second"+expectedPostfix, "third")
 	assert.Equal(t, expectedOutputPathPrefix, experiment.Config["OutputPathPrefix"])
 
 	// Verify that the sweep options have been updated

diff --git a/tools/multi_loader/runner/multi_loader_runner_test.go b/tools/multi_loader/runner/multi_loader_runner_test.go
@@ -369,7 +369,7 @@ func validateGridSweepOutput(t *testing.T, output []types.LoaderExperiment) {
 			Name: "test1_ExperimentDuration_10_PostScript_1",
 			Config: map[string]interface{}{
 				"WarmupDuration":     10.0,
-				"OutputPathPrefix":   "data/out_ExperimentDuration_10_PostScript_1/test_output_ExperimentDuration_10_PostScript_1",
+				"OutputPathPrefix":   "data/out_ExperimentDuration_10_PostScript_1/test_output",
 				"ExperimentDuration": 10.0,
 			},
 			PostScript: "touch data/out/scripts/test_postscript_1",
@@ -378,7 +378,7 @@ func validateGridSweepOutput(t *testing.T, output []types.LoaderExperiment) {
 			Name: "test1_ExperimentDuration_10_PostScript_2",
 			Config: map[string]interface{}{
 				"WarmupDuration":     10.0,
-				"OutputPathPrefix":   "data/out_ExperimentDuration_10_PostScript_2/test_output_ExperimentDuration_10_PostScript_2",
+				"OutputPathPrefix":   "data/out_ExperimentDuration_10_PostScript_2/test_output",
 				"ExperimentDuration": 10.0,
 			},
 			PostScript: "touch data/out/scripts/test_postscript_2",
@@ -387,7 +387,7 @@ func validateGridSweepOutput(t *testing.T, output []types.LoaderExperiment) {
 			Name: "test1_ExperimentDuration_20_PostScript_1",
 			Config: map[string]interface{}{
 				"WarmupDuration":     10.0,
-				"OutputPathPrefix":   "data/out_ExperimentDuration_20_PostScript_1/test_output_ExperimentDuration_20_PostScript_1",
+				"OutputPathPrefix":   "data/out_ExperimentDuration_20_PostScript_1/test_output",
 				"ExperimentDuration": 20.0,
 			},
 			PostScript: "touch data/out/scripts/test_postscript_1",
@@ -396,7 +396,7 @@ func validateGridSweepOutput(t *testing.T, output []types.LoaderExperiment) {
 			Name: "test1_ExperimentDuration_20_PostScript_2",
 			Config: map[string]interface{}{
 				"WarmupDuration":     10.0,
-				"OutputPathPrefix":   "data/out_ExperimentDuration_20_PostScript_2/test_output_ExperimentDuration_20_PostScript_2",
+				"OutputPathPrefix":   "data/out_ExperimentDuration_20_PostScript_2/test_output",
 				"ExperimentDuration": 20.0,
 			},
 			PostScript: "touch data/out/scripts/test_postscript_2",
@@ -418,7 +418,7 @@ func validateLinearSweepOutput(t *testing.T, output []types.LoaderExperiment) {
 			Name: "test1_ExperimentDuration_10_PostScript_1",
 			Config: map[string]interface{}{
 				"WarmupDuration":     10.0,
-				"OutputPathPrefix":   "data/out_ExperimentDuration_10_PostScript_1/test_output_ExperimentDuration_10_PostScript_1",
+				"OutputPathPrefix":   "data/out_ExperimentDuration_10_PostScript_1/test_output",
 				"ExperimentDuration": 10.0,
 			},
 			PostScript: "touch data/out/scripts/test_postscript_1",
@@ -427,7 +427,7 @@ func validateLinearSweepOutput(t *testing.T, output []types.LoaderExperiment) {
 			Name: "test1_ExperimentDuration_20_PostScript_2",
 			Config: map[string]interface{}{
 				"WarmupDuration":     10.0,
-				"OutputPathPrefix":   "data/out_ExperimentDuration_20_PostScript_2/test_output_ExperimentDuration_20_PostScript_2",
+				"OutputPathPrefix":   "data/out_ExperimentDuration_20_PostScript_2/test_output",
 				"ExperimentDuration": 20.0,
 			},
 			PostScript: "touch data/out/scripts/test_postscript_2",