add FormatMemToMB

Author: 1daidai1

internal/cacct/cacct.go

@@ -407,13 +407,12 @@ func ProcessTimeLimit(task *protos.TaskInfo) string {
 
 // ReqMemPerNode (M)
 func ProcessReqMemPerNode(task *protos.TaskInfo) string {
-	return strconv.FormatUint(task.ReqResView.AllocatableRes.MemoryLimitBytes/(1024*1024), 10)
+	return util.FormatMemToMB(task.ReqResView.AllocatableRes.MemoryLimitBytes)
 }
 
 // AllocMemPerNode (m)
 func ProcessAllocMemPerNode(task *protos.TaskInfo) string {	
-   return strconv.FormatUint(
-	task.AllocatedResView.AllocatableRes.MemoryLimitBytes/(1024*1024), 10)
+   return util.FormatMemToMB(task.AllocatedResView.AllocatableRes.MemoryLimitBytes)
 }
 
 // NodeNum (N)

internal/ceff/ceff.go

@@ -242,7 +242,7 @@ func CalculateTotalUsagePtr(records []*ResourceUsageRecord, targetJobID int64) (
 		}
 	}
 	totalCPUUseS = float64(totalCPUUseNs) / 1e9
-	totalMemMb = float64(totalMemoryByte) / (1024 * 1024)
+	totalMemMb = util.FormatMemToMB(totalMemoryByte)
 
 	return totalCPUUseS, totalMemMb, nil
 }
@@ -333,9 +333,6 @@ func PrintTaskInfo(taskInfo *protos.TaskInfo, records []*ResourceUsageRecord) er
 		fmt.Printf("JobState: %v (exit code %d)\n", taskInfo.Status.String(), taskInfo.ExitCode)
 	}
 
-	if taskInfo.NodeNum == 0 {
-		return fmt.Errorf("the number of nodes is empty")
-	}
 	cpuTotal := taskInfo.AllocatedResView.AllocatableRes.CpuCoreLimit * float64(taskInfo.NodeNum)
 	if math.Abs(cpuTotal-1) < 1e-9 {
 		fmt.Printf("Cores: %.2f\n", cpuTotal)
@@ -364,7 +361,7 @@ func PrintTaskInfo(taskInfo *protos.TaskInfo, records []*ResourceUsageRecord) er
 
 	// Calculate mem efficiency
 	memEfficiency := 0.0
-	mallocMemMbPerNode := float64(taskInfo.AllocatedResView.AllocatableRes.MemoryLimitBytes) / (1024 * 1024)
+	mallocMemMbPerNode := util.FormatMemToMB(taskInfo.AllocatedResView.AllocatableRes.MemoryLimitBytes)
 	totalMallocMemMb := mallocMemMbPerNode * float64(taskInfo.NodeNum)
 	if totalMallocMemMb != 0 {
 		memEfficiency = totalMemMb / totalMallocMemMb * 100
@@ -433,7 +430,7 @@ func PrintTaskInfoInJson(taskInfo *protos.TaskInfo, records []*ResourceUsageReco
 
 	// Calculate mem efficiency
 	memEfficiency := 0.0
-	mallocMemMbPerNode := float64(taskInfo.AllocatedResView.AllocatableRes.MemoryLimitBytes) / (1024 * 1024)
+	mallocMemMbPerNode := util.FormatMemToMB(taskInfo.AllocatedResView.AllocatableRes.MemoryLimitBytes)
 	totalMallocMemMb := mallocMemMbPerNode * float64(taskInfo.NodeNum)
 	if totalMallocMemMb != 0 {
 		memEfficiency = totalMemMb / totalMallocMemMb * 100

internal/cqueue/cqueue.go

@@ -348,13 +348,12 @@ func ProcessNodeList(task *protos.TaskInfo) string {
 
 // 'm' group
 func ProcessAllocMemPerNode(task *protos.TaskInfo) string {
-   return strconv.FormatUint(
-	task.AllocatedResView.AllocatableRes.MemoryLimitBytes / (1024*1024), 10)
+   return util.FormatMemToMB(task.AllocatedResView.AllocatableRes.MemoryLimitBytes)
 }
 
 // 'M' group
 func ProcessReqMemPerNode(task *protos.TaskInfo) string {
-	return strconv.FormatUint(task.ReqResView.AllocatableRes.MemoryLimitBytes/(1024*1024), 10)
+	return util.FormatMemToMB(task.ReqResView.AllocatableRes.MemoryLimitBytes)
 }
 
 // 'n' group