Merge pull request #93 from superplay1/lib

Restructured model (moved 1 up) and chip, task (moved to libraries). Updated relevant imports.

c3/experiment.py

@@ -21,7 +21,7 @@
 from c3.generator.generator import Generator
 from c3.parametermap import ParameterMap
 from c3.signal.gates import Instruction
-from c3.system.model import Model
+from c3.model import Model
 from c3.utils.tf_utils import (
     tf_batch_propagate,
     tf_propagation_lind,

c3/main.py

@@ -10,7 +10,7 @@
 import tensorflow as tf
 from c3.parametermap import ParameterMap
 from c3.experiment import Experiment
-from c3.system.model import Model
+from c3.model import Model
 from c3.generator.generator import Generator
 
 logging.getLogger("tensorflow").disabled = True

c3/system/model.py → c3/model.py

@@ -7,7 +7,7 @@
 import tensorflow as tf
 import c3.utils.tf_utils as tf_utils
 import c3.utils.qt_utils as qt_utils
-from c3.system.chip import device_lib, Drive
+from c3.libraries.chip import device_lib, Drive
 from typing import List, Tuple
 
 

examples/blackbox_exp.py

@@ -1,16 +1,16 @@
 import copy
 import numpy as np
-from c3.system.model import Model as Mdl
+from c3.model import Model as Mdl
 from c3.c3objs import Quantity as Qty
 from c3.experiment import Experiment as Exp
 from c3.generator.generator import Generator as Gnr
 import c3.signal.gates as gates
-import c3.system.chip as chip
+import c3.libraries.chip as chip
 import c3.generator.devices as devices
 import c3.libraries.hamiltonians as hamiltonians
 import c3.signal.pulse as pulse
 import c3.libraries.envelopes as envelopes
-import c3.system.tasks as tasks
+import c3.libraries.tasks as tasks
 
 
 def create_experiment():

examples/single_qubit_blackbox_exp.py

@@ -1,17 +1,17 @@
 import copy
 import numpy as np
-from c3.system.model import Model as Mdl
+from c3.model import Model as Mdl
 from c3.c3objs import Quantity as Qty
 from c3.parametermap import ParameterMap as PMap
 from c3.experiment import Experiment as Exp
 from c3.generator.generator import Generator as Gnr
 import c3.signal.gates as gates
-import c3.system.chip as chip
+import c3.libraries.chip as chip
 import c3.generator.devices as devices
 import c3.libraries.hamiltonians as hamiltonians
 import c3.signal.pulse as pulse
 import c3.libraries.envelopes as envelopes
-import c3.system.tasks as tasks
+import c3.libraries.tasks as tasks
 
 
 def create_experiment():

examples/two_qubits.ipynb

@@ -50,15 +50,15 @@
     "from c3.c3objs import Quantity as Qty\n",
     "from c3.parametermap import ParameterMap as PMap\n",
     "from c3.experiment import Experiment as Exp\n",
-    "from c3.system.model import Model as Mdl\n",
+    "from c3.model import Model as Mdl\n",
     "from c3.generator.generator import Generator as Gnr\n",
     "\n",
     "# Building blocks\n",
     "import c3.generator.devices as devices\n",
     "import c3.signal.gates as gates\n",
-    "import c3.system.chip as chip\n",
+    "import c3.libraries.chip as chip\n",
     "import c3.signal.pulse as pulse\n",
-    "import c3.system.tasks as tasks\n",
+    "import c3.libraries.tasks as tasks\n",
     "\n",
     "# Libs and helpers\n",
     "import c3.libraries.algorithms as algorithms\n",
@@ -379,7 +379,7 @@
    "metadata": {},
    "source": [
     "#### Control signals\n",
-    "With the system model taken care of, we now specify the control electronics and signal chain. Complex shaped controls are often realized by creating an envelope signal with an arbitrary waveform generator (AWG) with limited bandwith and mixing it with a fast, stable local oscillator (LO)."
+    "With the model taken care of, we now specify the control electronics and signal chain. Complex shaped controls are often realized by creating an envelope signal with an arbitrary waveform generator (AWG) with limited bandwith and mixing it with a fast, stable local oscillator (LO)."
    ]
   },
   {
@@ -1477,4 +1477,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

test/test_instruction.py

@@ -7,7 +7,7 @@
 from c3.libraries.envelopes import envelopes
 from c3.parametermap import ParameterMap
 from c3.signal import gates, pulse
-from c3.system.model import Model
+from c3.model import Model
 import numpy as np
 import pytest
 

test/test_model.py

@@ -5,9 +5,9 @@
 import pytest
 import numpy as np
 from c3.c3objs import Quantity
-from c3.system.chip import Qubit, Coupling, Drive
-from c3.system.tasks import InitialiseGround, ConfusionMatrix
-from c3.system.model import Model
+from c3.libraries.chip import Qubit, Coupling, Drive
+from c3.libraries.tasks import InitialiseGround, ConfusionMatrix
+from c3.model import Model
 import c3.libraries.hamiltonians as hamiltonians
 from c3.parametermap import ParameterMap
 

test/test_noise.py

@@ -7,12 +7,12 @@
 from c3.optimizers.optimizer import TensorBoardLogger
 from c3.parametermap import ParameterMap as Pmap
 from c3.experiment import Experiment as Exp
-from c3.system.model import Model as Mdl
+from c3.model import Model as Mdl
 from c3.generator.generator import Generator as Gnr
 
 # Building blocks
 import c3.generator.devices as devices
-import c3.system.chip as chip
+import c3.libraries.chip as chip
 import c3.signal.pulse as pulse
 import c3.signal.gates as gates
 

test/test_parsers.py

@@ -4,7 +4,7 @@
 from c3.libraries.envelopes import envelopes
 from c3.signal.gates import Instruction
 from c3.signal.pulse import Envelope, Carrier
-from c3.system.model import Model
+from c3.model import Model
 from c3.generator.generator import Generator
 from c3.parametermap import ParameterMap
 from c3.experiment import Experiment as Exp

test/test_three_wave_mixer.py

@@ -5,9 +5,9 @@
 import pytest
 import numpy as np
 from c3.c3objs import Quantity
-from c3.system.chip import SNAIL, Drive
-from c3.system.tasks import InitialiseGround, ConfusionMatrix
-from c3.system.model import Model
+from c3.libraries.chip import SNAIL, Drive
+from c3.libraries.tasks import InitialiseGround, ConfusionMatrix
+from c3.model import Model
 import c3.libraries.hamiltonians as hamiltonians
 
 qubit_lvls = 3

test/test_tunable_coupler.py

@@ -13,19 +13,18 @@
 from c3.c3objs import Quantity as Qty
 from c3.parametermap import ParameterMap as PMap
 from c3.experiment import Experiment as Exp
-from c3.system.model import Model as Mdl
+from c3.model import Model as Mdl
 from c3.generator.generator import Generator as Gnr
 
 # Building blocks
 import c3.generator.devices as devices
 import c3.signal.gates as gates
-import c3.system.chip as chip
 import c3.signal.pulse as pulse
 
 # Libs and helpers
 import c3.libraries.hamiltonians as hamiltonians
 import c3.libraries.envelopes as envelopes
-
+import c3.libraries.chip as chip
 
 lindblad = False
 dressed = True

test/test_two_qubits.py

@@ -12,15 +12,15 @@
 from c3.c3objs import Quantity as Qty
 from c3.parametermap import ParameterMap as Pmap
 from c3.experiment import Experiment as Exp
-from c3.system.model import Model as Mdl
+from c3.model import Model as Mdl
 from c3.generator.generator import Generator as Gnr
 
 # Building blocks
 import c3.generator.devices as devices
-import c3.system.chip as chip
+import c3.libraries.chip as chip
 import c3.signal.pulse as pulse
 import c3.signal.gates as gates
-import c3.system.tasks as tasks
+import c3.libraries.tasks as tasks
 
 # Libs and helpers
 import c3.libraries.algorithms as algorithms