Skip to content

Commit 3aa87e9

Browse files
authored
Remove NDTP protocol implementation (#168)
1 parent 5aa8ef1 commit 3aa87e9

11 files changed

Lines changed: 62 additions & 1217 deletions

File tree

setup.py

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,9 @@
1-
from setuptools import setup, find_packages, Extension
2-
from Cython.Build import cythonize
1+
from setuptools import setup, find_packages
32
from pathlib import Path
4-
import os
5-
6-
extra_compile_args = []
7-
if os.name == "nt": # Windows
8-
extra_compile_args = ["/w"]
9-
else: # macOS and Linux
10-
extra_compile_args = [
11-
"-Wno-unreachable-code",
12-
"-Wno-unreachable-code-fallthrough",
13-
"-O3",
14-
]
153

164
this_directory = Path(__file__).parent
175
long_description = (this_directory / "README.md").read_text()
186

19-
extensions = [
20-
Extension(
21-
"synapse.utils.ndtp",
22-
["synapse/utils/ndtp.pyx"],
23-
extra_compile_args=extra_compile_args,
24-
),
25-
]
26-
277
setup(
288
name="science-synapse",
299
version="2.4.0",
@@ -33,14 +13,9 @@
3313
packages=find_packages(include=["synapse", "synapse.*"]),
3414
long_description=long_description,
3515
long_description_content_type="text/markdown",
36-
ext_modules=cythonize(
37-
extensions,
38-
compiler_directives={"language_level": "3"},
39-
),
4016
python_requires=">=3.9",
4117
install_requires=[
4218
"coolname",
43-
"crcmod",
4419
"dearpygui",
4520
"grpcio-tools",
4621
"numexpr>=2.8.7",

synapse/nodes/__init__.py

Whitespace-only changes.

synapse/server/nodes/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from synapse.api.node_pb2 import NodeConfig, NodeType
66
from synapse.server.status import Status
7-
from synapse.utils.ndtp_types import SynapseData
7+
from synapse.utils.types import SynapseData
88

99

1010
class BaseNode(object):

synapse/server/nodes/spectral_filter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
)
1212
from synapse.server.nodes.base import BaseNode
1313
from synapse.server.status import Status
14-
from synapse.utils.ndtp_types import ElectricalBroadbandData, SynapseData
14+
from synapse.utils.types import ElectricalBroadbandData, SynapseData
1515

1616

1717
def get_filter_coefficients(method, low_cutoff_hz, high_cutoff_hz, sample_rate):

synapse/simulator/nodes/broadband_source.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from synapse.api.tap_pb2 import TapConnection, TapType
1111
from synapse.api.datatype_pb2 import BroadbandFrame
1212
from synapse.server.status import Status
13-
from synapse.utils.ndtp_types import ElectricalBroadbandData
13+
from synapse.utils.types import ElectricalBroadbandData
1414

1515
def r_sample(bit_width: int):
1616
return random.randint(0, 2**bit_width - 1)

synapse/simulator/nodes/spike_source.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from synapse.api.nodes.spike_source_pb2 import SpikeSourceConfig
77
from synapse.server.nodes.base import BaseNode
88
from synapse.server.status import Status
9-
from synapse.utils.ndtp_types import SpiketrainData
9+
from synapse.utils.types import SpiketrainData
1010

1111
def r_sample(bit_width: int):
1212
return random.randint(0, 2**bit_width - 1)

synapse/tests/simulator/test_broadband_source.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from synapse.simulator.nodes.broadband_source import BroadbandSource
55
from synapse.api.nodes.signal_config_pb2 import SignalConfig, ElectrodeConfig
66
from synapse.api.channel_pb2 import Channel
7-
from synapse.utils.ndtp_types import ElectricalBroadbandData
7+
from synapse.utils.types import ElectricalBroadbandData
88

99

1010
@pytest.mark.asyncio

0 commit comments

Comments
 (0)