Skip to content

Modification platforms : Batsim and Simu #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
demiray1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modification platforms : Batsim and Simu #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 25 additions & 29 deletions oar/kao/platform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,17 +135,8 @@ def __init__(self, env, resource_set, jobs):
self.waiting_jids = None
self.completed_jids = None

# Karma
def get_sum_accounting_window(self, *args):
print("get_sum_accounting_window NOT IMPLEMENTED")

def get_sum_accounting_by_project(self, *args):
print("get_sum_accounting_by_project NOT IMPLEMENTED")

def get_sum_accounting_by_user(self, *args):
print("get_sum_accounting_by_user NOT IMPLEMENTED")

def get_waiting_jobs(self, queue):

def get_waiting_jobs(self, queue, session=None):
print(" get_waiting_jobs_simu:", self.waiting_jids)
waiting_jobs = {}
waiting_jids_lst = []
Expand All @@ -168,12 +159,9 @@ def get_data_jobs(self, *args):

def get_scheduled_jobs(self, resource_set, job_security_time, now):
running_jobs = [self.jobs[jid] for jid in self.running_jids]
# for job in running_jobs:
# print "running_jobs", job.id, job.start_time, job.walltime,
# job.res_set
return running_jobs

def save_assigns(self, jobs, resource_set):
def save_assigns(self, session, jobs, resource_set):
print("save_assigns_simu")

for jid, job in jobs.items():
Expand All @@ -183,17 +171,29 @@ def save_assigns(self, jobs, resource_set):
job.res_set = ProcSet(*r_ids)
self.assigned_jobs = jobs

def resource_set(self):
def resource_set(self, session=None, config=None):
return self.res_set

def get_time(self):
return self.env.now

# Karma
def get_sum_accounting_window(self, *args):
print("get_sum_accounting_window NOT IMPLEMENTED")

def get_sum_accounting_by_project(self, *args):
print("get_sum_accounting_by_project NOT IMPLEMENTED")

def get_sum_accounting_by_user(self, *args):
print("get_sum_accounting_by_user NOT IMPLEMENTED")

class BatsimPlatform(Platform):


class PyBatsimPlatform(Platform):
""" Custom OAR platform adapted for BatSim + DB mode
Bridge between OAR DB jobs (db_jid) and in-memory JobSimu objects (jid) and copie scheduling results from DB → JobSimu """
def __init__(self, env, jobs, db_jid2s_jid):
self.env = env
self.assigned_jobs = {}
self.jobs = jobs
self.db_jid2s_jid = db_jid2s_jid
self.running_jids = None
Expand All @@ -203,22 +203,18 @@ def __init__(self, env, jobs, db_jid2s_jid):
def get_time(self):
return self.env.now

def save_assigns(self, jobs, resource_set):
print("save assigns for BatsimPlatform........................")
# assigned_jobs = {}
for jid, job in jobs.items():
sid = self.db_jid2s_jid[jid]
def save_assigns(self, session, jobs, resource_set):
""" Copy scheduling results from OAR DB jobs into JobSimu objects and save assignments in the DB"""

for db_jid, job in jobs.items():
sid = self.db_jid2s_jid[db_jid]
jobsimu = self.jobs[sid]
jres_set = job.res_set
r_ids = [resource_set.rid_o2i[roid] for roid in list(jres_set)]
jobsimu.res_set = ProcSet(*r_ids)
print(
"save assign jid, sid, res_set: ", jid, " ", sid, " ", jobsimu.res_set
)
jobsimu.start_time = job.start_time
jobsimu.walltime = job.walltime
# assigned_jobs[sid] = jobsimu


# self.assigned_jobs = assigned_jobs
return save_assigns(session, jobs, resource_set)

return save_assigns(jobs, resource_set)