diff --git a/src/quark/ConfigManager.py b/src/quark/ConfigManager.py index 73efb771..efaf5798 100644 --- a/src/quark/ConfigManager.py +++ b/src/quark/ConfigManager.py @@ -23,9 +23,9 @@ import yaml from typing_extensions import TypedDict, NotRequired, Self -from modules.Core import Core -from modules.applications import Application -from utils import _get_instance_with_sub_options, checkbox +from quark.modules.Core import Core +from quark.modules.applications import Application +from quark.utils import _get_instance_with_sub_options, checkbox class ConfigModule(TypedDict): diff --git a/src/quark/Installer.py b/src/quark/Installer.py index 33c10ca3..5287a0df 100644 --- a/src/quark/Installer.py +++ b/src/quark/Installer.py @@ -23,8 +23,8 @@ from packaging import version import inquirer -from modules.Core import Core -from utils import _get_instance_with_sub_options, get_git_revision, checkbox +from quark.modules.Core import Core +from quark.utils import _get_instance_with_sub_options, get_git_revision, checkbox class Installer: @@ -34,7 +34,7 @@ class Installer: """ def __init__(self): - self.quark_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", ) + self.quark_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "..") self.settings_dir = f"{self.quark_dir}/.settings" self.envs_dir = f"{self.settings_dir}/envs" self.python_version = "3.12.7" diff --git a/src/quark/__main__.py b/src/quark/__main__.py index f7cb3b4b..5c16c78b 100644 --- a/src/quark/__main__.py +++ b/src/quark/__main__.py @@ -96,8 +96,8 @@ def start_benchmark_run(config_file: str = None, store_dir: str = None, benchmark_config = json.loads(benchmark_config["config"]) - from BenchmarkManager import BenchmarkManager # pylint: disable=C0415 - from ConfigManager import ConfigManager # pylint: disable=C0415 + from quark.BenchmarkManager import BenchmarkManager # pylint: disable=C0415 + from quark.ConfigManager import ConfigManager # pylint: disable=C0415 config_manager = ConfigManager() config_manager.set_config(benchmark_config) @@ -146,15 +146,15 @@ def handle_benchmark_run(args: argparse.Namespace) -> None: :param args: Namespace with the arguments given by the user """ - from BenchmarkManager import BenchmarkManager # pylint: disable=C0415 - from Plotter import Plotter # pylint: disable=C0415 + from quark.BenchmarkManager import BenchmarkManager # pylint: disable=C0415 + from quark.Plotter import Plotter # pylint: disable=C0415 benchmark_manager = BenchmarkManager(fail_fast=args.failfast) if args.summarize: benchmark_manager.summarize_results(args.summarize) else: - from ConfigManager import ConfigManager # pylint: disable=C0415 + from quark.ConfigManager import ConfigManager # pylint: disable=C0415 config_manager = ConfigManager() if args.modules: logging.info(f"Load application modules configuration from {args.modules}") diff --git a/src/quark/demo/instruction_demo.py b/src/quark/demo/instruction_demo.py index 24e102aa..007f38f7 100644 --- a/src/quark/demo/instruction_demo.py +++ b/src/quark/demo/instruction_demo.py @@ -1,8 +1,8 @@ import logging -from BenchmarkManager import Instruction -from modules.Core import Core -from modules.applications.Application import Application +from quark.BenchmarkManager import Instruction +from quark.modules.Core import Core +from quark.modules.applications.Application import Application class InstructionDemo(Application): diff --git a/src/quark/modules/Core.py b/src/quark/modules/Core.py index 89f62935..250806e6 100644 --- a/src/quark/modules/Core.py +++ b/src/quark/modules/Core.py @@ -19,8 +19,8 @@ from abc import ABC, abstractmethod from typing import final -from utils import _get_instance_with_sub_options -from Metrics import Metrics +from quark.utils import _get_instance_with_sub_options +from quark.Metrics import Metrics class Core(ABC): diff --git a/src/quark/modules/applications/Application.py b/src/quark/modules/applications/Application.py index c1a93b77..091f95f6 100644 --- a/src/quark/modules/applications/Application.py +++ b/src/quark/modules/applications/Application.py @@ -13,7 +13,7 @@ # limitations under the License. from abc import ABC, abstractmethod -from modules.Core import Core +from quark.modules.Core import Core class Application(Core, ABC): diff --git a/src/quark/modules/applications/Mapping.py b/src/quark/modules/applications/Mapping.py index 25d18d94..c7d5671f 100644 --- a/src/quark/modules/applications/Mapping.py +++ b/src/quark/modules/applications/Mapping.py @@ -13,7 +13,7 @@ # limitations under the License. from abc import ABC, abstractmethod -from modules.Core import Core +from quark.modules.Core import Core class Mapping(Core, ABC): diff --git a/src/quark/modules/applications/optimization/ACL/ACL.py b/src/quark/modules/applications/optimization/ACL/ACL.py index 0dcc3073..7e95acbe 100644 --- a/src/quark/modules/applications/optimization/ACL/ACL.py +++ b/src/quark/modules/applications/optimization/ACL/ACL.py @@ -34,9 +34,9 @@ import numpy as np import pulp -from modules.applications.Application import Core -from modules.applications.optimization.Optimization import Optimization -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Application import Core +from quark.modules.applications.optimization.Optimization import Optimization +from quark.utils import start_time_measurement, end_time_measurement class ACL(Optimization): @@ -84,10 +84,10 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "MIPsolverACL": - from modules.solvers.MIPsolverACL import MIPaclp # pylint: disable=C0415 + from quark.modules.solvers.MIPsolverACL import MIPaclp # pylint: disable=C0415 return MIPaclp() elif option == "QUBO": - from modules.applications.optimization.ACL.mappings.QUBO import Qubo # pylint: disable=C0415 + from quark.modules.applications.optimization.ACL.mappings.QUBO import Qubo # pylint: disable=C0415 return Qubo() else: raise NotImplementedError(f"Submodule Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/ACL/mappings/ISING.py b/src/quark/modules/applications/optimization/ACL/mappings/ISING.py index 3a831f0d..a3287306 100644 --- a/src/quark/modules/applications/optimization/ACL/mappings/ISING.py +++ b/src/quark/modules/applications/optimization/ACL/mappings/ISING.py @@ -20,9 +20,9 @@ from qiskit_optimization import QuadraticProgram from qiskit_optimization.converters import QuadraticProgramToQubo -from modules.applications.Mapping import Mapping -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Mapping import Mapping +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class Ising(Mapping): @@ -200,10 +200,10 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "QAOA": - from modules.solvers.QAOA import QAOA # pylint: disable=C0415 + from quark.modules.solvers.QAOA import QAOA # pylint: disable=C0415 return QAOA() elif option == "QiskitQAOA": - from modules.solvers.QiskitQAOA import QiskitQAOA # pylint: disable=C0415 + from quark.modules.solvers.QiskitQAOA import QiskitQAOA # pylint: disable=C0415 return QiskitQAOA() else: raise NotImplementedError(f"Solver Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/ACL/mappings/QUBO.py b/src/quark/modules/applications/optimization/ACL/mappings/QUBO.py index 1ba26dea..4c4f69aa 100644 --- a/src/quark/modules/applications/optimization/ACL/mappings/QUBO.py +++ b/src/quark/modules/applications/optimization/ACL/mappings/QUBO.py @@ -23,8 +23,8 @@ LinearEqualityToPenalty ) -from modules.applications.Mapping import Mapping, Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Mapping import Mapping, Core +from quark.utils import start_time_measurement, end_time_measurement # TODO Large chunks of this code is duplicated in ACL.mappings.ISING -> unify @@ -269,7 +269,7 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "Annealer": - from modules.solvers.Annealer import Annealer # pylint: disable=C0415 + from quark.modules.solvers.Annealer import Annealer # pylint: disable=C0415 return Annealer() else: raise NotImplementedError(f"Solver Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/MIS/MIS.py b/src/quark/modules/applications/optimization/MIS/MIS.py index b0083fe1..0cba6e9f 100644 --- a/src/quark/modules/applications/optimization/MIS/MIS.py +++ b/src/quark/modules/applications/optimization/MIS/MIS.py @@ -20,10 +20,10 @@ import matplotlib.pyplot as plt from matplotlib.lines import Line2D -from modules.applications.Application import Core -from modules.applications.optimization.Optimization import Optimization -from modules.applications.optimization.MIS.data.graph_layouts import generate_hexagonal_graph -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Application import Core +from quark.modules.applications.optimization.Optimization import Optimization +from quark.modules.applications.optimization.MIS.data.graph_layouts import generate_hexagonal_graph +from quark.utils import start_time_measurement, end_time_measurement # Define R_rydberg R_rydberg = 9.75 @@ -82,10 +82,10 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "QIRO": - from modules.applications.optimization.MIS.mappings.QIRO import QIRO # pylint: disable=C0415 + from quark.modules.applications.optimization.MIS.mappings.QIRO import QIRO # pylint: disable=C0415 return QIRO() elif option == "NeutralAtom": - from modules.applications.optimization.MIS.mappings.NeutralAtom import NeutralAtom # pylint: disable=C0415 + from quark.modules.applications.optimization.MIS.mappings.NeutralAtom import NeutralAtom # pylint: disable=C0415 return NeutralAtom() else: raise NotImplementedError(f"Mapping Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/MIS/mappings/NeutralAtom.py b/src/quark/modules/applications/optimization/MIS/mappings/NeutralAtom.py index 58e70513..6278ffcd 100644 --- a/src/quark/modules/applications/optimization/MIS/mappings/NeutralAtom.py +++ b/src/quark/modules/applications/optimization/MIS/mappings/NeutralAtom.py @@ -17,8 +17,8 @@ import networkx as nx import pulser -from modules.applications.Mapping import Mapping, Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Mapping import Mapping, Core +from quark.utils import start_time_measurement, end_time_measurement class NeutralAtom(Mapping): @@ -85,7 +85,7 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "NeutralAtomMIS": - from modules.solvers.NeutralAtomMIS import NeutralAtomMIS # pylint: disable=C0415 + from quark.modules.solvers.NeutralAtomMIS import NeutralAtomMIS # pylint: disable=C0415 return NeutralAtomMIS() else: raise NotImplementedError(f"Solver Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/MIS/mappings/QIRO.py b/src/quark/modules/applications/optimization/MIS/mappings/QIRO.py index b3666203..d2401e35 100644 --- a/src/quark/modules/applications/optimization/MIS/mappings/QIRO.py +++ b/src/quark/modules/applications/optimization/MIS/mappings/QIRO.py @@ -15,8 +15,8 @@ from typing import TypedDict import networkx -from modules.applications.Mapping import Core, Mapping -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Mapping import Core, Mapping +from quark.utils import start_time_measurement, end_time_measurement class QIRO(Mapping): @@ -90,7 +90,7 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "QrispQIRO": - from modules.solvers.QrispQIRO import QIROSolver # pylint: disable=C0415 + from quark.modules.solvers.QrispQIRO import QIROSolver # pylint: disable=C0415 return QIROSolver() else: raise NotImplementedError(f"Solver Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/Optimization.py b/src/quark/modules/applications/optimization/Optimization.py index cfc3dada..4f11e911 100644 --- a/src/quark/modules/applications/optimization/Optimization.py +++ b/src/quark/modules/applications/optimization/Optimization.py @@ -14,8 +14,8 @@ from abc import ABC, abstractmethod import logging -from modules.applications.Application import Application -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Application import Application +from quark.utils import start_time_measurement, end_time_measurement class Optimization(Application, ABC): diff --git a/src/quark/modules/applications/optimization/PVC/PVC.py b/src/quark/modules/applications/optimization/PVC/PVC.py index 767a6963..51c06147 100644 --- a/src/quark/modules/applications/optimization/PVC/PVC.py +++ b/src/quark/modules/applications/optimization/PVC/PVC.py @@ -24,9 +24,9 @@ from matplotlib.patches import Patch import numpy as np -from modules.applications.Application import Core -from modules.applications.optimization.Optimization import Optimization -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Application import Core +from quark.modules.applications.optimization.Optimization import Optimization +from quark.utils import start_time_measurement, end_time_measurement class PVC(Optimization): @@ -84,19 +84,19 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "Ising": - from modules.applications.optimization.PVC.mappings.ISING import Ising # pylint: disable=C0415 + from quark.modules.applications.optimization.PVC.mappings.ISING import Ising # pylint: disable=C0415 return Ising() elif option == "QUBO": - from modules.applications.optimization.PVC.mappings.QUBO import QUBO # pylint: disable=C0415 + from quark.modules.applications.optimization.PVC.mappings.QUBO import QUBO # pylint: disable=C0415 return QUBO() elif option == "GreedyClassicalPVC": - from modules.solvers.GreedyClassicalPVC import GreedyClassicalPVC # pylint: disable=C0415 + from quark.modules.solvers.GreedyClassicalPVC import GreedyClassicalPVC # pylint: disable=C0415 return GreedyClassicalPVC() elif option == "ReverseGreedyClassicalPVC": - from modules.solvers.ReverseGreedyClassicalPVC import ReverseGreedyClassicalPVC # pylint: disable=C0415 + from quark.modules.solvers.ReverseGreedyClassicalPVC import ReverseGreedyClassicalPVC # pylint: disable=C0415 return ReverseGreedyClassicalPVC() elif option == "RandomPVC": - from modules.solvers.RandomClassicalPVC import RandomPVC # pylint: disable=C0415 + from quark.modules.solvers.RandomClassicalPVC import RandomPVC # pylint: disable=C0415 return RandomPVC() else: raise NotImplementedError(f"Mapping Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/PVC/mappings/ISING.py b/src/quark/modules/applications/optimization/PVC/mappings/ISING.py index 5d2e32c7..05dde9e6 100644 --- a/src/quark/modules/applications/optimization/PVC/mappings/ISING.py +++ b/src/quark/modules/applications/optimization/PVC/mappings/ISING.py @@ -19,9 +19,9 @@ import numpy as np from dimod import qubo_to_ising -from modules.applications.Mapping import Mapping, Core -from modules.applications.optimization.PVC.mappings.QUBO import QUBO -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Mapping import Mapping, Core +from quark.modules.applications.optimization.PVC.mappings.QUBO import QUBO +from quark.utils import start_time_measurement, end_time_measurement class Ising(Mapping): @@ -150,10 +150,10 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "QAOA": - from modules.solvers.QAOA import QAOA # pylint: disable=C0415 + from quark.modules.solvers.QAOA import QAOA # pylint: disable=C0415 return QAOA() if option == "PennylaneQAOA": - from modules.solvers.PennylaneQAOA import PennylaneQAOA # pylint: disable=C0415 + from quark.modules.solvers.PennylaneQAOA import PennylaneQAOA # pylint: disable=C0415 return PennylaneQAOA() else: raise NotImplementedError(f"Solver Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/PVC/mappings/QUBO.py b/src/quark/modules/applications/optimization/PVC/mappings/QUBO.py index 2cd0b487..590316d1 100644 --- a/src/quark/modules/applications/optimization/PVC/mappings/QUBO.py +++ b/src/quark/modules/applications/optimization/PVC/mappings/QUBO.py @@ -19,8 +19,8 @@ import networkx as nx -from modules.applications.Mapping import Mapping, Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Mapping import Mapping, Core +from quark.utils import start_time_measurement, end_time_measurement class QUBO(Mapping): @@ -195,7 +195,7 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "Annealer": - from modules.solvers.Annealer import Annealer # pylint: disable=C0415 + from quark.modules.solvers.Annealer import Annealer # pylint: disable=C0415 return Annealer() else: raise NotImplementedError(f"Solver Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/SAT/SAT.py b/src/quark/modules/applications/optimization/SAT/SAT.py index abb62310..603678ca 100644 --- a/src/quark/modules/applications/optimization/SAT/SAT.py +++ b/src/quark/modules/applications/optimization/SAT/SAT.py @@ -20,9 +20,9 @@ from nnf import Var, And, Or from nnf.dimacs import dump -from modules.Core import Core -from modules.applications.optimization.Optimization import Optimization -from utils import start_time_measurement, end_time_measurement +from quark.modules.Core import Core +from quark.modules.applications.optimization.Optimization import Optimization +from quark.utils import start_time_measurement, end_time_measurement class SAT(Optimization): @@ -88,23 +88,23 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "QubovertQUBO": - from modules.applications.optimization.SAT.mappings.QubovertQUBO import \ + from quark.modules.applications.optimization.SAT.mappings.QubovertQUBO import \ QubovertQUBO # pylint: disable=C0415 return QubovertQUBO() elif option == "Direct": - from modules.applications.optimization.SAT.mappings.Direct import Direct # pylint: disable=C0415 + from quark.modules.applications.optimization.SAT.mappings.Direct import Direct # pylint: disable=C0415 return Direct() elif option == "ChoiQUBO": - from modules.applications.optimization.SAT.mappings.ChoiQUBO import ChoiQUBO # pylint: disable=C0415 + from quark.modules.applications.optimization.SAT.mappings.ChoiQUBO import ChoiQUBO # pylint: disable=C0415 return ChoiQUBO() elif option == "ChoiIsing": - from modules.applications.optimization.SAT.mappings.ChoiISING import ChoiIsing # pylint: disable=C0415 + from quark.modules.applications.optimization.SAT.mappings.ChoiISING import ChoiIsing # pylint: disable=C0415 return ChoiIsing() elif option == "DinneenQUBO": - from modules.applications.optimization.SAT.mappings.DinneenQUBO import DinneenQUBO # pylint: disable=C0415 + from quark.modules.applications.optimization.SAT.mappings.DinneenQUBO import DinneenQUBO # pylint: disable=C0415 return DinneenQUBO() elif option == "DinneenIsing": - from modules.applications.optimization.SAT.mappings.DinneenISING import \ + from quark.modules.applications.optimization.SAT.mappings.DinneenISING import \ DinneenIsing # pylint: disable=C0415 return DinneenIsing() else: diff --git a/src/quark/modules/applications/optimization/SAT/mappings/ChoiISING.py b/src/quark/modules/applications/optimization/SAT/mappings/ChoiISING.py index 0a74b79c..f466ebd1 100644 --- a/src/quark/modules/applications/optimization/SAT/mappings/ChoiISING.py +++ b/src/quark/modules/applications/optimization/SAT/mappings/ChoiISING.py @@ -17,9 +17,9 @@ import numpy as np from dimod import qubo_to_ising -from modules.applications.Mapping import Mapping, Core -from modules.applications.optimization.SAT.mappings.ChoiQUBO import ChoiQUBO -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Mapping import Mapping, Core +from quark.modules.applications.optimization.SAT.mappings.ChoiQUBO import ChoiQUBO +from quark.utils import start_time_measurement, end_time_measurement class ChoiIsing(Mapping): @@ -147,10 +147,10 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "QAOA": - from modules.solvers.QAOA import QAOA # pylint: disable=C0415 + from quark.modules.solvers.QAOA import QAOA # pylint: disable=C0415 return QAOA() if option == "PennylaneQAOA": - from modules.solvers.PennylaneQAOA import PennylaneQAOA # pylint: disable=C0415 + from quark.modules.solvers.PennylaneQAOA import PennylaneQAOA # pylint: disable=C0415 return PennylaneQAOA() else: raise NotImplementedError(f"Solver Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/SAT/mappings/ChoiQUBO.py b/src/quark/modules/applications/optimization/SAT/mappings/ChoiQUBO.py index e8a626ee..1af99b81 100644 --- a/src/quark/modules/applications/optimization/SAT/mappings/ChoiQUBO.py +++ b/src/quark/modules/applications/optimization/SAT/mappings/ChoiQUBO.py @@ -18,8 +18,8 @@ from nnf import Var, And -from modules.applications.Mapping import Mapping, Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Mapping import Mapping, Core +from quark.utils import start_time_measurement, end_time_measurement class ChoiQUBO(Mapping): @@ -244,7 +244,7 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "Annealer": - from modules.solvers.Annealer import Annealer # pylint: disable=C0415 + from quark.modules.solvers.Annealer import Annealer # pylint: disable=C0415 return Annealer() else: raise NotImplementedError(f"Solver Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/SAT/mappings/DinneenISING.py b/src/quark/modules/applications/optimization/SAT/mappings/DinneenISING.py index f4767551..60e4a530 100644 --- a/src/quark/modules/applications/optimization/SAT/mappings/DinneenISING.py +++ b/src/quark/modules/applications/optimization/SAT/mappings/DinneenISING.py @@ -18,9 +18,9 @@ from dimod import qubo_to_ising from nnf import And -from modules.applications.Mapping import Mapping, Core -from modules.applications.optimization.SAT.mappings.DinneenQUBO import DinneenQUBO -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Mapping import Mapping, Core +from quark.modules.applications.optimization.SAT.mappings.DinneenQUBO import DinneenQUBO +from quark.utils import start_time_measurement, end_time_measurement class DinneenIsing(Mapping): @@ -139,10 +139,10 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "QAOA": - from modules.solvers.QAOA import QAOA # pylint: disable=C0415 + from quark.modules.solvers.QAOA import QAOA # pylint: disable=C0415 return QAOA() if option == "PennylaneQAOA": - from modules.solvers.PennylaneQAOA import PennylaneQAOA # pylint: disable=C0415 + from quark.modules.solvers.PennylaneQAOA import PennylaneQAOA # pylint: disable=C0415 return PennylaneQAOA() else: raise NotImplementedError(f"Solver Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/SAT/mappings/DinneenQUBO.py b/src/quark/modules/applications/optimization/SAT/mappings/DinneenQUBO.py index 5a700f29..c3c959b2 100644 --- a/src/quark/modules/applications/optimization/SAT/mappings/DinneenQUBO.py +++ b/src/quark/modules/applications/optimization/SAT/mappings/DinneenQUBO.py @@ -18,8 +18,8 @@ from nnf import And -from modules.applications.Mapping import Mapping, Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Mapping import Mapping, Core +from quark.utils import start_time_measurement, end_time_measurement class DinneenQUBO(Mapping): @@ -192,7 +192,7 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "Annealer": - from modules.solvers.Annealer import Annealer # pylint: disable=C0415 + from quark.modules.solvers.Annealer import Annealer # pylint: disable=C0415 return Annealer() else: raise NotImplementedError(f"Solver Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/SAT/mappings/Direct.py b/src/quark/modules/applications/optimization/SAT/mappings/Direct.py index fb889e10..11ebd1d2 100644 --- a/src/quark/modules/applications/optimization/SAT/mappings/Direct.py +++ b/src/quark/modules/applications/optimization/SAT/mappings/Direct.py @@ -20,8 +20,8 @@ from nnf.dimacs import dump from pysat.formula import CNF, WCNF -from modules.applications.Mapping import Mapping, Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Mapping import Mapping, Core +from quark.utils import start_time_measurement, end_time_measurement class Direct(Mapping): @@ -119,10 +119,10 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "ClassicalSAT": - from modules.solvers.ClassicalSAT import ClassicalSAT # pylint: disable=C0415 + from quark.modules.solvers.ClassicalSAT import ClassicalSAT # pylint: disable=C0415 return ClassicalSAT() elif option == "RandomSAT": - from modules.solvers.RandomClassicalSAT import RandomSAT # pylint: disable=C0415 + from quark.modules.solvers.RandomClassicalSAT import RandomSAT # pylint: disable=C0415 return RandomSAT() else: raise NotImplementedError(f"Solver Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/SAT/mappings/QubovertQUBO.py b/src/quark/modules/applications/optimization/SAT/mappings/QubovertQUBO.py index 4d763d3b..a05f0acf 100644 --- a/src/quark/modules/applications/optimization/SAT/mappings/QubovertQUBO.py +++ b/src/quark/modules/applications/optimization/SAT/mappings/QubovertQUBO.py @@ -18,8 +18,8 @@ from qubovert.sat import NOT, OR, AND from nnf import And -from modules.applications.Mapping import Mapping, Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Mapping import Mapping, Core +from quark.utils import start_time_measurement, end_time_measurement class QubovertQUBO(Mapping): @@ -189,7 +189,7 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "Annealer": - from modules.solvers.Annealer import Annealer # pylint: disable=C0415 + from quark.modules.solvers.Annealer import Annealer # pylint: disable=C0415 return Annealer() else: raise NotImplementedError(f"Solver Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/SCP/SCP.py b/src/quark/modules/applications/optimization/SCP/SCP.py index 7ac11ada..76032143 100644 --- a/src/quark/modules/applications/optimization/SCP/SCP.py +++ b/src/quark/modules/applications/optimization/SCP/SCP.py @@ -16,9 +16,9 @@ import pickle import os -from modules.applications.Application import Application -from modules.applications.optimization.Optimization import Optimization -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Application import Application +from quark.modules.applications.optimization.Optimization import Optimization +from quark.utils import start_time_measurement, end_time_measurement class SCP(Optimization): @@ -60,7 +60,7 @@ def get_default_submodule(self, option: str) -> Application: :raises NotImplementedError: If the option is not recognized """ if option == "qubovertQUBO": - from modules.applications.optimization.SCP.mappings.qubovertQUBO import QubovertQUBO # pylint: disable=C0415 + from quark.modules.applications.optimization.SCP.mappings.qubovertQUBO import QubovertQUBO # pylint: disable=C0415 return QubovertQUBO() else: raise NotImplementedError(f"Mapping Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/SCP/mappings/qubovertQUBO.py b/src/quark/modules/applications/optimization/SCP/mappings/qubovertQUBO.py index d6e0e312..0342d5b8 100644 --- a/src/quark/modules/applications/optimization/SCP/mappings/qubovertQUBO.py +++ b/src/quark/modules/applications/optimization/SCP/mappings/qubovertQUBO.py @@ -16,8 +16,8 @@ from typing import TypedDict from qubovert.problems import SetCover -from modules.applications.Mapping import Mapping, Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Mapping import Mapping, Core +from quark.utils import start_time_measurement, end_time_measurement class QubovertQUBO(Mapping): @@ -139,7 +139,7 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplementedError: If the option is not recognized """ if option == "Annealer": - from modules.solvers.Annealer import Annealer # pylint: disable=C0415 + from quark.modules.solvers.Annealer import Annealer # pylint: disable=C0415 return Annealer() else: raise NotImplementedError(f"Solver Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/TSP/TSP.py b/src/quark/modules/applications/optimization/TSP/TSP.py index 32392e59..5cd39552 100644 --- a/src/quark/modules/applications/optimization/TSP/TSP.py +++ b/src/quark/modules/applications/optimization/TSP/TSP.py @@ -21,9 +21,9 @@ import matplotlib.pyplot as plt import numpy as np -from modules.applications.Application import Core -from modules.applications.optimization.Optimization import Optimization -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Application import Core +from quark.modules.applications.optimization.Optimization import Optimization +from quark.utils import start_time_measurement, end_time_measurement class TSP(Optimization): @@ -78,19 +78,19 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplemented: If the provided option is not implemented """ if option == "Ising": - from modules.applications.optimization.TSP.mappings.ISING import Ising # pylint: disable=C0415 + from quark.modules.applications.optimization.TSP.mappings.ISING import Ising # pylint: disable=C0415 return Ising() elif option == "QUBO": - from modules.applications.optimization.TSP.mappings.QUBO import QUBO # pylint: disable=C0415 + from quark.modules.applications.optimization.TSP.mappings.QUBO import QUBO # pylint: disable=C0415 return QUBO() elif option == "GreedyClassicalTSP": - from modules.solvers.GreedyClassicalTSP import GreedyClassicalTSP # pylint: disable=C0415 + from quark.modules.solvers.GreedyClassicalTSP import GreedyClassicalTSP # pylint: disable=C0415 return GreedyClassicalTSP() elif option == "ReverseGreedyClassicalTSP": - from modules.solvers.ReverseGreedyClassicalTSP import ReverseGreedyClassicalTSP # pylint: disable=C0415 + from quark.modules.solvers.ReverseGreedyClassicalTSP import ReverseGreedyClassicalTSP # pylint: disable=C0415 return ReverseGreedyClassicalTSP() elif option == "RandomTSP": - from modules.solvers.RandomClassicalTSP import RandomTSP # pylint: disable=C0415 + from quark.modules.solvers.RandomClassicalTSP import RandomTSP # pylint: disable=C0415 return RandomTSP() else: raise NotImplementedError(f"Mapping Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/TSP/mappings/ISING.py b/src/quark/modules/applications/optimization/TSP/mappings/ISING.py index 056f21df..8160c227 100644 --- a/src/quark/modules/applications/optimization/TSP/mappings/ISING.py +++ b/src/quark/modules/applications/optimization/TSP/mappings/ISING.py @@ -23,9 +23,9 @@ from qiskit_optimization.applications import Tsp from qiskit_optimization.converters import QuadraticProgramToQubo -from modules.applications.Mapping import Mapping, Core -from modules.applications.optimization.TSP.mappings.QUBO import QUBO -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Mapping import Mapping, Core +from quark.modules.applications.optimization.TSP.mappings.QUBO import QUBO +from quark.utils import start_time_measurement, end_time_measurement class Ising(Mapping): @@ -261,13 +261,13 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplemented: If the provided option is not implemented """ if option == "QAOA": - from modules.solvers.QAOA import QAOA # pylint: disable=C0415 + from quark.modules.solvers.QAOA import QAOA # pylint: disable=C0415 return QAOA() elif option == "PennylaneQAOA": - from modules.solvers.PennylaneQAOA import PennylaneQAOA # pylint: disable=C0415 + from quark.modules.solvers.PennylaneQAOA import PennylaneQAOA # pylint: disable=C0415 return PennylaneQAOA() elif option == "QiskitQAOA": - from modules.solvers.QiskitQAOA import QiskitQAOA # pylint: disable=C0415 + from quark.modules.solvers.QiskitQAOA import QiskitQAOA # pylint: disable=C0415 return QiskitQAOA() else: raise NotImplementedError(f"Solver Option {option} not implemented") diff --git a/src/quark/modules/applications/optimization/TSP/mappings/QUBO.py b/src/quark/modules/applications/optimization/TSP/mappings/QUBO.py index 9adde638..f5bdd35a 100644 --- a/src/quark/modules/applications/optimization/TSP/mappings/QUBO.py +++ b/src/quark/modules/applications/optimization/TSP/mappings/QUBO.py @@ -18,8 +18,8 @@ import dwave_networkx as dnx import networkx -from modules.applications.Mapping import Mapping, Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.Mapping import Mapping, Core +from quark.utils import start_time_measurement, end_time_measurement class QUBO(Mapping): @@ -119,7 +119,7 @@ def get_default_submodule(self, option: str) -> Core: """ if option == "Annealer": - from modules.solvers.Annealer import Annealer # pylint: disable=C0415 + from quark.modules.solvers.Annealer import Annealer # pylint: disable=C0415 return Annealer() else: raise NotImplementedError(f"Solver Option {option} not implemented") diff --git a/src/quark/modules/applications/qml/Circuit.py b/src/quark/modules/applications/qml/Circuit.py index 0a7b4c3f..88f5c503 100644 --- a/src/quark/modules/applications/qml/Circuit.py +++ b/src/quark/modules/applications/qml/Circuit.py @@ -13,7 +13,7 @@ # limitations under the License. from abc import ABC, abstractmethod -from modules.Core import Core +from quark.modules.Core import Core class Circuit(Core, ABC): diff --git a/src/quark/modules/applications/qml/QML.py b/src/quark/modules/applications/qml/QML.py index 91f34fc5..35e803e1 100644 --- a/src/quark/modules/applications/qml/QML.py +++ b/src/quark/modules/applications/qml/QML.py @@ -14,7 +14,7 @@ from abc import ABC, abstractmethod -from modules.applications.Application import Application +from quark.modules.applications.Application import Application class QML(Application, ABC): diff --git a/src/quark/modules/applications/qml/generative_modeling/GenerativeModeling.py b/src/quark/modules/applications/qml/generative_modeling/GenerativeModeling.py index 8c61280a..c50a1a7b 100644 --- a/src/quark/modules/applications/qml/generative_modeling/GenerativeModeling.py +++ b/src/quark/modules/applications/qml/generative_modeling/GenerativeModeling.py @@ -13,11 +13,11 @@ # limitations under the License. from typing import Union -from utils import start_time_measurement, end_time_measurement +from quark.utils import start_time_measurement, end_time_measurement -from modules.applications.qml.QML import QML -from modules.applications.qml.generative_modeling.data.data_handler.DiscreteData import DiscreteData -from modules.applications.qml.generative_modeling.data.data_handler.ContinuousData import ContinuousData +from quark.modules.applications.qml.QML import QML +from quark.modules.applications.qml.generative_modeling.data.data_handler.DiscreteData import DiscreteData +from quark.modules.applications.qml.generative_modeling.data.data_handler.ContinuousData import ContinuousData class GenerativeModeling(QML): diff --git a/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitCardinality.py b/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitCardinality.py index 06c73c3d..46ca0ccc 100644 --- a/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitCardinality.py +++ b/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitCardinality.py @@ -14,11 +14,11 @@ from typing import Union, TypedDict -from modules.applications.qml.generative_modeling.circuits.CircuitGenerative import CircuitGenerative -from modules.applications.qml.generative_modeling.mappings.LibraryQiskit import LibraryQiskit -from modules.applications.qml.generative_modeling.mappings.LibraryPennylane import LibraryPennylane -from modules.applications.qml.generative_modeling.mappings.PresetQiskitNoisyBackend import PresetQiskitNoisyBackend -from modules.applications.qml.generative_modeling.mappings.CustomQiskitNoisyBackend import CustomQiskitNoisyBackend +from quark.modules.applications.qml.generative_modeling.circuits.CircuitGenerative import CircuitGenerative +from quark.modules.applications.qml.generative_modeling.mappings.LibraryQiskit import LibraryQiskit +from quark.modules.applications.qml.generative_modeling.mappings.LibraryPennylane import LibraryPennylane +from quark.modules.applications.qml.generative_modeling.mappings.PresetQiskitNoisyBackend import PresetQiskitNoisyBackend +from quark.modules.applications.qml.generative_modeling.mappings.CustomQiskitNoisyBackend import CustomQiskitNoisyBackend class CircuitCardinality(CircuitGenerative): diff --git a/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitCopula.py b/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitCopula.py index c2368474..e8f31a8e 100644 --- a/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitCopula.py +++ b/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitCopula.py @@ -16,11 +16,11 @@ from itertools import combinations from scipy.special import binom -from modules.applications.qml.generative_modeling.circuits.CircuitGenerative import CircuitGenerative -from modules.applications.qml.generative_modeling.mappings.LibraryQiskit import LibraryQiskit -from modules.applications.qml.generative_modeling.mappings.LibraryPennylane import LibraryPennylane -from modules.applications.qml.generative_modeling.mappings.PresetQiskitNoisyBackend import PresetQiskitNoisyBackend -from modules.applications.qml.generative_modeling.mappings.CustomQiskitNoisyBackend import CustomQiskitNoisyBackend +from quark.modules.applications.qml.generative_modeling.circuits.CircuitGenerative import CircuitGenerative +from quark.modules.applications.qml.generative_modeling.mappings.LibraryQiskit import LibraryQiskit +from quark.modules.applications.qml.generative_modeling.mappings.LibraryPennylane import LibraryPennylane +from quark.modules.applications.qml.generative_modeling.mappings.PresetQiskitNoisyBackend import PresetQiskitNoisyBackend +from quark.modules.applications.qml.generative_modeling.mappings.CustomQiskitNoisyBackend import CustomQiskitNoisyBackend class CircuitCopula(CircuitGenerative): diff --git a/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitGenerative.py b/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitGenerative.py index f6824ffa..bb4d775c 100644 --- a/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitGenerative.py +++ b/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitGenerative.py @@ -13,10 +13,10 @@ # limitations under the License. from abc import ABC -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement -from modules.applications.qml.Circuit import Circuit +from quark.modules.applications.qml.Circuit import Circuit class CircuitGenerative(Circuit, Core, ABC): diff --git a/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitStandard.py b/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitStandard.py index 6d419de9..cefdfb9f 100644 --- a/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitStandard.py +++ b/src/quark/modules/applications/qml/generative_modeling/circuits/CircuitStandard.py @@ -14,11 +14,11 @@ from typing import Union, TypedDict -from modules.applications.qml.generative_modeling.circuits.CircuitGenerative import CircuitGenerative -from modules.applications.qml.generative_modeling.mappings.LibraryQiskit import LibraryQiskit -from modules.applications.qml.generative_modeling.mappings.LibraryPennylane import LibraryPennylane -from modules.applications.qml.generative_modeling.mappings.PresetQiskitNoisyBackend import PresetQiskitNoisyBackend -from modules.applications.qml.generative_modeling.mappings.CustomQiskitNoisyBackend import CustomQiskitNoisyBackend +from quark.modules.applications.qml.generative_modeling.circuits.CircuitGenerative import CircuitGenerative +from quark.modules.applications.qml.generative_modeling.mappings.LibraryQiskit import LibraryQiskit +from quark.modules.applications.qml.generative_modeling.mappings.LibraryPennylane import LibraryPennylane +from quark.modules.applications.qml.generative_modeling.mappings.PresetQiskitNoisyBackend import PresetQiskitNoisyBackend +from quark.modules.applications.qml.generative_modeling.mappings.CustomQiskitNoisyBackend import CustomQiskitNoisyBackend class CircuitStandard(CircuitGenerative): diff --git a/src/quark/modules/applications/qml/generative_modeling/data/data_handler/ContinuousData.py b/src/quark/modules/applications/qml/generative_modeling/data/data_handler/ContinuousData.py index 46aa51c5..a6874a42 100644 --- a/src/quark/modules/applications/qml/generative_modeling/data/data_handler/ContinuousData.py +++ b/src/quark/modules/applications/qml/generative_modeling/data/data_handler/ContinuousData.py @@ -18,10 +18,10 @@ import numpy as np import pkg_resources -from utils import start_time_measurement, end_time_measurement -from modules.applications.qml.generative_modeling.transformations.MinMax import MinMax -from modules.applications.qml.generative_modeling.transformations.PIT import PIT -from modules.applications.qml.generative_modeling.data.data_handler.DataHandlerGenerative import DataHandlerGenerative +from quark.utils import start_time_measurement, end_time_measurement +from quark.modules.applications.qml.generative_modeling.transformations.MinMax import MinMax +from quark.modules.applications.qml.generative_modeling.transformations.PIT import PIT +from quark.modules.applications.qml.generative_modeling.data.data_handler.DataHandlerGenerative import DataHandlerGenerative class ContinuousData(DataHandlerGenerative): diff --git a/src/quark/modules/applications/qml/generative_modeling/data/data_handler/DataHandlerGenerative.py b/src/quark/modules/applications/qml/generative_modeling/data/data_handler/DataHandlerGenerative.py index 09c4c491..505fb281 100644 --- a/src/quark/modules/applications/qml/generative_modeling/data/data_handler/DataHandlerGenerative.py +++ b/src/quark/modules/applications/qml/generative_modeling/data/data_handler/DataHandlerGenerative.py @@ -19,9 +19,9 @@ import numpy as np -from modules.Core import Core -from modules.applications.qml.DataHandler import DataHandler -from utils import start_time_measurement, end_time_measurement +from quark.modules.Core import Core +from quark.modules.applications.qml.DataHandler import DataHandler +from quark.utils import start_time_measurement, end_time_measurement class DataHandlerGenerative(Core, DataHandler, ABC): diff --git a/src/quark/modules/applications/qml/generative_modeling/data/data_handler/DiscreteData.py b/src/quark/modules/applications/qml/generative_modeling/data/data_handler/DiscreteData.py index cf7fdebf..fab11fed 100644 --- a/src/quark/modules/applications/qml/generative_modeling/data/data_handler/DiscreteData.py +++ b/src/quark/modules/applications/qml/generative_modeling/data/data_handler/DiscreteData.py @@ -19,10 +19,10 @@ import numpy as np -from modules.applications.qml.generative_modeling.circuits.CircuitCardinality import CircuitCardinality -from modules.applications.qml.generative_modeling.data.data_handler.DataHandlerGenerative import DataHandlerGenerative -from modules.applications.qml.generative_modeling.metrics.MetricsGeneralization import MetricsGeneralization -from utils import start_time_measurement, end_time_measurement +from quark.modules.applications.qml.generative_modeling.circuits.CircuitCardinality import CircuitCardinality +from quark.modules.applications.qml.generative_modeling.data.data_handler.DataHandlerGenerative import DataHandlerGenerative +from quark.modules.applications.qml.generative_modeling.metrics.MetricsGeneralization import MetricsGeneralization +from quark.utils import start_time_measurement, end_time_measurement class DiscreteData(DataHandlerGenerative): diff --git a/src/quark/modules/applications/qml/generative_modeling/mappings/CustomQiskitNoisyBackend.py b/src/quark/modules/applications/qml/generative_modeling/mappings/CustomQiskitNoisyBackend.py index 55c4e23a..13d8c51b 100644 --- a/src/quark/modules/applications/qml/generative_modeling/mappings/CustomQiskitNoisyBackend.py +++ b/src/quark/modules/applications/qml/generative_modeling/mappings/CustomQiskitNoisyBackend.py @@ -26,9 +26,9 @@ from qiskit_aer import Aer, AerSimulator, noise from qiskit_aer.noise import NoiseModel -from modules.applications.qml.generative_modeling.training.QCBM import QCBM -from modules.applications.qml.generative_modeling.training.Inference import Inference -from modules.applications.qml.generative_modeling.mappings.LibraryGenerative import LibraryGenerative +from quark.modules.applications.qml.generative_modeling.training.QCBM import QCBM +from quark.modules.applications.qml.generative_modeling.training.Inference import Inference +from quark.modules.applications.qml.generative_modeling.mappings.LibraryGenerative import LibraryGenerative logging.getLogger("NoisyQiskit").setLevel(logging.WARNING) diff --git a/src/quark/modules/applications/qml/generative_modeling/mappings/LibraryGenerative.py b/src/quark/modules/applications/qml/generative_modeling/mappings/LibraryGenerative.py index d429f758..27ef14fa 100644 --- a/src/quark/modules/applications/qml/generative_modeling/mappings/LibraryGenerative.py +++ b/src/quark/modules/applications/qml/generative_modeling/mappings/LibraryGenerative.py @@ -16,9 +16,9 @@ import logging from typing import TypedDict -from utils import start_time_measurement, end_time_measurement -from modules.Core import Core -from modules.applications.qml.Model import Model +from quark.utils import start_time_measurement, end_time_measurement +from quark.modules.Core import Core +from quark.modules.applications.qml.Model import Model class LibraryGenerative(Core, Model, ABC): diff --git a/src/quark/modules/applications/qml/generative_modeling/mappings/LibraryPennylane.py b/src/quark/modules/applications/qml/generative_modeling/mappings/LibraryPennylane.py index 345133d7..abcd89e9 100644 --- a/src/quark/modules/applications/qml/generative_modeling/mappings/LibraryPennylane.py +++ b/src/quark/modules/applications/qml/generative_modeling/mappings/LibraryPennylane.py @@ -19,10 +19,10 @@ from jax import numpy as jnp import jax -from modules.applications.qml.generative_modeling.mappings.LibraryGenerative import LibraryGenerative -from modules.applications.qml.generative_modeling.training.Inference import Inference -from modules.applications.qml.generative_modeling.training.QGAN import QGAN -from modules.applications.qml.generative_modeling.training.QCBM import QCBM +from quark.modules.applications.qml.generative_modeling.mappings.LibraryGenerative import LibraryGenerative +from quark.modules.applications.qml.generative_modeling.training.Inference import Inference +from quark.modules.applications.qml.generative_modeling.training.QGAN import QGAN +from quark.modules.applications.qml.generative_modeling.training.QCBM import QCBM jax.config.update("jax_enable_x64", True) diff --git a/src/quark/modules/applications/qml/generative_modeling/mappings/LibraryQiskit.py b/src/quark/modules/applications/qml/generative_modeling/mappings/LibraryQiskit.py index 55f81d76..dc0de9f9 100644 --- a/src/quark/modules/applications/qml/generative_modeling/mappings/LibraryQiskit.py +++ b/src/quark/modules/applications/qml/generative_modeling/mappings/LibraryQiskit.py @@ -21,10 +21,10 @@ from qiskit.providers import Backend from qiskit.quantum_info import Statevector -from modules.applications.qml.generative_modeling.training.QCBM import QCBM -from modules.applications.qml.generative_modeling.training.QGAN import QGAN -from modules.applications.qml.generative_modeling.training.Inference import Inference -from modules.applications.qml.generative_modeling.mappings.LibraryGenerative import LibraryGenerative +from quark.modules.applications.qml.generative_modeling.training.QCBM import QCBM +from quark.modules.applications.qml.generative_modeling.training.QGAN import QGAN +from quark.modules.applications.qml.generative_modeling.training.Inference import Inference +from quark.modules.applications.qml.generative_modeling.mappings.LibraryGenerative import LibraryGenerative logging.getLogger("qiskit").setLevel(logging.WARNING) @@ -201,7 +201,7 @@ def select_backend(config: str, n_qubits: int) -> any: backend = Aer.get_backend('statevector_simulator') backend.set_options(device="CPU") elif config == "ionQ_Harmony": - from modules.devices.braket.Ionq import Ionq # pylint: disable=C0415 + from quark.modules.devices.braket.Ionq import Ionq # pylint: disable=C0415 from qiskit_braket_provider import AWSBraketBackend, AWSBraketProvider # pylint: disable=C0415 device_wrapper = Ionq("ionQ", "arn:aws:braket:::device/qpu/ionq/ionQdevice") backend = AWSBraketBackend( @@ -213,7 +213,7 @@ def select_backend(config: str, n_qubits: int) -> any: backend_version="2", ) elif config == "Amazon_SV1": - from modules.devices.braket.SV1 import SV1 # pylint: disable=C0415 + from quark.modules.devices.braket.SV1 import SV1 # pylint: disable=C0415 from qiskit_braket_provider import AWSBraketBackend, AWSBraketProvider # pylint: disable=C0415 device_wrapper = SV1("SV1", "arn:aws:braket:::device/quantum-simulator/amazon/sv1") backend = AWSBraketBackend( diff --git a/src/quark/modules/applications/qml/generative_modeling/mappings/PresetQiskitNoisyBackend.py b/src/quark/modules/applications/qml/generative_modeling/mappings/PresetQiskitNoisyBackend.py index 0730fbce..93ffdb97 100644 --- a/src/quark/modules/applications/qml/generative_modeling/mappings/PresetQiskitNoisyBackend.py +++ b/src/quark/modules/applications/qml/generative_modeling/mappings/PresetQiskitNoisyBackend.py @@ -23,9 +23,9 @@ from qiskit_aer import Aer, AerSimulator from qiskit_aer.noise import NoiseModel -from modules.applications.qml.generative_modeling.training.QCBM import QCBM -from modules.applications.qml.generative_modeling.training.Inference import Inference -from modules.applications.qml.generative_modeling.mappings.LibraryGenerative import LibraryGenerative +from quark.modules.applications.qml.generative_modeling.training.QCBM import QCBM +from quark.modules.applications.qml.generative_modeling.training.Inference import Inference +from quark.modules.applications.qml.generative_modeling.mappings.LibraryGenerative import LibraryGenerative logging.getLogger("NoisyQiskit").setLevel(logging.WARNING) diff --git a/src/quark/modules/applications/qml/generative_modeling/training/Inference.py b/src/quark/modules/applications/qml/generative_modeling/training/Inference.py index 1330efbb..c654e021 100644 --- a/src/quark/modules/applications/qml/generative_modeling/training/Inference.py +++ b/src/quark/modules/applications/qml/generative_modeling/training/Inference.py @@ -14,7 +14,7 @@ from typing import TypedDict import numpy as np -from modules.applications.qml.generative_modeling.training.TrainingGenerative import TrainingGenerative, Core, GPU +from quark.modules.applications.qml.generative_modeling.training.TrainingGenerative import TrainingGenerative, Core, GPU class Inference(TrainingGenerative): diff --git a/src/quark/modules/applications/qml/generative_modeling/training/QCBM.py b/src/quark/modules/applications/qml/generative_modeling/training/QCBM.py index a46db4b7..584ec5c5 100644 --- a/src/quark/modules/applications/qml/generative_modeling/training/QCBM.py +++ b/src/quark/modules/applications/qml/generative_modeling/training/QCBM.py @@ -21,8 +21,8 @@ from matplotlib import pyplot as plt from matplotlib import figure, axes -from modules.applications.qml.generative_modeling.training.TrainingGenerative import TrainingGenerative, Core, GPU -from utils_mpi import is_running_mpi, get_comm +from quark.modules.applications.qml.generative_modeling.training.TrainingGenerative import TrainingGenerative, Core, GPU +from quark.utils_mpi import is_running_mpi, get_comm matplotlib.use('Agg') MPI = is_running_mpi() diff --git a/src/quark/modules/applications/qml/generative_modeling/training/QGAN.py b/src/quark/modules/applications/qml/generative_modeling/training/QGAN.py index 6c862d13..941a3c0b 100644 --- a/src/quark/modules/applications/qml/generative_modeling/training/QGAN.py +++ b/src/quark/modules/applications/qml/generative_modeling/training/QGAN.py @@ -24,8 +24,8 @@ import matplotlib import matplotlib.pyplot as plt -from modules.applications.qml.generative_modeling.training.TrainingGenerative import TrainingGenerative, Core -from utils_mpi import is_running_mpi, get_comm +from quark.modules.applications.qml.generative_modeling.training.TrainingGenerative import TrainingGenerative, Core +from quark.utils_mpi import is_running_mpi, get_comm matplotlib.use('Agg') MPI = is_running_mpi() diff --git a/src/quark/modules/applications/qml/generative_modeling/training/TrainingGenerative.py b/src/quark/modules/applications/qml/generative_modeling/training/TrainingGenerative.py index bcd1d39b..5d792ac1 100644 --- a/src/quark/modules/applications/qml/generative_modeling/training/TrainingGenerative.py +++ b/src/quark/modules/applications/qml/generative_modeling/training/TrainingGenerative.py @@ -25,9 +25,9 @@ GPU = False logging.info("CuPy not available, using vanilla numpy, data processing on CPU") -from modules.Core import Core -from modules.applications.qml.Training import Training -from utils import start_time_measurement, end_time_measurement +from quark.modules.Core import Core +from quark.modules.applications.qml.Training import Training +from quark.utils import start_time_measurement, end_time_measurement class TrainingGenerative(Core, Training, ABC): diff --git a/src/quark/modules/applications/qml/generative_modeling/transformations/MinMax.py b/src/quark/modules/applications/qml/generative_modeling/transformations/MinMax.py index 1b895f23..42c38e48 100644 --- a/src/quark/modules/applications/qml/generative_modeling/transformations/MinMax.py +++ b/src/quark/modules/applications/qml/generative_modeling/transformations/MinMax.py @@ -15,9 +15,9 @@ from typing import Union import numpy as np -from modules.applications.qml.generative_modeling.transformations.Transformation import Transformation -from modules.applications.qml.generative_modeling.circuits.CircuitStandard import CircuitStandard -from modules.applications.qml.generative_modeling.circuits.CircuitCardinality import CircuitCardinality +from quark.modules.applications.qml.generative_modeling.transformations.Transformation import Transformation +from quark.modules.applications.qml.generative_modeling.circuits.CircuitStandard import CircuitStandard +from quark.modules.applications.qml.generative_modeling.circuits.CircuitCardinality import CircuitCardinality class MinMax(Transformation): # pylint: disable=R0902 diff --git a/src/quark/modules/applications/qml/generative_modeling/transformations/PIT.py b/src/quark/modules/applications/qml/generative_modeling/transformations/PIT.py index 415a137c..a40ce47c 100644 --- a/src/quark/modules/applications/qml/generative_modeling/transformations/PIT.py +++ b/src/quark/modules/applications/qml/generative_modeling/transformations/PIT.py @@ -15,8 +15,8 @@ import numpy as np import pandas as pd -from modules.applications.qml.generative_modeling.transformations.Transformation import Transformation -from modules.applications.qml.generative_modeling.circuits.CircuitCopula import CircuitCopula +from quark.modules.applications.qml.generative_modeling.transformations.Transformation import Transformation +from quark.modules.applications.qml.generative_modeling.circuits.CircuitCopula import CircuitCopula class PIT(Transformation): # pylint disable=R0902 diff --git a/src/quark/modules/applications/qml/generative_modeling/transformations/Transformation.py b/src/quark/modules/applications/qml/generative_modeling/transformations/Transformation.py index d76f4a2c..3ee4ba1e 100644 --- a/src/quark/modules/applications/qml/generative_modeling/transformations/Transformation.py +++ b/src/quark/modules/applications/qml/generative_modeling/transformations/Transformation.py @@ -17,8 +17,8 @@ import numpy as np -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class Transformation(Core, ABC): diff --git a/src/quark/modules/devices/Device.py b/src/quark/modules/devices/Device.py index a7d1b76e..813e796b 100644 --- a/src/quark/modules/devices/Device.py +++ b/src/quark/modules/devices/Device.py @@ -13,8 +13,8 @@ # limitations under the License. from abc import ABC -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class Device(Core, ABC): diff --git a/src/quark/modules/devices/HelperClass.py b/src/quark/modules/devices/HelperClass.py index a1d1e051..8af1774d 100644 --- a/src/quark/modules/devices/HelperClass.py +++ b/src/quark/modules/devices/HelperClass.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from modules.devices.Device import Device +from quark.modules.devices.Device import Device class HelperClass(Device): diff --git a/src/quark/modules/devices/Local.py b/src/quark/modules/devices/Local.py index 65ee88de..6ab6c83e 100644 --- a/src/quark/modules/devices/Local.py +++ b/src/quark/modules/devices/Local.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from modules.devices.Device import Device +from quark.modules.devices.Device import Device class Local(Device): diff --git a/src/quark/modules/devices/SimulatedAnnealingSampler.py b/src/quark/modules/devices/SimulatedAnnealingSampler.py index b51aab3e..8830bfe7 100644 --- a/src/quark/modules/devices/SimulatedAnnealingSampler.py +++ b/src/quark/modules/devices/SimulatedAnnealingSampler.py @@ -14,7 +14,7 @@ import dwave.samplers -from modules.devices.Device import Device +from quark.modules.devices.Device import Device class SimulatedAnnealingSampler(Device): diff --git a/src/quark/modules/devices/braket/Braket.py b/src/quark/modules/devices/braket/Braket.py index b70c8bd2..195e8014 100644 --- a/src/quark/modules/devices/braket/Braket.py +++ b/src/quark/modules/devices/braket/Braket.py @@ -23,7 +23,7 @@ from botocore.exceptions import ProfileNotFound from braket.aws import AwsSession -from modules.devices.Device import Device +from quark.modules.devices.Device import Device class Braket(Device, ABC): diff --git a/src/quark/modules/devices/braket/Ionq.py b/src/quark/modules/devices/braket/Ionq.py index d07a9cfa..b0b1a3d5 100644 --- a/src/quark/modules/devices/braket/Ionq.py +++ b/src/quark/modules/devices/braket/Ionq.py @@ -15,7 +15,7 @@ import os from braket.aws import AwsDevice -from modules.devices.braket.Braket import Braket +from quark.modules.devices.braket.Braket import Braket class Ionq(Braket): diff --git a/src/quark/modules/devices/braket/LocalSimulator.py b/src/quark/modules/devices/braket/LocalSimulator.py index df82288d..2c9ce760 100644 --- a/src/quark/modules/devices/braket/LocalSimulator.py +++ b/src/quark/modules/devices/braket/LocalSimulator.py @@ -14,7 +14,7 @@ from braket.devices import LocalSimulator as LocalSimulatorBraket -from modules.devices.braket.Braket import Braket +from quark.modules.devices.braket.Braket import Braket class LocalSimulator(Braket): diff --git a/src/quark/modules/devices/braket/OQC.py b/src/quark/modules/devices/braket/OQC.py index a5dd5f69..498dfd9f 100644 --- a/src/quark/modules/devices/braket/OQC.py +++ b/src/quark/modules/devices/braket/OQC.py @@ -15,7 +15,7 @@ import os from braket.aws import AwsDevice -from modules.devices.braket.Braket import Braket +from quark.modules.devices.braket.Braket import Braket class OQC(Braket): diff --git a/src/quark/modules/devices/braket/Rigetti.py b/src/quark/modules/devices/braket/Rigetti.py index d120811d..dd2b2985 100644 --- a/src/quark/modules/devices/braket/Rigetti.py +++ b/src/quark/modules/devices/braket/Rigetti.py @@ -15,7 +15,7 @@ import os from braket.aws import AwsDevice -from modules.devices.braket.Braket import Braket +from quark.modules.devices.braket.Braket import Braket class Rigetti(Braket): diff --git a/src/quark/modules/devices/braket/SV1.py b/src/quark/modules/devices/braket/SV1.py index 4258f46a..84f55f52 100644 --- a/src/quark/modules/devices/braket/SV1.py +++ b/src/quark/modules/devices/braket/SV1.py @@ -15,7 +15,7 @@ import os from braket.aws import AwsDevice -from modules.devices.braket.Braket import Braket +from quark.modules.devices.braket.Braket import Braket class SV1(Braket): diff --git a/src/quark/modules/devices/braket/TN1.py b/src/quark/modules/devices/braket/TN1.py index 44f499f5..d0cfa0e8 100644 --- a/src/quark/modules/devices/braket/TN1.py +++ b/src/quark/modules/devices/braket/TN1.py @@ -15,7 +15,7 @@ import os from braket.aws import AwsDevice -from modules.devices.braket.Braket import Braket +from quark.modules.devices.braket.Braket import Braket class TN1(Braket): diff --git a/src/quark/modules/devices/pulser/MockNeutralAtomDevice.py b/src/quark/modules/devices/pulser/MockNeutralAtomDevice.py index 9d5f0520..89bcadc4 100644 --- a/src/quark/modules/devices/pulser/MockNeutralAtomDevice.py +++ b/src/quark/modules/devices/pulser/MockNeutralAtomDevice.py @@ -20,7 +20,7 @@ from pulser.noise_model import NoiseModel from pulser.backend.config import EmulatorConfig -from modules.devices.pulser.Pulser import Pulser +from quark.modules.devices.pulser.Pulser import Pulser class MockNeutralAtomDevice(Pulser): diff --git a/src/quark/modules/devices/pulser/Pulser.py b/src/quark/modules/devices/pulser/Pulser.py index 11064cfc..fbea0e9e 100644 --- a/src/quark/modules/devices/pulser/Pulser.py +++ b/src/quark/modules/devices/pulser/Pulser.py @@ -14,7 +14,7 @@ from abc import ABC, abstractmethod -from modules.devices.Device import Device +from quark.modules.devices.Device import Device class Pulser(Device, ABC): diff --git a/src/quark/modules/devices/qrisp_simulator/QrispSimulator.py b/src/quark/modules/devices/qrisp_simulator/QrispSimulator.py index 18bdfc2b..7eaf4d6f 100644 --- a/src/quark/modules/devices/qrisp_simulator/QrispSimulator.py +++ b/src/quark/modules/devices/qrisp_simulator/QrispSimulator.py @@ -15,8 +15,8 @@ from abc import ABC from typing import TypedDict -from modules.Core import Core -from modules.devices.Device import Device +from quark.modules.Core import Core +from quark.modules.devices.Device import Device class QrispSimulator(Device, ABC): diff --git a/src/quark/modules/solvers/Annealer.py b/src/quark/modules/solvers/Annealer.py index ac08e540..e2c9c6e3 100644 --- a/src/quark/modules/solvers/Annealer.py +++ b/src/quark/modules/solvers/Annealer.py @@ -15,9 +15,9 @@ from typing import TypedDict import logging -from modules.solvers.Solver import Solver -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.solvers.Solver import Solver +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class Annealer(Solver): @@ -40,7 +40,7 @@ def get_default_submodule(self, option: str) -> Core: :return: Instance of the default submodule """ if option == "Simulated Annealer": - from modules.devices.SimulatedAnnealingSampler import SimulatedAnnealingSampler # pylint: disable=C0415 + from quark.modules.devices.SimulatedAnnealingSampler import SimulatedAnnealingSampler # pylint: disable=C0415 return SimulatedAnnealingSampler() else: raise NotImplementedError(f"Device Option {option} not implemented") diff --git a/src/quark/modules/solvers/ClassicalSAT.py b/src/quark/modules/solvers/ClassicalSAT.py index afc70f53..32dbcea4 100644 --- a/src/quark/modules/solvers/ClassicalSAT.py +++ b/src/quark/modules/solvers/ClassicalSAT.py @@ -18,9 +18,9 @@ from pysat.examples.rc2 import RC2 from pysat.formula import WCNF -from modules.solvers.Solver import Solver -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.solvers.Solver import Solver +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class ClassicalSAT(Solver): @@ -52,7 +52,7 @@ def get_default_submodule(self, option: str) -> Core: :return: Instance of the default submodule """ if option == "Local": - from modules.devices.Local import Local # pylint: disable=C0415 + from quark.modules.devices.Local import Local # pylint: disable=C0415 return Local() else: raise NotImplementedError(f"Device Option {option} not implemented") diff --git a/src/quark/modules/solvers/GreedyClassicalPVC.py b/src/quark/modules/solvers/GreedyClassicalPVC.py index 650d70cf..717050dd 100644 --- a/src/quark/modules/solvers/GreedyClassicalPVC.py +++ b/src/quark/modules/solvers/GreedyClassicalPVC.py @@ -16,9 +16,9 @@ import networkx as nx -from modules.solvers.Solver import Solver -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.solvers.Solver import Solver +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class GreedyClassicalPVC(Solver): @@ -50,7 +50,7 @@ def get_default_submodule(self, option: str) -> Core: :return: Instance of the default submodule """ if option == "Local": - from modules.devices.Local import Local # pylint: disable=C0415 + from quark.modules.devices.Local import Local # pylint: disable=C0415 return Local() else: raise NotImplementedError(f"Device Option {option} not implemented") diff --git a/src/quark/modules/solvers/GreedyClassicalTSP.py b/src/quark/modules/solvers/GreedyClassicalTSP.py index 528e48fb..bb8a054c 100644 --- a/src/quark/modules/solvers/GreedyClassicalTSP.py +++ b/src/quark/modules/solvers/GreedyClassicalTSP.py @@ -17,9 +17,9 @@ import networkx as nx from networkx.algorithms import approximation as approx -from modules.solvers.Solver import Solver -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.solvers.Solver import Solver +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class GreedyClassicalTSP(Solver): @@ -51,7 +51,7 @@ def get_default_submodule(self, option: str) -> Core: :return: Instance of the default submodule """ if option == "Local": - from modules.devices.Local import Local # pylint: disable=C0415 + from quark.modules.devices.Local import Local # pylint: disable=C0415 return Local() else: raise NotImplementedError(f"Device Option {option} not implemented") diff --git a/src/quark/modules/solvers/MIPsolverACL.py b/src/quark/modules/solvers/MIPsolverACL.py index b6b93493..715fbb90 100644 --- a/src/quark/modules/solvers/MIPsolverACL.py +++ b/src/quark/modules/solvers/MIPsolverACL.py @@ -30,9 +30,9 @@ from typing import TypedDict import pulp -from modules.solvers.Solver import Solver -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.solvers.Solver import Solver +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class MIPaclp(Solver): @@ -64,7 +64,7 @@ def get_default_submodule(self, option: str) -> Core: :return: Instance of the default submodule """ if option == "Local": - from modules.devices.Local import Local # pylint: disable=C0415 + from quark.modules.devices.Local import Local # pylint: disable=C0415 return Local() else: raise NotImplementedError(f"Device Option {option} not implemented") diff --git a/src/quark/modules/solvers/NeutralAtomMIS.py b/src/quark/modules/solvers/NeutralAtomMIS.py index 1820ece0..23fc1de5 100644 --- a/src/quark/modules/solvers/NeutralAtomMIS.py +++ b/src/quark/modules/solvers/NeutralAtomMIS.py @@ -18,9 +18,9 @@ import numpy as np import pulser -from modules.solvers.Solver import Solver -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.solvers.Solver import Solver +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class NeutralAtomMIS(Solver): @@ -52,7 +52,7 @@ def get_default_submodule(self, option: str) -> Core: :return: Instance of the default submodule """ if option == "MockNeutralAtomDevice": - from modules.devices.pulser.MockNeutralAtomDevice import MockNeutralAtomDevice # pylint: disable=C0415 + from quark.modules.devices.pulser.MockNeutralAtomDevice import MockNeutralAtomDevice # pylint: disable=C0415 return MockNeutralAtomDevice() else: raise NotImplementedError(f"Device Option {option} not implemented") diff --git a/src/quark/modules/solvers/PennylaneQAOA.py b/src/quark/modules/solvers/PennylaneQAOA.py index 79253176..0b191326 100644 --- a/src/quark/modules/solvers/PennylaneQAOA.py +++ b/src/quark/modules/solvers/PennylaneQAOA.py @@ -28,9 +28,9 @@ import pennylane as qml from pennylane import numpy as npqml -from modules.solvers.Solver import Solver -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.solvers.Solver import Solver +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement matplotlib.use('Agg') @@ -82,37 +82,37 @@ def get_default_submodule(self, option: str) -> Core: """ if option == "arn:aws:braket:us-east-1::device/qpu/ionq/Harmony": - from modules.devices.braket.Ionq import Ionq # pylint: disable=C0415 + from quark.modules.devices.braket.Ionq import Ionq # pylint: disable=C0415 return Ionq("ionq", "arn:aws:braket:us-east-1::device/qpu/ionq/Harmony") elif option == "arn:aws:braket:::device/quantum-simulator/amazon/sv1": - from modules.devices.braket.SV1 import SV1 # pylint: disable=C0415 + from quark.modules.devices.braket.SV1 import SV1 # pylint: disable=C0415 return SV1("SV1", "arn:aws:braket:::device/quantum-simulator/amazon/sv1") elif option == "arn:aws:braket:::device/quantum-simulator/amazon/tn1": - from modules.devices.braket.TN1 import TN1 # pylint: disable=C0415 + from quark.modules.devices.braket.TN1 import TN1 # pylint: disable=C0415 return TN1("TN1", "arn:aws:braket:::device/quantum-simulator/amazon/tn1") elif option == "arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3": - from modules.devices.braket.Rigetti import Rigetti # pylint: disable=C0415 + from quark.modules.devices.braket.Rigetti import Rigetti # pylint: disable=C0415 return Rigetti("Rigetti", "arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3") elif option == "arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy": - from modules.devices.braket.OQC import OQC # pylint: disable=C0415 + from quark.modules.devices.braket.OQC import OQC # pylint: disable=C0415 return OQC("OQC", "arn:aws:braket:eu-west-2::device/qpu/oqc/Lucy") elif option == "braket.local.qubit": - from modules.devices.HelperClass import HelperClass # pylint: disable=C0415 + from quark.modules.devices.HelperClass import HelperClass # pylint: disable=C0415 return HelperClass("braket.local.qubit") elif option == "default.qubit": - from modules.devices.HelperClass import HelperClass # pylint: disable=C0415 + from quark.modules.devices.HelperClass import HelperClass # pylint: disable=C0415 return HelperClass("default.qubit") elif option == "default.qubit.autograd": - from modules.devices.HelperClass import HelperClass # pylint: disable=C0415 + from quark.modules.devices.HelperClass import HelperClass # pylint: disable=C0415 return HelperClass("default.qubit.autograd") elif option == "qulacs.simulator": - from modules.devices.HelperClass import HelperClass # pylint: disable=C0415 + from quark.modules.devices.HelperClass import HelperClass # pylint: disable=C0415 return HelperClass("qulacs.simulator") elif option == "lightning.gpu": - from modules.devices.HelperClass import HelperClass # pylint: disable=C0415 + from quark.modules.devices.HelperClass import HelperClass # pylint: disable=C0415 return HelperClass("lightning.gpu") elif option == "lightning.qubit": - from modules.devices.HelperClass import HelperClass # pylint: disable=C0415 + from quark.modules.devices.HelperClass import HelperClass # pylint: disable=C0415 return HelperClass("lightning.qubit") else: raise NotImplementedError(f"Device Option {option} not implemented") diff --git a/src/quark/modules/solvers/QAOA.py b/src/quark/modules/solvers/QAOA.py index 4d0ffc88..f7626793 100644 --- a/src/quark/modules/solvers/QAOA.py +++ b/src/quark/modules/solvers/QAOA.py @@ -21,9 +21,9 @@ from braket.aws import AwsDevice from scipy.optimize import minimize -from modules.solvers.Solver import Solver -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.solvers.Solver import Solver +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class QAOA(Solver): @@ -65,19 +65,19 @@ def get_default_submodule(self, option: str) -> Core: """ if option == "arn:aws:braket:us-east-1::device/qpu/ionq/Harmony": - from modules.devices.braket.Ionq import Ionq # pylint: disable=C0415 + from quark.modules.devices.braket.Ionq import Ionq # pylint: disable=C0415 return Ionq("ionQ", "arn:aws:braket:us-east-1::device/qpu/ionq/Harmony") elif option == "arn:aws:braket:::device/quantum-simulator/amazon/sv1": - from modules.devices.braket.SV1 import SV1 # pylint: disable=C0415 + from quark.modules.devices.braket.SV1 import SV1 # pylint: disable=C0415 return SV1("SV1", "arn:aws:braket:::device/quantum-simulator/amazon/sv1") elif option == "arn:aws:braket:::device/quantum-simulator/amazon/tn1": - from modules.devices.braket.TN1 import TN1 # pylint: disable=C0415 + from quark.modules.devices.braket.TN1 import TN1 # pylint: disable=C0415 return TN1("TN1", "arn:aws:braket:::device/quantum-simulator/amazon/tn1") elif option == "arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3": - from modules.devices.braket.Rigetti import Rigetti # pylint: disable=C0415 + from quark.modules.devices.braket.Rigetti import Rigetti # pylint: disable=C0415 return Rigetti("Rigetti Aspen-9", "arn:aws:braket:us-west-1::device/qpu/rigetti/Aspen-M-3") elif option == "LocalSimulator": - from modules.devices.braket.LocalSimulator import LocalSimulator # pylint: disable=C0415 + from quark.modules.devices.braket.LocalSimulator import LocalSimulator # pylint: disable=C0415 return LocalSimulator("LocalSimulator") else: raise NotImplementedError(f"Device Option {option} not implemented") diff --git a/src/quark/modules/solvers/QiskitQAOA.py b/src/quark/modules/solvers/QiskitQAOA.py index 11e65c86..e985c5c2 100644 --- a/src/quark/modules/solvers/QiskitQAOA.py +++ b/src/quark/modules/solvers/QiskitQAOA.py @@ -24,9 +24,9 @@ from qiskit_algorithms.optimizers import POWELL, SPSA, COBYLA from qiskit_algorithms.minimum_eigensolvers import VQE, QAOA, NumPyMinimumEigensolver -from modules.solvers.Solver import Solver -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.solvers.Solver import Solver +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class QiskitQAOA(Solver): @@ -64,7 +64,7 @@ def get_default_submodule(self, option: str) -> Core: :return: Instance of the default submodule """ if option in ["qasm_simulator", "qasm_simulator_gpu"]: - from modules.devices.HelperClass import HelperClass # pylint: disable=C0415 + from quark.modules.devices.HelperClass import HelperClass # pylint: disable=C0415 return HelperClass(option) else: raise NotImplementedError(f"Device Option {option} not implemented") diff --git a/src/quark/modules/solvers/QrispQIRO.py b/src/quark/modules/solvers/QrispQIRO.py index 5b0cf859..1e0cadab 100644 --- a/src/quark/modules/solvers/QrispQIRO.py +++ b/src/quark/modules/solvers/QrispQIRO.py @@ -25,8 +25,8 @@ ) from qrisp.qaoa import create_max_indep_set_cl_cost_function -from modules.solvers.Solver import Solver, Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.solvers.Solver import Solver, Core +from quark.utils import start_time_measurement, end_time_measurement class QIROSolver(Solver): @@ -59,7 +59,7 @@ def get_default_submodule(self, option: str) -> Core: :raises NotImplemented: If the provided option is not implemented """ if option == "qrisp_simulator": - from modules.devices.qrisp_simulator.QrispSimulator import QrispSimulator # pylint: disable=C0415 + from quark.modules.devices.qrisp_simulator.QrispSimulator import QrispSimulator # pylint: disable=C0415 return QrispSimulator() # pylint: disable=E1102 else: diff --git a/src/quark/modules/solvers/RandomClassicalPVC.py b/src/quark/modules/solvers/RandomClassicalPVC.py index 05fd819d..285c9f2f 100644 --- a/src/quark/modules/solvers/RandomClassicalPVC.py +++ b/src/quark/modules/solvers/RandomClassicalPVC.py @@ -16,9 +16,9 @@ import random import networkx as nx -from modules.solvers.Solver import Solver -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.solvers.Solver import Solver +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class RandomPVC(Solver): @@ -50,7 +50,7 @@ def get_default_submodule(self, option: str) -> Core: :return: Instance of the default submodule """ if option == "Local": - from modules.devices.Local import Local # pylint: disable=C0415 + from quark.modules.devices.Local import Local # pylint: disable=C0415 return Local() else: raise NotImplementedError(f"Device Option {option} not implemented") diff --git a/src/quark/modules/solvers/RandomClassicalSAT.py b/src/quark/modules/solvers/RandomClassicalSAT.py index 4dc94dea..994da458 100644 --- a/src/quark/modules/solvers/RandomClassicalSAT.py +++ b/src/quark/modules/solvers/RandomClassicalSAT.py @@ -19,9 +19,9 @@ from pysat.formula import WCNF -from modules.solvers.Solver import Solver -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.solvers.Solver import Solver +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class RandomSAT(Solver): @@ -50,7 +50,7 @@ def get_requirements() -> list[dict]: def get_default_submodule(self, option: str) -> Core: if option == "Local": - from modules.devices.Local import Local # pylint: disable=C0415 + from quark.modules.devices.Local import Local # pylint: disable=C0415 return Local() else: raise NotImplementedError(f"Device Option {option} not implemented") diff --git a/src/quark/modules/solvers/RandomClassicalTSP.py b/src/quark/modules/solvers/RandomClassicalTSP.py index 19a79b6d..eaec1dcb 100644 --- a/src/quark/modules/solvers/RandomClassicalTSP.py +++ b/src/quark/modules/solvers/RandomClassicalTSP.py @@ -16,9 +16,9 @@ import random import networkx as nx -from modules.solvers.Solver import Solver -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.solvers.Solver import Solver +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class RandomTSP(Solver): @@ -44,7 +44,7 @@ def get_requirements() -> list[dict]: def get_default_submodule(self, option: str) -> Core: if option == "Local": - from modules.devices.Local import Local # pylint: disable=C0415 + from quark.modules.devices.Local import Local # pylint: disable=C0415 return Local() else: raise NotImplementedError(f"Device Option {option} not implemented") diff --git a/src/quark/modules/solvers/ReverseGreedyClassicalPVC.py b/src/quark/modules/solvers/ReverseGreedyClassicalPVC.py index 8f60ed4a..22004cb4 100644 --- a/src/quark/modules/solvers/ReverseGreedyClassicalPVC.py +++ b/src/quark/modules/solvers/ReverseGreedyClassicalPVC.py @@ -16,9 +16,9 @@ import networkx as nx -from modules.solvers.Solver import Solver -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.solvers.Solver import Solver +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class ReverseGreedyClassicalPVC(Solver): @@ -41,7 +41,7 @@ def get_default_submodule(self, option: str) -> Core: :return: Instance of the default submodule """ if option == "Local": - from modules.devices.Local import Local # pylint: disable=C0415 + from quark.modules.devices.Local import Local # pylint: disable=C0415 return Local() else: raise NotImplementedError(f"Device Option {option} not implemented") diff --git a/src/quark/modules/solvers/ReverseGreedyClassicalTSP.py b/src/quark/modules/solvers/ReverseGreedyClassicalTSP.py index e53784be..e88db9d9 100644 --- a/src/quark/modules/solvers/ReverseGreedyClassicalTSP.py +++ b/src/quark/modules/solvers/ReverseGreedyClassicalTSP.py @@ -17,9 +17,9 @@ import networkx as nx from networkx.algorithms import approximation as approx -from modules.solvers.Solver import Solver -from modules.Core import Core -from utils import start_time_measurement, end_time_measurement +from quark.modules.solvers.Solver import Solver +from quark.modules.Core import Core +from quark.utils import start_time_measurement, end_time_measurement class ReverseGreedyClassicalTSP(Solver): @@ -52,7 +52,7 @@ def get_default_submodule(self, option: str) -> Core: :return: Instance of the default submodule """ if option == "Local": - from modules.devices.Local import Local # pylint: disable=C0415 + from quark.modules.devices.Local import Local # pylint: disable=C0415 return Local() else: raise NotImplementedError(f"Device Option {option} not implemented") diff --git a/src/quark/modules/solvers/Solver.py b/src/quark/modules/solvers/Solver.py index 30238f6d..80cc075e 100644 --- a/src/quark/modules/solvers/Solver.py +++ b/src/quark/modules/solvers/Solver.py @@ -13,7 +13,7 @@ # limitations under the License. from abc import ABC, abstractmethod -from modules.Core import Core +from quark.modules.Core import Core class Solver(Core, ABC): diff --git a/src/quark/quark2_adapter/adapters.py b/src/quark/quark2_adapter/adapters.py index 6e864738..71e19611 100644 --- a/src/quark/quark2_adapter/adapters.py +++ b/src/quark/quark2_adapter/adapters.py @@ -18,15 +18,15 @@ import logging from time import time -from modules.Core import Core -from modules.applications.Application import Application as Application_NEW -from modules.applications.Mapping import Mapping as Mapping_NEW -from modules.solvers.Solver import Solver as Solver_NEW -from modules.devices.Device import Device as Device_NEW -from quark2_adapter.legacy_classes.Application import Application as Application_OLD -from quark2_adapter.legacy_classes.Mapping import Mapping as Mapping_OLD -from quark2_adapter.legacy_classes.Solver import Solver as Solver_OLD -from quark2_adapter.legacy_classes.Device import Device as Device_OLD +from quark.modules.Core import Core +from quark.modules.applications.Application import Application as Application_NEW +from quark.modules.applications.Mapping import Mapping as Mapping_NEW +from quark.modules.solvers.Solver import Solver as Solver_NEW +from quark.modules.devices.Device import Device as Device_NEW +from quark.quark2_adapter.legacy_classes.Application import Application as Application_OLD +from quark.quark2_adapter.legacy_classes.Mapping import Mapping as Mapping_OLD +from quark.quark2_adapter.legacy_classes.Solver import Solver as Solver_OLD +from quark.quark2_adapter.legacy_classes.Device import Device as Device_OLD WARNING_MSG = 'Class "%s" is inheriting from deprecated base class. Please refactor your class.' diff --git a/src/quark/quark2_adapter/legacy_classes/Application.py b/src/quark/quark2_adapter/legacy_classes/Application.py index f3aa8a19..312eeb36 100644 --- a/src/quark/quark2_adapter/legacy_classes/Application.py +++ b/src/quark/quark2_adapter/legacy_classes/Application.py @@ -15,7 +15,7 @@ from abc import ABC, abstractmethod from typing import final -from utils import _get_instance_with_sub_options +from quark.utils import _get_instance_with_sub_options class Application(ABC): diff --git a/src/quark/quark2_adapter/legacy_classes/Mapping.py b/src/quark/quark2_adapter/legacy_classes/Mapping.py index 05e0d716..1551050c 100644 --- a/src/quark/quark2_adapter/legacy_classes/Mapping.py +++ b/src/quark/quark2_adapter/legacy_classes/Mapping.py @@ -13,7 +13,7 @@ # limitations under the License. from abc import ABC, abstractmethod -from utils import _get_instance_with_sub_options +from quark.utils import _get_instance_with_sub_options class Mapping(ABC): diff --git a/src/quark/quark2_adapter/legacy_classes/Solver.py b/src/quark/quark2_adapter/legacy_classes/Solver.py index 07ad5ee2..62091b04 100644 --- a/src/quark/quark2_adapter/legacy_classes/Solver.py +++ b/src/quark/quark2_adapter/legacy_classes/Solver.py @@ -13,7 +13,7 @@ # limitations under the License. from abc import ABC, abstractmethod -from utils import _get_instance_with_sub_options +from quark.utils import _get_instance_with_sub_options class Solver(ABC): diff --git a/tests/modules/applications/optimization/ACL/mappings/test_ISING.py b/tests/modules/applications/optimization/ACL/mappings/test_ISING.py index 81916969..6fe0fe8e 100644 --- a/tests/modules/applications/optimization/ACL/mappings/test_ISING.py +++ b/tests/modules/applications/optimization/ACL/mappings/test_ISING.py @@ -2,7 +2,7 @@ import numpy as np from qiskit_optimization import QuadraticProgram -from modules.applications.optimization.ACL.mappings.ISING import Ising +from quark.modules.applications.optimization.ACL.mappings.ISING import Ising class TestIsing(unittest.TestCase): diff --git a/tests/modules/applications/optimization/ACL/mappings/test_QUBO.py b/tests/modules/applications/optimization/ACL/mappings/test_QUBO.py index 98bd0dc3..e7cd49a5 100644 --- a/tests/modules/applications/optimization/ACL/mappings/test_QUBO.py +++ b/tests/modules/applications/optimization/ACL/mappings/test_QUBO.py @@ -2,7 +2,7 @@ import numpy as np from qiskit_optimization import QuadraticProgram -from modules.applications.optimization.ACL.mappings.QUBO import Qubo +from quark.modules.applications.optimization.ACL.mappings.QUBO import Qubo class TestQubo(unittest.TestCase): diff --git a/tests/modules/applications/optimization/ACL/test_ACL.py b/tests/modules/applications/optimization/ACL/test_ACL.py index 3b28c15b..7f9b386f 100644 --- a/tests/modules/applications/optimization/ACL/test_ACL.py +++ b/tests/modules/applications/optimization/ACL/test_ACL.py @@ -2,7 +2,7 @@ import os import pandas as pd from tempfile import TemporaryDirectory -from modules.applications.optimization.ACL.ACL import ACL +from quark.modules.applications.optimization.ACL.ACL import ACL class TestACL(unittest.TestCase): diff --git a/tests/modules/applications/optimization/MIS/mappings/test_NeutralAtom.py b/tests/modules/applications/optimization/MIS/mappings/test_NeutralAtom.py index f543ff76..c1616498 100644 --- a/tests/modules/applications/optimization/MIS/mappings/test_NeutralAtom.py +++ b/tests/modules/applications/optimization/MIS/mappings/test_NeutralAtom.py @@ -1,7 +1,7 @@ import unittest import pickle -from modules.applications.optimization.MIS.mappings.NeutralAtom import NeutralAtom +from quark.modules.applications.optimization.MIS.mappings.NeutralAtom import NeutralAtom class TestNeutralAtom(unittest.TestCase): diff --git a/tests/modules/applications/optimization/MIS/test_MIS.py b/tests/modules/applications/optimization/MIS/test_MIS.py index 2230a96f..0eb0768d 100644 --- a/tests/modules/applications/optimization/MIS/test_MIS.py +++ b/tests/modules/applications/optimization/MIS/test_MIS.py @@ -4,7 +4,7 @@ from tempfile import TemporaryDirectory import logging -from modules.applications.optimization.MIS.MIS import MIS +from quark.modules.applications.optimization.MIS.MIS import MIS class TestMIS(unittest.TestCase): diff --git a/tests/modules/applications/optimization/PVC/mappings/test_ISING.py b/tests/modules/applications/optimization/PVC/mappings/test_ISING.py index 89067c82..61a4b0e2 100644 --- a/tests/modules/applications/optimization/PVC/mappings/test_ISING.py +++ b/tests/modules/applications/optimization/PVC/mappings/test_ISING.py @@ -2,8 +2,8 @@ import numpy as np import pickle -from modules.applications.optimization.PVC.mappings.ISING import Ising -from modules.applications.optimization.PVC.mappings.QUBO import QUBO +from quark.modules.applications.optimization.PVC.mappings.ISING import Ising +from quark.modules.applications.optimization.PVC.mappings.QUBO import QUBO class TestIsing(unittest.TestCase): diff --git a/tests/modules/applications/optimization/PVC/mappings/test_QUBO.py b/tests/modules/applications/optimization/PVC/mappings/test_QUBO.py index 16b57ad6..18849139 100644 --- a/tests/modules/applications/optimization/PVC/mappings/test_QUBO.py +++ b/tests/modules/applications/optimization/PVC/mappings/test_QUBO.py @@ -1,7 +1,7 @@ import unittest import pickle -from modules.applications.optimization.PVC.mappings.QUBO import QUBO +from quark.modules.applications.optimization.PVC.mappings.QUBO import QUBO class TestQUBO(unittest.TestCase): diff --git a/tests/modules/applications/optimization/PVC/test_PVC.py b/tests/modules/applications/optimization/PVC/test_PVC.py index cb492a0a..83fd0b56 100644 --- a/tests/modules/applications/optimization/PVC/test_PVC.py +++ b/tests/modules/applications/optimization/PVC/test_PVC.py @@ -3,7 +3,7 @@ from tempfile import TemporaryDirectory from networkx import Graph -from modules.applications.optimization.PVC.PVC import PVC +from quark.modules.applications.optimization.PVC.PVC import PVC class TestPVC(unittest.TestCase): diff --git a/tests/modules/applications/optimization/SAT/mappings/test_ChoiISING.py b/tests/modules/applications/optimization/SAT/mappings/test_ChoiISING.py index 77279480..923a075b 100644 --- a/tests/modules/applications/optimization/SAT/mappings/test_ChoiISING.py +++ b/tests/modules/applications/optimization/SAT/mappings/test_ChoiISING.py @@ -2,7 +2,7 @@ import numpy as np from nnf import Var, And, Or -from modules.applications.optimization.SAT.mappings.ChoiISING import ChoiIsing +from quark.modules.applications.optimization.SAT.mappings.ChoiISING import ChoiIsing class TestChoiIsing(unittest.TestCase): diff --git a/tests/modules/applications/optimization/SAT/mappings/test_ChoiQUBO.py b/tests/modules/applications/optimization/SAT/mappings/test_ChoiQUBO.py index 7d599f5a..cf858d6f 100644 --- a/tests/modules/applications/optimization/SAT/mappings/test_ChoiQUBO.py +++ b/tests/modules/applications/optimization/SAT/mappings/test_ChoiQUBO.py @@ -1,7 +1,7 @@ import unittest from nnf import Var, And, Or -from modules.applications.optimization.SAT.mappings.ChoiQUBO import ChoiQUBO +from quark.modules.applications.optimization.SAT.mappings.ChoiQUBO import ChoiQUBO class TestChoiQUBO(unittest.TestCase): diff --git a/tests/modules/applications/optimization/SAT/mappings/test_DinneenISING.py b/tests/modules/applications/optimization/SAT/mappings/test_DinneenISING.py index 2d12fe66..17bc67f3 100644 --- a/tests/modules/applications/optimization/SAT/mappings/test_DinneenISING.py +++ b/tests/modules/applications/optimization/SAT/mappings/test_DinneenISING.py @@ -2,7 +2,7 @@ import numpy as np from nnf import Var, And, Or -from modules.applications.optimization.SAT.mappings.DinneenISING import DinneenIsing +from quark.modules.applications.optimization.SAT.mappings.DinneenISING import DinneenIsing class TestDinneenIsing(unittest.TestCase): diff --git a/tests/modules/applications/optimization/SAT/mappings/test_DinneenQUBO.py b/tests/modules/applications/optimization/SAT/mappings/test_DinneenQUBO.py index 9f518cb6..08dd05ac 100644 --- a/tests/modules/applications/optimization/SAT/mappings/test_DinneenQUBO.py +++ b/tests/modules/applications/optimization/SAT/mappings/test_DinneenQUBO.py @@ -1,7 +1,7 @@ import unittest from nnf import Var, And, Or -from modules.applications.optimization.SAT.mappings.DinneenQUBO import DinneenQUBO +from quark.modules.applications.optimization.SAT.mappings.DinneenQUBO import DinneenQUBO class TestDinneenQUBO(unittest.TestCase): diff --git a/tests/modules/applications/optimization/SAT/mappings/test_Direct.py b/tests/modules/applications/optimization/SAT/mappings/test_Direct.py index 736a4fa0..0b1d16df 100644 --- a/tests/modules/applications/optimization/SAT/mappings/test_Direct.py +++ b/tests/modules/applications/optimization/SAT/mappings/test_Direct.py @@ -2,7 +2,7 @@ from nnf import And, Var, Or from pysat.formula import WCNF -from modules.applications.optimization.SAT.mappings.Direct import Direct +from quark.modules.applications.optimization.SAT.mappings.Direct import Direct class TestDirect(unittest.TestCase): diff --git a/tests/modules/applications/optimization/SAT/mappings/test_QubovertQUBO.py b/tests/modules/applications/optimization/SAT/mappings/test_QubovertQUBO.py index b614daa0..7ae3c48b 100644 --- a/tests/modules/applications/optimization/SAT/mappings/test_QubovertQUBO.py +++ b/tests/modules/applications/optimization/SAT/mappings/test_QubovertQUBO.py @@ -1,7 +1,7 @@ import unittest from nnf import Var, And, Or -from modules.applications.optimization.SAT.mappings.QubovertQUBO import QubovertQUBO +from quark.modules.applications.optimization.SAT.mappings.QubovertQUBO import QubovertQUBO class TestQubovertQUBO(unittest.TestCase): diff --git a/tests/modules/applications/optimization/SAT/test_SAT.py b/tests/modules/applications/optimization/SAT/test_SAT.py index d166b641..fee0b86b 100644 --- a/tests/modules/applications/optimization/SAT/test_SAT.py +++ b/tests/modules/applications/optimization/SAT/test_SAT.py @@ -3,7 +3,7 @@ import nnf from tempfile import TemporaryDirectory -from modules.applications.optimization.SAT.SAT import SAT +from quark.modules.applications.optimization.SAT.SAT import SAT class TestSAT(unittest.TestCase): diff --git a/tests/modules/applications/optimization/SCP/mappings/test_qubovertQUBO.py b/tests/modules/applications/optimization/SCP/mappings/test_qubovertQUBO.py index 65634e0d..0537658a 100644 --- a/tests/modules/applications/optimization/SCP/mappings/test_qubovertQUBO.py +++ b/tests/modules/applications/optimization/SCP/mappings/test_qubovertQUBO.py @@ -1,6 +1,6 @@ import unittest -from modules.applications.optimization.SCP.mappings.qubovertQUBO import QubovertQUBO +from quark.modules.applications.optimization.SCP.mappings.qubovertQUBO import QubovertQUBO class TestQubovertQUBO(unittest.TestCase): diff --git a/tests/modules/applications/optimization/SCP/test_SCP.py b/tests/modules/applications/optimization/SCP/test_SCP.py index 57f52ec8..f6133e2b 100644 --- a/tests/modules/applications/optimization/SCP/test_SCP.py +++ b/tests/modules/applications/optimization/SCP/test_SCP.py @@ -3,7 +3,7 @@ import pickle from tempfile import TemporaryDirectory -from modules.applications.optimization.SCP.SCP import SCP +from quark.modules.applications.optimization.SCP.SCP import SCP class TestSCP(unittest.TestCase): diff --git a/tests/modules/applications/optimization/TSP/mappings/test_ISING.py b/tests/modules/applications/optimization/TSP/mappings/test_ISING.py index 078ec47b..5f6e71a8 100644 --- a/tests/modules/applications/optimization/TSP/mappings/test_ISING.py +++ b/tests/modules/applications/optimization/TSP/mappings/test_ISING.py @@ -2,7 +2,7 @@ import networkx as nx import numpy as np -from modules.applications.optimization.TSP.mappings.ISING import Ising +from quark.modules.applications.optimization.TSP.mappings.ISING import Ising class TestIsing(unittest.TestCase): diff --git a/tests/modules/applications/optimization/TSP/mappings/test_QUBO.py b/tests/modules/applications/optimization/TSP/mappings/test_QUBO.py index 419e7cd1..382b90a1 100644 --- a/tests/modules/applications/optimization/TSP/mappings/test_QUBO.py +++ b/tests/modules/applications/optimization/TSP/mappings/test_QUBO.py @@ -1,7 +1,7 @@ import unittest import networkx as nx -from modules.applications.optimization.TSP.mappings.QUBO import QUBO +from quark.modules.applications.optimization.TSP.mappings.QUBO import QUBO class TestQUBO(unittest.TestCase): diff --git a/tests/modules/applications/optimization/TSP/test_TSP.py b/tests/modules/applications/optimization/TSP/test_TSP.py index d6906a0b..08bac49e 100644 --- a/tests/modules/applications/optimization/TSP/test_TSP.py +++ b/tests/modules/applications/optimization/TSP/test_TSP.py @@ -5,7 +5,7 @@ from tempfile import TemporaryDirectory import logging -from modules.applications.optimization.TSP.TSP import TSP +from quark.modules.applications.optimization.TSP.TSP import TSP class TestTSP(unittest.TestCase): diff --git a/tests/modules/applications/qml/generative_modeling/circuits/test_CircuitCardinality.py b/tests/modules/applications/qml/generative_modeling/circuits/test_CircuitCardinality.py index 72198f37..029fcb3f 100644 --- a/tests/modules/applications/qml/generative_modeling/circuits/test_CircuitCardinality.py +++ b/tests/modules/applications/qml/generative_modeling/circuits/test_CircuitCardinality.py @@ -1,6 +1,6 @@ import unittest -from modules.applications.qml.generative_modeling.circuits.CircuitCardinality import CircuitCardinality +from quark.modules.applications.qml.generative_modeling.circuits.CircuitCardinality import CircuitCardinality class TestCircuitCardinality(unittest.TestCase): diff --git a/tests/modules/applications/qml/generative_modeling/circuits/test_CircuitCopula.py b/tests/modules/applications/qml/generative_modeling/circuits/test_CircuitCopula.py index 66744a07..e767a45f 100644 --- a/tests/modules/applications/qml/generative_modeling/circuits/test_CircuitCopula.py +++ b/tests/modules/applications/qml/generative_modeling/circuits/test_CircuitCopula.py @@ -1,6 +1,6 @@ import unittest -from modules.applications.qml.generative_modeling.circuits.CircuitCopula import CircuitCopula +from quark.modules.applications.qml.generative_modeling.circuits.CircuitCopula import CircuitCopula class TestCircuitCopula(unittest.TestCase): diff --git a/tests/modules/applications/qml/generative_modeling/circuits/test_CircuitStandard.py b/tests/modules/applications/qml/generative_modeling/circuits/test_CircuitStandard.py index 9a285ce6..ee0670fc 100644 --- a/tests/modules/applications/qml/generative_modeling/circuits/test_CircuitStandard.py +++ b/tests/modules/applications/qml/generative_modeling/circuits/test_CircuitStandard.py @@ -1,6 +1,6 @@ import unittest -from modules.applications.qml.generative_modeling.circuits.CircuitStandard import CircuitStandard +from quark.modules.applications.qml.generative_modeling.circuits.CircuitStandard import CircuitStandard class TestCircuitStandard(unittest.TestCase): diff --git a/tests/modules/applications/qml/generative_modeling/data/data_handler/test_ContinuousData.py b/tests/modules/applications/qml/generative_modeling/data/data_handler/test_ContinuousData.py index 044d3bf7..e9c87227 100644 --- a/tests/modules/applications/qml/generative_modeling/data/data_handler/test_ContinuousData.py +++ b/tests/modules/applications/qml/generative_modeling/data/data_handler/test_ContinuousData.py @@ -2,7 +2,7 @@ from unittest.mock import patch import numpy as np -from modules.applications.qml.generative_modeling.data.data_handler.ContinuousData import ContinuousData +from quark.modules.applications.qml.generative_modeling.data.data_handler.ContinuousData import ContinuousData class TestContinuousData(unittest.TestCase): diff --git a/tests/modules/applications/qml/generative_modeling/data/data_handler/test_DiscreteData.py b/tests/modules/applications/qml/generative_modeling/data/data_handler/test_DiscreteData.py index c8a421db..97cba478 100644 --- a/tests/modules/applications/qml/generative_modeling/data/data_handler/test_DiscreteData.py +++ b/tests/modules/applications/qml/generative_modeling/data/data_handler/test_DiscreteData.py @@ -2,9 +2,9 @@ from unittest.mock import MagicMock import numpy as np -from modules.applications.qml.generative_modeling.data.data_handler.DiscreteData import DiscreteData -from modules.applications.qml.generative_modeling.circuits.CircuitCardinality import CircuitCardinality -from modules.applications.qml.generative_modeling.metrics.MetricsGeneralization import MetricsGeneralization +from quark.modules.applications.qml.generative_modeling.data.data_handler.DiscreteData import DiscreteData +from quark.modules.applications.qml.generative_modeling.circuits.CircuitCardinality import CircuitCardinality +from quark.modules.applications.qml.generative_modeling.metrics.MetricsGeneralization import MetricsGeneralization class TestDiscreteData(unittest.TestCase): diff --git a/tests/modules/applications/qml/generative_modeling/mappings/test_CustomQiskitNoisyBackend.py b/tests/modules/applications/qml/generative_modeling/mappings/test_CustomQiskitNoisyBackend.py index 2b1ed57e..d76f7f51 100644 --- a/tests/modules/applications/qml/generative_modeling/mappings/test_CustomQiskitNoisyBackend.py +++ b/tests/modules/applications/qml/generative_modeling/mappings/test_CustomQiskitNoisyBackend.py @@ -6,7 +6,7 @@ from qiskit_aer.noise import NoiseModel from qiskit.transpiler import CouplingMap -from modules.applications.qml.generative_modeling.mappings.CustomQiskitNoisyBackend import CustomQiskitNoisyBackend +from quark.modules.applications.qml.generative_modeling.mappings.CustomQiskitNoisyBackend import CustomQiskitNoisyBackend class TestCustomQiskitNoisyBackend(unittest.TestCase): diff --git a/tests/modules/applications/qml/generative_modeling/mappings/test_LibraryPennylane.py b/tests/modules/applications/qml/generative_modeling/mappings/test_LibraryPennylane.py index 65c181ad..93b99ae7 100644 --- a/tests/modules/applications/qml/generative_modeling/mappings/test_LibraryPennylane.py +++ b/tests/modules/applications/qml/generative_modeling/mappings/test_LibraryPennylane.py @@ -2,10 +2,10 @@ from unittest.mock import patch, MagicMock import numpy as np -from modules.applications.qml.generative_modeling.mappings.LibraryPennylane import LibraryPennylane -from modules.applications.qml.generative_modeling.training.QCBM import QCBM -from modules.applications.qml.generative_modeling.training.QGAN import QGAN -from modules.applications.qml.generative_modeling.training.Inference import Inference +from quark.modules.applications.qml.generative_modeling.mappings.LibraryPennylane import LibraryPennylane +from quark.modules.applications.qml.generative_modeling.training.QCBM import QCBM +from quark.modules.applications.qml.generative_modeling.training.QGAN import QGAN +from quark.modules.applications.qml.generative_modeling.training.Inference import Inference class TestLibraryPennylane(unittest.TestCase): diff --git a/tests/modules/applications/qml/generative_modeling/mappings/test_LibraryQiskit.py b/tests/modules/applications/qml/generative_modeling/mappings/test_LibraryQiskit.py index afafe1d1..7288074f 100644 --- a/tests/modules/applications/qml/generative_modeling/mappings/test_LibraryQiskit.py +++ b/tests/modules/applications/qml/generative_modeling/mappings/test_LibraryQiskit.py @@ -4,10 +4,10 @@ import numpy as np from qiskit_aer import AerSimulator -from modules.applications.qml.generative_modeling.mappings.LibraryQiskit import LibraryQiskit -from modules.applications.qml.generative_modeling.training.QCBM import QCBM -from modules.applications.qml.generative_modeling.training.QGAN import QGAN -from modules.applications.qml.generative_modeling.training.Inference import Inference +from quark.modules.applications.qml.generative_modeling.mappings.LibraryQiskit import LibraryQiskit +from quark.modules.applications.qml.generative_modeling.training.QCBM import QCBM +from quark.modules.applications.qml.generative_modeling.training.QGAN import QGAN +from quark.modules.applications.qml.generative_modeling.training.Inference import Inference class TestLibraryQiskit(unittest.TestCase): diff --git a/tests/modules/applications/qml/generative_modeling/mappings/test_PresetQiskitNoisyBackend.py b/tests/modules/applications/qml/generative_modeling/mappings/test_PresetQiskitNoisyBackend.py index 841f0aec..306b254f 100644 --- a/tests/modules/applications/qml/generative_modeling/mappings/test_PresetQiskitNoisyBackend.py +++ b/tests/modules/applications/qml/generative_modeling/mappings/test_PresetQiskitNoisyBackend.py @@ -5,7 +5,7 @@ from qiskit import QuantumCircuit from qiskit_aer import AerSimulator -from modules.applications.qml.generative_modeling.mappings.PresetQiskitNoisyBackend import PresetQiskitNoisyBackend +from quark.modules.applications.qml.generative_modeling.mappings.PresetQiskitNoisyBackend import PresetQiskitNoisyBackend class TestPresetQiskitNoisyBackend(unittest.TestCase): @@ -31,8 +31,8 @@ def test_get_requirements(self): self.assertEqual(requirements, expected_requirements) def test_get_default_submodule(self): - from modules.applications.qml.generative_modeling.training.QCBM import QCBM - from modules.applications.qml.generative_modeling.training.Inference import Inference + from quark.modules.applications.qml.generative_modeling.training.QCBM import QCBM + from quark.modules.applications.qml.generative_modeling.training.Inference import Inference submodule = self.backend_instance.get_default_submodule("QCBM") self.assertIsInstance(submodule, QCBM) diff --git a/tests/modules/applications/qml/generative_modeling/metrics/test_MetricsGeneralization.py b/tests/modules/applications/qml/generative_modeling/metrics/test_MetricsGeneralization.py index dbe00b3e..8e44b411 100644 --- a/tests/modules/applications/qml/generative_modeling/metrics/test_MetricsGeneralization.py +++ b/tests/modules/applications/qml/generative_modeling/metrics/test_MetricsGeneralization.py @@ -2,7 +2,7 @@ import numpy as np import math -from modules.applications.qml.generative_modeling.metrics.MetricsGeneralization import MetricsGeneralization +from quark.modules.applications.qml.generative_modeling.metrics.MetricsGeneralization import MetricsGeneralization class TestMetricsGeneralization(unittest.TestCase): diff --git a/tests/modules/applications/qml/generative_modeling/training/test_Inference.py b/tests/modules/applications/qml/generative_modeling/training/test_Inference.py index 218c7f91..4669ad97 100644 --- a/tests/modules/applications/qml/generative_modeling/training/test_Inference.py +++ b/tests/modules/applications/qml/generative_modeling/training/test_Inference.py @@ -2,7 +2,7 @@ from unittest.mock import MagicMock, patch import numpy as np -from modules.applications.qml.generative_modeling.training.Inference import Inference +from quark.modules.applications.qml.generative_modeling.training.Inference import Inference class TestInference(unittest.TestCase): diff --git a/tests/modules/applications/qml/generative_modeling/training/test_QCBM.py b/tests/modules/applications/qml/generative_modeling/training/test_QCBM.py index a1f433d9..ad32033c 100644 --- a/tests/modules/applications/qml/generative_modeling/training/test_QCBM.py +++ b/tests/modules/applications/qml/generative_modeling/training/test_QCBM.py @@ -3,7 +3,7 @@ import numpy as np import matplotlib.pyplot as plt -from modules.applications.qml.generative_modeling.training.QCBM import QCBM +from quark.modules.applications.qml.generative_modeling.training.QCBM import QCBM class TestQCBM(unittest.TestCase): diff --git a/tests/modules/applications/qml/generative_modeling/training/test_QGAN.py b/tests/modules/applications/qml/generative_modeling/training/test_QGAN.py index bc389b6f..63093bb0 100644 --- a/tests/modules/applications/qml/generative_modeling/training/test_QGAN.py +++ b/tests/modules/applications/qml/generative_modeling/training/test_QGAN.py @@ -3,7 +3,7 @@ import numpy as np import torch from torch.utils.data import DataLoader -from modules.applications.qml.generative_modeling.training.QGAN import QGAN, Discriminator, QuantumGenerator +from quark.modules.applications.qml.generative_modeling.training.QGAN import QGAN, Discriminator, QuantumGenerator class TestQGAN(unittest.TestCase): diff --git a/tests/modules/applications/qml/generative_modeling/transformation/test_MinMax.py b/tests/modules/applications/qml/generative_modeling/transformation/test_MinMax.py index b80f444f..70f429c2 100644 --- a/tests/modules/applications/qml/generative_modeling/transformation/test_MinMax.py +++ b/tests/modules/applications/qml/generative_modeling/transformation/test_MinMax.py @@ -2,10 +2,10 @@ import numpy as np from unittest.mock import patch, MagicMock -from modules.applications.qml.generative_modeling.transformations.Transformation import Transformation -from modules.applications.qml.generative_modeling.transformations.MinMax import MinMax -from modules.applications.qml.generative_modeling.circuits.CircuitStandard import CircuitStandard -from modules.applications.qml.generative_modeling.circuits.CircuitCardinality import CircuitCardinality +from quark.modules.applications.qml.generative_modeling.transformations.Transformation import Transformation +from quark.modules.applications.qml.generative_modeling.transformations.MinMax import MinMax +from quark.modules.applications.qml.generative_modeling.circuits.CircuitStandard import CircuitStandard +from quark.modules.applications.qml.generative_modeling.circuits.CircuitCardinality import CircuitCardinality class TestMinMax(unittest.TestCase): diff --git a/tests/modules/applications/qml/generative_modeling/transformation/test_PIT.py b/tests/modules/applications/qml/generative_modeling/transformation/test_PIT.py index 964cdb5a..455ab89d 100644 --- a/tests/modules/applications/qml/generative_modeling/transformation/test_PIT.py +++ b/tests/modules/applications/qml/generative_modeling/transformation/test_PIT.py @@ -2,8 +2,8 @@ import numpy as np from unittest.mock import MagicMock -from modules.applications.qml.generative_modeling.transformations.PIT import PIT -from modules.applications.qml.generative_modeling.circuits.CircuitCopula import CircuitCopula +from quark.modules.applications.qml.generative_modeling.transformations.PIT import PIT +from quark.modules.applications.qml.generative_modeling.circuits.CircuitCopula import CircuitCopula class TestPIT(unittest.TestCase): diff --git a/tests/test_BenchmarkManager.py b/tests/test_BenchmarkManager.py index 3ee70732..fb7a70ab 100644 --- a/tests/test_BenchmarkManager.py +++ b/tests/test_BenchmarkManager.py @@ -4,7 +4,7 @@ import os from datetime import datetime -from src.BenchmarkManager import BenchmarkManager, Instruction +from quark.BenchmarkManager import BenchmarkManager, Instruction class TestBenchmarkManager(unittest.TestCase): diff --git a/tests/test_ConfigManager.py b/tests/test_ConfigManager.py index a5adafb9..afb7b7db 100644 --- a/tests/test_ConfigManager.py +++ b/tests/test_ConfigManager.py @@ -1,8 +1,8 @@ import unittest from unittest.mock import patch, MagicMock -from modules.Core import Core -from src.ConfigManager import ConfigManager +from quark.modules.Core import Core +from quark.ConfigManager import ConfigManager class TestConfigManager(unittest.TestCase): diff --git a/tests/test_Main.py b/tests/test_Main.py index 0ab2e6fb..cd4ae79a 100644 --- a/tests/test_Main.py +++ b/tests/test_Main.py @@ -16,7 +16,7 @@ import argparse import unittest -from main import handle_benchmark_run, create_benchmark_parser +from quark.__main__ import handle_benchmark_run, create_benchmark_parser class TestMain(unittest.TestCase):