feat(disable-power-model): Clean unnecessary model disabling code

Metrics that have source "trained_power_model" can be disabled by
preventing them from being exported to prometheus. This PR removes
verbose code that disables models from being created when
DisablePowerModel is enabled as this is unnecessary.

Signed-off-by: Kaiyi <[email protected]>

Author: KaiyiLiu1234

pkg/metrics/metricfactory/metric_factory.go

@@ -41,13 +41,12 @@ func EnergyMetricsPromDesc(context string) (descriptions map[string]*prometheus.
 			if gpu := acc.GetActiveAcceleratorByType(config.GPU); gpu != nil {
 				source = gpu.Device().Name()
 			}
-		} else if strings.Contains(name, config.PLATFORM) && platform.IsSystemCollectionSupported() {
+		} else if platform.IsSystemCollectionSupported() && strings.Contains(name, config.PLATFORM) {
 			source = platform.GetSourceName()
-		} else if strings.Contains(allComponents, name) && components.IsSystemCollectionSupported() {
+		} else if components.IsSystemCollectionSupported() && strings.Contains(allComponents, name) {
 			// TODO: need to update condition when we have more type of energy metric such as network, disk.
 			source = components.GetSourceName()
 		}
-		// check if trained power model in use here
 		if !config.DisablePowerModels() || source != modeltypes.TrainedPowerModelSource {
 			descriptions[name] = energyMetricsPromDesc(context, name, source)
 		}

pkg/model/estimator/local/ratio.go

@@ -70,8 +70,7 @@ type RatioPowerModel struct {
 	processFeatureValues [][]float64 // metrics per process/process/pod
 	nodeFeatureValues    []float64   // node metrics
 	// xidx represents the features slide window position
-	xidx    int
-	enabled bool
+	xidx int
 }
 
 func (r *RatioPowerModel) getPowerByRatio(processIdx, resUsageFeature, nodePowerFeature int, numProcesses float64) uint64 {
@@ -238,12 +237,7 @@ func (r *RatioPowerModel) Train() error {
 
 // IsEnabled returns if ratio power model is active or not
 func (r *RatioPowerModel) IsEnabled() bool {
-	return r.enabled
-}
-
-// SetEnabled modifies the enabled flag to activate or deactivate the ratio power model
-func (r *RatioPowerModel) SetEnabled(enable bool) {
-	r.enabled = enable
+	return true
 }
 
 // GetModelType returns the model type

pkg/model/estimator/local/ratio_model_test.go

@@ -87,7 +87,6 @@ var _ = Describe("Test Ratio Unit", func() {
 				config.IdleEnergyInGPU,      // for idle GPU power consumption
 			},
 		}
-		model.SetEnabled(true)
 		model.ResetSampleIdx()
 		// Add process metrics
 		for _, c := range processStats {

pkg/model/estimator/local/regressor/regressor.go

@@ -406,11 +406,6 @@ func (r *Regressor) IsEnabled() bool {
 	return r.enabled
 }
 
-// SetEnabled modifies the enabled flag to activate or deactivate the regressor power model
-func (r *Regressor) SetEnabled(enable bool) {
-	r.enabled = enable
-}
-
 // GetModelType returns the model type
 func (r *Regressor) GetModelType() types.ModelType {
 	return types.Regressor

pkg/model/estimator/sidecar/estimate.go

@@ -262,11 +262,6 @@ func (c *EstimatorSidecar) IsEnabled() bool {
 	return c.enabled
 }
 
-// SetEnabled modifies the enabled flag to activate or deactivate the power model
-func (c *EstimatorSidecar) SetEnabled(enable bool) {
-	c.enabled = enable
-}
-
 // GetModelType returns the model type
 func (c *EstimatorSidecar) GetModelType() types.ModelType {
 	return types.EstimatorSidecar

pkg/model/model.go

@@ -52,8 +52,6 @@ type PowerModelInterface interface {
 	Train() error
 	// IsEnabled returns true if the power model was trained and is active
 	IsEnabled() bool
-	// SetEnabled modifies the enabled flag to activate or deactivate the power model
-	SetEnabled(enable bool)
 	// GetModelType returns if the model is Ratio, Regressor or EstimatorSidecar
 	GetModelType() types.ModelType
 	// GetProcessFeatureNamesList returns the list of process features that the model was configured to use
@@ -90,7 +88,6 @@ func createPowerModelEstimator(modelConfig *types.ModelConfig) (PowerModelInterf
 			ProcessFeatureNames: modelConfig.ProcessFeatureNames,
 			NodeFeatureNames:    modelConfig.NodeFeatureNames,
 		}
-		model.SetEnabled(true)
 		klog.V(3).Infof("Using Power Model Ratio")
 		return model, nil
 
@@ -192,17 +189,15 @@ func getModelConfigKey(modelItem, attribute string) string {
 // getPowerModelType return the model type for a given power source, such as platform or components power sources
 // The default power model type is Ratio
 func getPowerModelType(powerSourceTarget string) (modelType types.ModelType) {
-	if !config.DisablePowerModels() {
-		useEstimatorSidecarStr := config.ModelConfigValues(getModelConfigKey(powerSourceTarget, config.EstimatorEnabledKey))
-		if strings.EqualFold(useEstimatorSidecarStr, "true") {
-			modelType = types.EstimatorSidecar
-			return
-		}
-		useLocalRegressor := config.ModelConfigValues(getModelConfigKey(powerSourceTarget, config.LocalRegressorEnabledKey))
-		if strings.EqualFold(useLocalRegressor, "true") {
-			modelType = types.Regressor
-			return
-		}
+	useEstimatorSidecarStr := config.ModelConfigValues(getModelConfigKey(powerSourceTarget, config.EstimatorEnabledKey))
+	if strings.EqualFold(useEstimatorSidecarStr, "true") {
+		modelType = types.EstimatorSidecar
+		return
+	}
+	useLocalRegressor := config.ModelConfigValues(getModelConfigKey(powerSourceTarget, config.LocalRegressorEnabledKey))
+	if strings.EqualFold(useLocalRegressor, "true") {
+		modelType = types.Regressor
+		return
 	}
 	// set the default node power model as Regressor
 	if powerSourceTarget == config.NodePlatformPowerKey() || powerSourceTarget == config.NodeComponentsPowerKey() {

pkg/model/node_component_energy.go

@@ -49,7 +49,7 @@ func createNodeComponentPowerModelConfig(nodeFeatureNames []string) *types.Model
 // CreateNodeComponentPowerEstimatorModel only create a new power model estimator if node components power metrics are not available
 func CreateNodeComponentPowerEstimatorModel(nodeFeatureNames []string) {
 	var err error
-	if !components.IsSystemCollectionSupported() && !config.DisablePowerModels() {
+	if !components.IsSystemCollectionSupported() {
 		modelConfig := createNodeComponentPowerModelConfig(nodeFeatureNames)
 		// init func for NodeComponentPower
 		nodeComponentPowerModel, err = createPowerModelEstimator(modelConfig)
@@ -59,7 +59,7 @@ func CreateNodeComponentPowerEstimatorModel(nodeFeatureNames []string) {
 			klog.Infof("Failed to create %s Power Model to estimate Node Component Power: %v\n", modelConfig.ModelType.String()+"/"+modelConfig.ModelOutputType.String(), err)
 		}
 	} else {
-		klog.Infof("Skipping creation of Node Component Power Model since the system collection is supported or models are disabled")
+		klog.Infof("Skipping creation of Node Component Power Model since the system collection is supported")
 		return
 	}
 }

pkg/model/node_platform_energy.go

@@ -37,7 +37,7 @@ var nodePlatformPowerModel PowerModelInterface
 func CreateNodePlatformPoweEstimatorModel(nodeFeatureNames []string) {
 	systemMetaDataFeatureNames := node.MetadataFeatureNames()
 	systemMetaDataFeatureValues := node.MetadataFeatureValues()
-	if !platform.IsSystemCollectionSupported() && !config.DisablePowerModels() {
+	if !platform.IsSystemCollectionSupported() {
 		modelConfig := CreatePowerModelConfig(config.NodePlatformPowerKey())
 		if modelConfig.InitModelURL == "" {
 			modelConfig.InitModelFilepath = config.GetDefaultPowerModelURL(modelConfig.ModelOutputType.String(), types.PlatformEnergySource)
@@ -54,8 +54,6 @@ func CreateNodePlatformPoweEstimatorModel(nodeFeatureNames []string) {
 		} else {
 			klog.Infof("Failed to create %s Power Model to estimate Node Platform Power: %v\n", modelConfig.ModelType.String()+"/"+modelConfig.ModelOutputType.String(), err)
 		}
-	} else {
-		klog.Infof("Skipping creation of Node Platform Power Model since the system collection is supported or models are disabled")
 	}
 }
 

pkg/model/process_energy.go

@@ -25,9 +25,7 @@ import (
 	"github.com/sustainable-computing-io/kepler/pkg/model/types"
 	"github.com/sustainable-computing-io/kepler/pkg/node"
 	acc "github.com/sustainable-computing-io/kepler/pkg/sensors/accelerator"
-	"github.com/sustainable-computing-io/kepler/pkg/sensors/components"
 	"github.com/sustainable-computing-io/kepler/pkg/sensors/components/source"
-	"github.com/sustainable-computing-io/kepler/pkg/sensors/platform"
 	"github.com/sustainable-computing-io/kepler/pkg/utils"
 	"k8s.io/klog/v2"
 )
@@ -120,18 +118,11 @@ func CreateProcessPowerEstimatorModel(processFeatureNames []string) {
 		modelConfig := createProcessPowerModelConfig(k, processFeatureNames, v)
 		modelConfig.IsNodePowerModel = false
 		m, err := createPowerModelEstimator(modelConfig)
-		klog.V(5).Infof("Generating Process models now")
 		switch k {
 		case config.ProcessPlatformPowerKey():
 			processPlatformPowerModel = m
-			if !platform.IsSystemCollectionSupported() && config.DisablePowerModels() {
-				processPlatformPowerModel.SetEnabled(false)
-			}
 		case config.ProcessComponentsPowerKey():
 			processComponentPowerModel = m
-			if !components.IsSystemCollectionSupported() && config.DisablePowerModels() {
-				processComponentPowerModel.SetEnabled(false)
-			}
 		}
 		if err != nil {
 			klog.Infof("Failed to create %s Power Model to estimate %s Power: %v\n", modelConfig.ModelType.String()+"/"+modelConfig.ModelOutputType.String(), k, err)