Make the native teleport example work

Author: dieriver

examples/nativeMode/teleport/aliceTest.py

@@ -32,8 +32,9 @@
 
 from simulaqron.local.setup import setup_local, assemble_qubit
 from simulaqron.general.host_config import SocketsConfig
+from simulaqron.settings.network_config import NodeConfigType
 from simulaqron.toolbox.stabilizer_states import StabilizerState
-from simulaqron.settings import simulaqron_settings
+from simulaqron.settings import simulaqron_settings, network_config, LOCAL_SIMULAQRON_SETTINGS, LOCAL_NETWORK_SETTINGS
 from twisted.internet.defer import inlineCallbacks
 from twisted.spread import pb
 from twisted.internet import reactor
@@ -73,7 +74,7 @@ def runClientNode(qReg, virtRoot, myName, classicalNet):
         realRho, imagRho = yield q1.callRemote("get_qubit")
         state = np.array(assemble_qubit(realRho, imagRho), dtype=complex)
     elif simulaqron_settings.sim_backend.value == "projectq":
-        realvec, imagvec = yield virtRoot.callRemote("get_register_RI", q1)
+        _, (realvec, imagvec) = yield virtRoot.callRemote("get_register_RI", q1)
         state = [r + (1j * j) for r, j in zip(realvec, imagvec)]
     elif simulaqron_settings.sim_backend.value == "stabilizer":
         array, _ = yield virtRoot.callRemote("get_register_RI", q1)
@@ -148,14 +149,20 @@ def main():
     myName = "Alice"
 
     # This file defines the network of virtual quantum nodes
-    network_file = simulaqron_settings.network_config_file
+    # network_file = simulaqron_settings.network_config_file
+    # virtualNet = SocketsConfig(network_file)
 
     # This file defines the nodes acting as servers in the classical communication network
-    classicalFile = "classicalNet.cfg"
+    # classicalFile = "classicalNet.cfg"
+    # classicalNet = SocketsConfig(classicalFile)
+
+    # We load the local configuration files
+    simulaqron_settings.load_from_file(LOCAL_SIMULAQRON_SETTINGS)
+    network_config.read_from_file(LOCAL_NETWORK_SETTINGS)
 
     # Read configuration files for the virtual quantum, as well as the classical network
-    virtualNet = SocketsConfig(network_file)
-    classicalNet = SocketsConfig(classicalFile)
+    virtualNet = SocketsConfig(network_config, config_type=NodeConfigType.VNODE)
+    classicalNet = SocketsConfig(network_config, config_type=NodeConfigType.APP)
 
     # Check if we should run a local classical server. If so, initialize the code
     # to handle remote connections on the classical communication network

examples/nativeMode/teleport/bobTest.py

@@ -33,7 +33,8 @@
 
 from simulaqron.local.setup import setup_local, assemble_qubit
 from simulaqron.general.host_config import SocketsConfig
-from simulaqron.settings import simulaqron_settings
+from simulaqron.settings import simulaqron_settings, network_config, LOCAL_SIMULAQRON_SETTINGS, LOCAL_NETWORK_SETTINGS
+from simulaqron.settings.network_config import NodeConfigType
 from simulaqron.toolbox.stabilizer_states import StabilizerState
 from twisted.internet.defer import inlineCallbacks
 from twisted.spread import pb
@@ -116,7 +117,7 @@ def remote_recover_teleport(self, a, b, virtualNum):
             (realRho, imagRho) = yield eprB.callRemote("get_qubit")
             state = np.array(assemble_qubit(realRho, imagRho), dtype=complex)
         elif simulaqron_settings.sim_backend.value == "projectq":
-            realvec, imagvec = yield self.virtRoot.callRemote("get_register_RI", eprB)
+            _, (realvec, imagvec) = yield self.virtRoot.callRemote("get_register_RI", eprB)
             state = [r + (1j * j) for r, j in zip(realvec, imagvec)]
         elif simulaqron_settings.sim_backend.value == "stabilizer":
             array, _, = yield self.virtRoot.callRemote("get_register_RI", eprB)
@@ -137,14 +138,20 @@ def main():
     myName = "Bob"
 
     # This file defines the network of virtual quantum nodes
-    network_file = simulaqron_settings.network_config_file
+    # network_file = simulaqron_settings.network_config_file
+    # virtualNet = SocketsConfig(network_file)
 
     # This file defines the nodes acting as servers in the classical communication network
-    classicalFile = "classicalNet.cfg"
+    # classicalFile = "classicalNet.cfg"
+    # classicalNet = SocketsConfig(classicalFile)
+
+    # We load the local configuration files
+    simulaqron_settings.load_from_file(LOCAL_SIMULAQRON_SETTINGS)
+    network_config.read_from_file(LOCAL_NETWORK_SETTINGS)
 
     # Read configuration files for the virtual quantum, as well as the classical network
-    virtualNet = SocketsConfig(network_file)
-    classicalNet = SocketsConfig(classicalFile)
+    virtualNet = SocketsConfig(network_config, config_type=NodeConfigType.VNODE)
+    classicalNet = SocketsConfig(network_config, config_type=NodeConfigType.APP)
 
     # Check if we should run a local classical server. If so, initialize the code
     # to handle remote connections on the classical communication network

simulaqron/local/setup.py

@@ -80,8 +80,8 @@ def setup_local(myName: str, virtualNet: SocketsConfig, classicalNet: SocketsCon
     # If we are listed as a server node for the classical network, start this server
     if myName in classicalNet.hostDict:
         try:
-            _logger.debug("LOCAL %s: Starting local classical communication server.", myName)
             nb = classicalNet.hostDict[myName]
+            _logger.debug("LOCAL %s: Starting local classical communication server (%s: %s, %d).", myName, nb.name, nb.hostname, nb.port)
             nb.root = lNode
             nb.factory = pb.PBServerFactory(nb.root)
             reactor.listenTCP(nb.port, nb.factory)
@@ -93,8 +93,8 @@ def setup_local(myName: str, virtualNet: SocketsConfig, classicalNet: SocketsCon
     time.sleep(3)
 
     # Connect to the local virtual node simulating the "local" qubits
-    _logger.debug("LOCAL %s: Connecting to local virtual node.", myName)
     node = virtualNet.hostDict[myName]
+    _logger.debug("LOCAL %s: Connecting to local virtual node (%s: %s, %d).", myName, node.name, node.hostname, node.port)
     factory = pb.PBClientFactory()
     reactor.connectTCP(node.hostname, node.port, factory)
     deferVirtual = factory.getRootObject()
@@ -104,7 +104,7 @@ def setup_local(myName: str, virtualNet: SocketsConfig, classicalNet: SocketsCon
     for node in classicalNet.hostDict:
         nb = classicalNet.hostDict[node]
         if nb.name != myName:
-            _logger.debug("LOCAL %s: Making classical connection to %s.", myName, nb.name)
+            _logger.debug("LOCAL %s: Making classical connection to %s (%s: %s, %d).", myName, nb.name, nb.name, nb.hostname, nb.port)
             nb.factory = pb.PBClientFactory()
             reactor.connectTCP(nb.hostname, nb.port, nb.factory)
             dList.append(nb.factory.getRootObject())