From 28609a33722a4ce02e8e7d511bd411d4adea0176 Mon Sep 17 00:00:00 2001
From: Christoph Kluge <christoph.kluge@fau.de>
Date: Thu, 24 Aug 2023 12:56:35 +0200
Subject: [PATCH] adapt core timeweight to sqlite name logic

---
 internal/graph/util.go | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/internal/graph/util.go b/internal/graph/util.go
index b3a0080..b61bcc7 100644
--- a/internal/graph/util.go
+++ b/internal/graph/util.go
@@ -13,9 +13,9 @@ import (
 	"github.com/99designs/gqlgen/graphql"
 	"github.com/ClusterCockpit/cc-backend/internal/graph/model"
 	"github.com/ClusterCockpit/cc-backend/internal/metricdata"
-	"github.com/ClusterCockpit/cc-backend/pkg/archive"
 	"github.com/ClusterCockpit/cc-backend/pkg/log"
 	"github.com/ClusterCockpit/cc-backend/pkg/schema"
+	// "github.com/ClusterCockpit/cc-backend/pkg/archive"
 )
 
 const MAX_JOBS_FOR_ANALYSIS = 500
@@ -130,7 +130,7 @@ func (r *queryResolver) jobsFootprints(ctx context.Context, filter []*model.JobF
 			timeweights.AccHours = append(timeweights.AccHours, schema.Float(1.0))
 		}
 		if job.NumHWThreads > 0 {
-			timeweights.CoreHours = append(timeweights.CoreHours, schema.Float(float64(job.Duration)/60.0*float64(numCoresForJob(job))))
+			timeweights.CoreHours = append(timeweights.CoreHours, schema.Float(float64(job.Duration)/60.0*float64(job.NumHWThreads))) // SQLite HWThreads == Cores; numCoresForJob(job)
 		} else {
 			timeweights.CoreHours = append(timeweights.CoreHours, schema.Float(1.0))
 		}
@@ -150,28 +150,28 @@ func (r *queryResolver) jobsFootprints(ctx context.Context, filter []*model.JobF
 	}, nil
 }
 
-func numCoresForJob(job *schema.Job) (numCores int) {
+// func numCoresForJob(job *schema.Job) (numCores int) {
 
-	subcluster, scerr := archive.GetSubCluster(job.Cluster, job.SubCluster)
-	if scerr != nil {
-		return 1
-	}
+// 	subcluster, scerr := archive.GetSubCluster(job.Cluster, job.SubCluster)
+// 	if scerr != nil {
+// 		return 1
+// 	}
 
-	totalJobCores := 0
-	topology := subcluster.Topology
+// 	totalJobCores := 0
+// 	topology := subcluster.Topology
 
-	for _, host := range job.Resources {
-		hwthreads := host.HWThreads
-		if hwthreads == nil {
-			hwthreads = topology.Node
-		}
+// 	for _, host := range job.Resources {
+// 		hwthreads := host.HWThreads
+// 		if hwthreads == nil {
+// 			hwthreads = topology.Node
+// 		}
 
-		hostCores, _ := topology.GetCoresFromHWThreads(hwthreads)
-		totalJobCores += len(hostCores)
-	}
+// 		hostCores, _ := topology.GetCoresFromHWThreads(hwthreads)
+// 		totalJobCores += len(hostCores)
+// 	}
 
-	return totalJobCores
-}
+// 	return totalJobCores
+// }
 
 func requireField(ctx context.Context, name string) bool {
 	fields := graphql.CollectAllFields(ctx)