diff --git a/setup.py b/setup.py index 747ca1be0e544e0022fca725b327dd0e9698057b..d328476b4a806ba5e03c063158293cde052ba914 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh: setup( name="quingo", - version="0.4.0", + version="0.4.1", author="Xiang Fu", author_email="gtaifu@gmail.com", description="Quingo Runtime System", diff --git a/src/quingo/core/compile.py b/src/quingo/core/compile.py index d194c7c502966a66543e95f5c289502b1a17f7e5..4db20f3f090d097ff5c833ed2c025a6518a98302 100644 --- a/src/quingo/core/compile.py +++ b/src/quingo/core/compile.py @@ -1,12 +1,13 @@ +import logging +import subprocess from pathlib import Path -import subprocess, logging + +from quingo.backend.qisa import Qisa, get_qisa_name, get_suffix from quingo.core.compiler_config import get_mlir_path -from quingo.core.quingo_task import Quingo_task from quingo.core.preparation import gen_main_file -from quingo.core.quingo_logger import quingo_err, get_logger +from quingo.core.quingo_logger import get_logger, quingo_err +from quingo.core.quingo_task import Quingo_task from quingo.utils import ensure_path -from quingo.backend.qisa import Qisa, get_qisa_name, get_suffix - logger = get_logger((__name__).split(".")[-1]) @@ -94,11 +95,11 @@ def compose_cl_cmd( opt_out_fn = '-o "{}"'.format(str(qasm_fn)) - config_fn = '--config-fn="{}"'.format(str(configfile)) + config_fn = '--config-fn="{}"'.format(str(configfile)) if len(configfile) > 0 else "" - chip_path_ = '--chip-config="{}"'.format(str(chip_path)) + chip_path_ = '--chip-config="{}"'.format(str(chip_path)) if len(chip_path) > 0 else "" - target_ = '--target="{}"'.format(str(target)) + target_ = '--target="{}"'.format(str(target)) if len(target) > 0 else "" # mq_path = '--mq-path="{}"'.format(str(mq_fn)) cmd_eles = [ @@ -115,7 +116,6 @@ def compose_cl_cmd( opt_out_fn, ] - compile_cmd = " ".join([ele for ele in cmd_eles if ele.strip() != ""]) return compile_cmd diff --git a/unittest/test_compile_cmd.py b/unittest/test_compile_cmd.py index 398ac889b491ec7179460f926071d5d555d79e04..d6a4176496ffc58959fb9ba5988e9785e7df999e 100644 --- a/unittest/test_compile_cmd.py +++ b/unittest/test_compile_cmd.py @@ -24,15 +24,15 @@ class TestCompileCmd: mlir_path = Path(get_mlir_path()) cmd = compose_cl_cmd(task, qasm_fn, mlir_path) + print("cmd:", cmd) cmd_eles = cmd.split() - assert len(cmd_eles) == 13 + assert len(cmd_eles) == 10 assert mlir_path.resolve().samefile(cmd_eles[0].strip('"')) assert cmd_eles[1] == '-u' assert cmd_eles[2] == '"{}"'.format(task.cl_entry_fn.resolve()) - assert cmd_eles[3] == "-I" - assert cmd_eles[5] == "-I" - assert cmd_eles[10] == "--isa=qcis" - assert cmd_eles[11] == "-o" + assert len([ele for ele in cmd_eles if ele == "-I"]) == 2 + assert "--isa=qcis" in cmd_eles + assert "-o" in cmd_eles # assert Path(qasm_fn).samefile(cmd_eles[8].strip('"')) def test_compile(self):