From 0688ab42395a641cf36e4d548e478891e1dde174 Mon Sep 17 00:00:00 2001
From: Newnius <newnius.cn@gmail.com>
Date: Thu, 30 Apr 2020 14:48:58 +0800
Subject: [PATCH] update

---
 src/optimizer.go      | 3 +++
 src/scheduler_fair.go | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/optimizer.go b/src/optimizer.go
index d640fd6..c29824b 100644
--- a/src/optimizer.go
+++ b/src/optimizer.go
@@ -89,6 +89,8 @@ func (optimizer *Optimizer) feed(job string, utils []int) {
 }
 
 func (optimizer *Optimizer) predictUtilGPU(job string) (int, bool) {
+	log.Info("predictUtilGPU, ", job)
+	return 49, true
 	if _, err := optimizer.jobUtilsGPU[job]; err {
 		return 100, false
 	}
@@ -99,6 +101,7 @@ func (optimizer *Optimizer) predictUtilGPU(job string) (int, bool) {
 }
 
 func (optimizer *Optimizer) predictTime(job string) (OptimizerJobExecutionTime, bool) {
+	log.Info("predictTime,", job)
 	if _, err := optimizer.predicts[job]; err {
 		return OptimizerJobExecutionTime{}, false
 	}
diff --git a/src/scheduler_fair.go b/src/scheduler_fair.go
index a994171..35a0330 100644
--- a/src/scheduler_fair.go
+++ b/src/scheduler_fair.go
@@ -28,6 +28,8 @@ type SchedulerFair struct {
 	resourceAllocationsMu sync.Mutex
 	enabled               bool
 	parallelism           int
+	enableShare           bool
+	enablePreSchedule     bool
 }
 
 type FairJobSorter []Job
@@ -51,6 +53,8 @@ func (scheduler *SchedulerFair) Start() {
 	scheduler.resourceAllocations = map[string]*ResourceCount{}
 	scheduler.enabled = true
 	scheduler.schedulingJobsCnt = 0
+	scheduler.enableShare = true
+	scheduler.enablePreSchedule = true
 
 	scheduler.parallelism = 1
 
@@ -213,10 +217,9 @@ func (scheduler *SchedulerFair) AcquireResource(job Job, task Task) NodeStatus {
 	log.Info(candidates)
 
 	/* second round, find sharable gpu */
-	if len(candidates) == 0 {
+	if len(candidates) == 0 && scheduler.enableShare {
 		// check sharable
 		allocationType = 2
-		log.Info("dasdsa")
 		if util, valid := InstanceOfOptimizer().predictUtilGPU(job.Name); valid {
 
 			for i := 0; i < pool.poolsCount; i++ {