From 4b7106878f56dd2f0f766e3e727adaa0bf40f4c9 Mon Sep 17 00:00:00 2001 From: Maxime Chéramy Date: Fri, 22 May 2015 11:17:10 +0200 Subject: [PATCH] Fix import path of some schedulers. --- simso/schedulers/Fixed_PEDF.py | 2 +- simso/schedulers/LB_P_EDF.py | 2 +- simso/schedulers/P_EDF.py | 2 +- simso/schedulers/P_EDF2.py | 2 +- simso/schedulers/P_EDF_WF.py | 2 +- simso/schedulers/P_RM.py | 2 +- simso/schedulers/RUN.py | 4 ++-- simso/schedulers/WC_RUN.py | 2 +- simso/schedulers/WC_U_EDF.py | 2 +- simso/schedulers/__init__.py | 0 10 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 simso/schedulers/__init__.py diff --git a/simso/schedulers/Fixed_PEDF.py b/simso/schedulers/Fixed_PEDF.py index a896531..11223f0 100644 --- a/simso/schedulers/Fixed_PEDF.py +++ b/simso/schedulers/Fixed_PEDF.py @@ -2,7 +2,7 @@ # coding=utf-8 from simso.core.Scheduler import SchedulerInfo -from EDF_mono import EDF_mono +from simso.schedulers.EDF_mono import EDF_mono from simso.utils import PartitionedScheduler diff --git a/simso/schedulers/LB_P_EDF.py b/simso/schedulers/LB_P_EDF.py index 171751b..ffc9152 100644 --- a/simso/schedulers/LB_P_EDF.py +++ b/simso/schedulers/LB_P_EDF.py @@ -3,7 +3,7 @@ Partitionned EDF using PartitionedScheduler. Try to load balance the tasks among the processors. """ from simso.core.Scheduler import SchedulerInfo -from EDF_mono import EDF_mono +from simso.schedulers.EDF_mono import EDF_mono from simso.utils import PartitionedScheduler diff --git a/simso/schedulers/P_EDF.py b/simso/schedulers/P_EDF.py index 91447bb..3ef6068 100644 --- a/simso/schedulers/P_EDF.py +++ b/simso/schedulers/P_EDF.py @@ -2,7 +2,7 @@ Partitionned EDF using PartitionedScheduler. """ from simso.core.Scheduler import SchedulerInfo -from EDF_mono import EDF_mono +from simso.schedulers.EDF_mono import EDF_mono from simso.utils import PartitionedScheduler from simso.utils.PartitionedScheduler import decreasing_first_fit diff --git a/simso/schedulers/P_EDF2.py b/simso/schedulers/P_EDF2.py index c7cf5d1..35da3f1 100644 --- a/simso/schedulers/P_EDF2.py +++ b/simso/schedulers/P_EDF2.py @@ -5,7 +5,7 @@ Use EDF_mono. """ from simso.core import Scheduler from simso.core.Scheduler import SchedulerInfo -from EDF_mono import EDF_mono +from simso.schedulers.EDF_mono import EDF_mono class P_EDF2(Scheduler): diff --git a/simso/schedulers/P_EDF_WF.py b/simso/schedulers/P_EDF_WF.py index 8c0d3f6..c9112a6 100644 --- a/simso/schedulers/P_EDF_WF.py +++ b/simso/schedulers/P_EDF_WF.py @@ -2,7 +2,7 @@ Partitionned EDF using PartitionedScheduler. """ from simso.core.Scheduler import SchedulerInfo -from EDF_mono import EDF_mono +from simso.schedulers.EDF_mono import EDF_mono from simso.utils import PartitionedScheduler from simso.utils.PartitionedScheduler import decreasing_worst_fit diff --git a/simso/schedulers/P_RM.py b/simso/schedulers/P_RM.py index f6027f4..1e1e1ca 100644 --- a/simso/schedulers/P_RM.py +++ b/simso/schedulers/P_RM.py @@ -2,7 +2,7 @@ Partitionned EDF using PartitionedScheduler. """ from simso.core.Scheduler import SchedulerInfo -from RM_mono import RM_mono +from simso.schedulers.RM_mono import RM_mono from simso.utils import PartitionedScheduler diff --git a/simso/schedulers/RUN.py b/simso/schedulers/RUN.py index 8e86131..fb17e39 100644 --- a/simso/schedulers/RUN.py +++ b/simso/schedulers/RUN.py @@ -8,8 +8,8 @@ tasks with implicit deadlines. """ from simso.core import Scheduler, Timer -from RUNServer import EDFServer, TaskServer, DualServer, select_jobs, \ - add_job, get_child_tasks +from simso.schedulers.RUNServer import EDFServer, TaskServer, DualServer, \ + select_jobs, add_job, get_child_tasks class RUN(Scheduler): diff --git a/simso/schedulers/WC_RUN.py b/simso/schedulers/WC_RUN.py index 1584d23..4fe2ac2 100644 --- a/simso/schedulers/WC_RUN.py +++ b/simso/schedulers/WC_RUN.py @@ -2,7 +2,7 @@ Work-Conserving version of U-EDF. """ -from RUN import RUN +from simso.schedulers.RUN import RUN class WC_RUN(RUN): diff --git a/simso/schedulers/WC_U_EDF.py b/simso/schedulers/WC_U_EDF.py index 879066d..abe63e4 100644 --- a/simso/schedulers/WC_U_EDF.py +++ b/simso/schedulers/WC_U_EDF.py @@ -2,7 +2,7 @@ Work-Conserving version of U-EDF. """ -from U_EDF import U_EDF +from simso.schedulers.U_EDF import U_EDF class WC_U_EDF(U_EDF): diff --git a/simso/schedulers/__init__.py b/simso/schedulers/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/simso/schedulers/__init__.py -- libgit2 0.26.0