Clean up host

Author: Bart van der Vecht

squidasm/qoala/lang/lhr.py

@@ -1,19 +1,26 @@
 import abc
 from dataclasses import dataclass
 from enum import Enum, auto
-from typing import Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 
 from netqasm.lang.instr import NetQASMInstruction
 from netqasm.lang.instr.flavour import NVFlavour
 from netqasm.lang.operand import Template
 from netqasm.lang.parsing.text import parse_text_subroutine
 from netqasm.lang.subroutine import Subroutine
 
-from squidasm.qoala.runtime.program import ProgramContext, ProgramMeta
-
 LhrValue = Union[int, Template]
 
 
+@dataclass
+class ProgramMeta:
+    name: str
+    parameters: Dict[str, Any]
+    csockets: List[str]
+    epr_sockets: List[str]
+    max_qubits: int
+
+
 class LhrInstructionType(Enum):
     CC = 0
     CL = auto()
@@ -362,9 +369,6 @@ def __str__(self) -> str:
         # return "\n".join("  " + i for i in instrs)
         return "\n".join("  " + str(i) for i in self.instructions)
 
-    def compile(self, context: ProgramContext) -> None:
-        raise NotImplementedError
-
 
 class EndOfTextException(Exception):
     pass

squidasm/qoala/runtime/program.py

@@ -4,7 +4,6 @@
 
 from netqasm.sdk.classical_communication.socket import Socket
 from netqasm.sdk.connection import BaseNetQASMConnection
-from netqasm.sdk.epr_socket import EPRSocket
 
 from squidasm.qoala.lang.lhr import LhrProgram
 
@@ -14,12 +13,10 @@ def __init__(
         self,
         netqasm_connection: BaseNetQASMConnection,
         csockets: Dict[str, Socket],
-        epr_sockets: Dict[str, EPRSocket],
         app_id: int,
     ):
         self._connection = netqasm_connection
         self._csockets = csockets
-        self._epr_sockets = epr_sockets
         self._app_id = app_id
 
     @property
@@ -30,31 +27,11 @@ def connection(self) -> BaseNetQASMConnection:
     def csockets(self) -> Dict[str, Socket]:
         return self._csockets
 
-    @property
-    def epr_sockets(self) -> Dict[str, EPRSocket]:
-        return self._epr_sockets
-
     @property
     def app_id(self) -> int:
         return self._app_id
 
 
-@dataclass
-class ProgramMeta:
-    name: str
-    parameters: Dict[str, Any]
-    csockets: List[str]
-    epr_sockets: List[str]
-    max_qubits: int
-
-
-class Program(abc.ABC):
-    @property
-    def meta(self) -> ProgramMeta:
-        raise NotImplementedError
-
-    def run(self, context: ProgramContext) -> Dict[str, Any]:
-        raise NotImplementedError
 
 
 @dataclass

squidasm/qoala/sim/host.py

@@ -57,8 +57,7 @@ def setup(self) -> Generator[EventExpression, None, None]:
             compiler=self._host._compiler,
         )
 
-        # Create EPR sockets that can be used by the program SDK code.
-        epr_sockets: Dict[int, EPRSocket] = {}
+        # Open the EPR sockets required by the program.
         for i, remote_name in enumerate(prog_meta.epr_sockets):
             remote_id = None
 
@@ -72,8 +71,6 @@ def setup(self) -> Generator[EventExpression, None, None]:
             self._host.send_qnos_msg(
                 bytes(OpenEPRSocketMessage(self._app_id, i, remote_id))
             )
-            epr_sockets[remote_name] = EPRSocket(remote_name, i)
-            epr_sockets[remote_name].conn = conn
 
         # Create classical sockets that can be used by the program SDK code.
         classical_sockets: Dict[int, ClassicalSocket] = {}
@@ -94,7 +91,6 @@ def setup(self) -> Generator[EventExpression, None, None]:
         self._context = ProgramContext(
             netqasm_connection=conn,
             csockets=classical_sockets,
-            epr_sockets=epr_sockets,
             app_id=self._app_id,
         )