Skip to content

Commit efbe872

Browse files
authored
Extractor and Injector async models fixed (#881)
* Fixes to injector and extractor async models Signed-off-by: bamsumit <bam_sumit@hotmail.com> * Deletd redundant time increase Signed-off-by: bamsumit <bam_sumit@hotmail.com> --------- Signed-off-by: bamsumit <bam_sumit@hotmail.com>
1 parent d22e829 commit efbe872

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

src/lava/proc/io/extractor.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,25 +130,22 @@ def run_spk(self) -> None:
130130
@requires(CPU)
131131
class PyLoihiExtractorModelAsync(PyAsyncProcessModel):
132132
in_port: PyInPort = LavaPyType(PyInPort.VEC_DENSE, float)
133+
out_port: PyOutPort = LavaPyType(PyOutPort.VEC_DENSE, float)
133134

134135
def __init__(self, proc_params: dict) -> None:
135136
super().__init__(proc_params=proc_params)
136137

137138
channel_config = self.proc_params["channel_config"]
138-
self._pm_to_p_src_port = self.proc_params["pm_to_p_src_port"]
139-
self._pm_to_p_src_port.start()
140139

141140
self._send = channel_config.get_send_full_function()
142141
self.time_step = 1
143142

144143
def run_async(self) -> None:
145144
while self.time_step != self.num_steps + 1:
146-
self._send(self._pm_to_p_src_port, self.in_port.recv())
145+
self._send(self.out_port.csp_ports[-1],
146+
self.in_port.recv())
147147
self.time_step += 1
148148

149-
def __del__(self) -> None:
150-
self._pm_to_p_src_port.join()
151-
152149

153150
class VarWire(AbstractProcess):
154151
"""VarWire allows non-Lava code, such as a third-party Python library

src/lava/proc/io/injector.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ class Injector(AbstractProcess):
4646
buffer is full and how the dst_port behaves when the buffer is empty
4747
and not empty.
4848
"""
49+
4950
def __init__(self,
5051
shape: ty.Tuple[int, ...],
5152
buffer_size: ty.Optional[int] = 50,
@@ -133,16 +134,14 @@ def __del__(self) -> None:
133134
@requires(CPU)
134135
class PyLoihiInjectorModelAsync(PyAsyncProcessModel):
135136
"""PyAsyncProcessModel for the Injector Process."""
137+
in_port: PyInPort = LavaPyType(PyInPort.VEC_DENSE, float)
136138
out_port: PyOutPort = LavaPyType(PyOutPort.VEC_DENSE, float)
137139

138140
def __init__(self, proc_params: dict) -> None:
139141
super().__init__(proc_params=proc_params)
140142

141143
shape = self.proc_params["shape"]
142144
channel_config = self.proc_params["channel_config"]
143-
self._p_to_pm_dst_port = self.proc_params["p_to_pm_dst_port"]
144-
self._p_to_pm_dst_port.start()
145-
146145
self._zeros = np.zeros(shape)
147146

148147
self._receive_when_empty = channel_config.get_receive_empty_function()
@@ -153,17 +152,18 @@ def __init__(self, proc_params: dict) -> None:
153152
def run_async(self) -> None:
154153
while self.time_step != self.num_steps + 1:
155154
self._zeros.fill(0)
156-
elements_in_buffer = self._p_to_pm_dst_port._queue.qsize()
155+
elements_in_buffer = self.in_port.csp_ports[-1]._queue.qsize()
157156

158157
if elements_in_buffer == 0:
159158
data = self._receive_when_empty(
160-
self._p_to_pm_dst_port,
159+
self.in_port,
161160
self._zeros)
162161
else:
163162
data = self._receive_when_not_empty(
164-
self._p_to_pm_dst_port,
163+
self.in_port,
165164
self._zeros,
166165
elements_in_buffer)
166+
167167
self.out_port.send(data)
168168
self.time_step += 1
169169

0 commit comments

Comments
 (0)