M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

artiq_compile: adapt to code changes

This commit is contained in:
Sebastien Bourdeauducq 2016-05-28 12:57:04 -05:00
parent a120a09d79
commit 7851391666
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/frontend/artiq_compile.py
View File

@ -4,6 +4,7 @@ import os, sys, logging, argparse
from artiq.master.databases import DeviceDB, DatasetDB from artiq.master.databases import DeviceDB, DatasetDB
from artiq.master.worker_db import DeviceManager, DatasetManager from artiq.master.worker_db import DeviceManager, DatasetManager
from artiq.language.environment import ProcessArgumentManager
from artiq.coredevice.core import CompileError from artiq.coredevice.core import CompileError
from artiq.tools import * from artiq.tools import *
@ -44,14 +45,15 @@ def main():
module = file_import(args.file, prefix="artiq_run_") module = file_import(args.file, prefix="artiq_run_")
exp = get_experiment(module, args.experiment) exp = get_experiment(module, args.experiment)
arguments = parse_arguments(args.arguments) arguments = parse_arguments(args.arguments)
exp_inst = exp(device_mgr, dataset_mgr, **arguments) argument_mgr = ProcessArgumentManager(arguments)
exp_inst = exp((device_mgr, dataset_mgr, argument_mgr))
if not hasattr(exp.run, "artiq_embedded"): if not hasattr(exp.run, "artiq_embedded"):
raise ValueError("Experiment entry point must be a kernel") raise ValueError("Experiment entry point must be a kernel")
core_name = exp.run.artiq_embedded.core_name core_name = exp.run.artiq_embedded.core_name
core = getattr(exp_inst, core_name) core = getattr(exp_inst, core_name)
object_map, kernel_library, symbolizer = \ object_map, kernel_library, _, _ = \
core.compile(exp.run, [exp_inst], {}, core.compile(exp.run, [exp_inst], {},
with_attr_writeback=False) with_attr_writeback=False)
except CompileError as error: except CompileError as error: