Skip to content

Commit 7d7355b

Browse files
committed
Fixed lint and merge issues
1 parent 08667c8 commit 7d7355b

File tree

4 files changed

+5
-17
lines changed

4 files changed

+5
-17
lines changed

src/lava/magma/runtime/message_infrastructure/multiprocessing.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import multiprocessing as mp
2020
import traceback
2121

22-
from lava.magma.compiler.channels.interfaces import ChannelType, Channel
23-
2422
try:
2523
from lava.magma.core.model.c.type import LavaTypeTransfer
2624
except ImportError:

src/lava/magma/runtime/runtime.py

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
SupportTempChannel,
1717
Selector,
1818
getTempSendPort,
19-
getTempRecvPort)
19+
getTempRecvPort,
20+
AbstractTransferPort)
2021

2122
from lava.magma.compiler.var_model import AbstractVarModel, LoihiSynapseVarModel
2223
from lava.magma.runtime.message_infrastructure.message_interface_enum import \
2324
ActorType
2425
from lava.magma.runtime.message_infrastructure.factory import \
2526
MessageInfrastructureFactory
26-
from lava.magma.runtime.\
27+
from lava.magma.runtime. \
2728
message_infrastructure.message_infrastructure_interface import \
2829
MessageInfrastructureInterface
2930
from lava.magma.runtime.mgmt_token_enums import (MGMT_COMMAND, MGMT_RESPONSE,
@@ -132,8 +133,7 @@ def __init__(self,
132133
self._req_stop: bool = False
133134
self.runtime_to_service: ty.Iterable[SendPort] = []
134135
self.service_to_runtime: ty.Iterable[RecvPort] = []
135-
self._open_ports: ty.List[AbstractCspPort] = []
136-
136+
self._open_ports: ty.List[AbstractTransferPort] = []
137137

138138
def __del__(self):
139139
"""On destruction, terminate Runtime automatically to
@@ -462,11 +462,6 @@ def set_var(self, var_id: int, value: np.ndarray, idx: np.ndarray = None):
462462
buffer: np.ndarray = value
463463
if idx:
464464
buffer = buffer[idx]
465-
buffer_shape: ty.Tuple[int, ...] = buffer.shape
466-
num_items: int = np.prod(buffer_shape).item()
467-
reshape_order = 'F' if isinstance(
468-
ev, LoihiSynapseVarModel) else 'C'
469-
buffer = buffer.reshape((1, num_items), order=reshape_order)
470465

471466
if SupportTempChannel:
472467
addr_path = rsp_port.recv()
@@ -543,10 +538,7 @@ def get_var(self, var_id: int, idx: np.ndarray = None) -> np.ndarray:
543538
reshape_order = 'F' if isinstance(ev, LoihiSynapseVarModel) \
544539
else 'C'
545540
buffer = buffer.reshape(ev.shape, order=reshape_order)
546-
# 3. Reshape result and return
547-
reshape_order = 'F' if isinstance(
548-
ev, LoihiSynapseVarModel) else 'C'
549-
buffer = buffer.reshape(ev.shape, order=reshape_order)
541+
550542
if idx:
551543
return buffer[idx]
552544
else:

tests/lava/magma/compiler/builders/test_builder.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
)
3232

3333

34-
3534
class MockMessageInterface:
3635
def __init__(self, smm):
3736
self.smm = smm

tests/lava/magma/compiler/test_channel_builder.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
)
2323

2424

25-
2625
class MockMessageInterface:
2726
def __init__(self, smm):
2827
self.smm = smm

0 commit comments

Comments
 (0)