Skip to content

Commit

Permalink
separate master modules
Browse files Browse the repository at this point in the history
sbourdeauducq committed Jan 14, 2015
1 parent c0bdc92 commit 070788a
Showing 6 changed files with 4 additions and 4 deletions.
Empty file added artiq/master/__init__.py
Empty file.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
from time import time

from artiq.management.sync_struct import Notifier
from artiq.management.worker import Worker
from artiq.master.worker import Worker


class Scheduler:
2 changes: 1 addition & 1 deletion artiq/management/worker.py → artiq/master/worker.py
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ def __init__(self, handlers,
@asyncio.coroutine
def create_process(self):
self.process = yield from asyncio.create_subprocess_exec(
sys.executable, "-m", "artiq.management.worker_impl",
sys.executable, "-m", "artiq.master.worker_impl",
stdout=subprocess.PIPE, stdin=subprocess.PIPE)

@asyncio.coroutine
File renamed without changes.
4 changes: 2 additions & 2 deletions frontend/artiq_master.py
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@
from artiq.management.pc_rpc import Server
from artiq.management.sync_struct import Publisher
from artiq.management.db import FlatFileDB, SimpleHistory
from artiq.management.scheduler import Scheduler
from artiq.management.rt_results import RTResults
from artiq.master.scheduler import Scheduler
from artiq.master.rt_results import RTResults


def _get_args():

0 comments on commit 070788a

Please sign in to comment.