diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2015-02-03 12:19:53 +0100 |
---|---|---|
committer | Mario Mulansky <mario.mulansky@gmx.net> | 2015-02-03 12:19:53 +0100 |
commit | 6eb6bc486027d3d5304a94cfb417a2257f2b6fd9 (patch) | |
tree | 665c3fafa33a84471e25b0612a18fee6bcf369ae | |
parent | 7f20d9a8076326c1800373a7f95f4871873f14b0 (diff) |
moved cython functions to subdirectory
-rw-r--r-- | pyspike/DiscreteFunc.py | 4 | ||||
-rw-r--r-- | pyspike/PieceWiseConstFunc.py | 4 | ||||
-rw-r--r-- | pyspike/PieceWiseLinFunc.py | 4 | ||||
-rw-r--r-- | pyspike/cython/cython_add.pyx (renamed from pyspike/cython_add.pyx) | 0 | ||||
-rw-r--r-- | pyspike/cython/cython_distance.pyx (renamed from pyspike/cython_distance.pyx) | 0 | ||||
-rw-r--r-- | pyspike/cython/python_backend.py (renamed from pyspike/python_backend.py) | 0 | ||||
-rw-r--r-- | pyspike/isi_distance.py | 6 | ||||
-rw-r--r-- | pyspike/spike_distance.py | 5 | ||||
-rw-r--r-- | pyspike/spike_sync.py | 4 | ||||
-rw-r--r-- | setup.py | 14 |
10 files changed, 22 insertions, 19 deletions
diff --git a/pyspike/DiscreteFunc.py b/pyspike/DiscreteFunc.py index 3e24284..2283e03 100644 --- a/pyspike/DiscreteFunc.py +++ b/pyspike/DiscreteFunc.py @@ -198,7 +198,7 @@ class DiscreteFunc(object): # cython version try: - from cython_add import add_discrete_function_cython as \ + from cython.cython_add import add_discrete_function_cython as \ add_discrete_function_impl except ImportError: print("Warning: add_discrete_function_cython not found. Make \ @@ -206,7 +206,7 @@ sure that PySpike is installed by running\n\ 'python setup.py build_ext --inplace'! \ \n Falling back to slow python backend.") # use python backend - from python_backend import add_discrete_function_python as \ + from cython.python_backend import add_discrete_function_python as \ add_discrete_function_impl self.x, self.y, self.mp = \ diff --git a/pyspike/PieceWiseConstFunc.py b/pyspike/PieceWiseConstFunc.py index e639dfc..dc57ab1 100644 --- a/pyspike/PieceWiseConstFunc.py +++ b/pyspike/PieceWiseConstFunc.py @@ -146,14 +146,14 @@ class PieceWiseConstFunc(object): # cython version try: - from cython_add import add_piece_wise_const_cython as \ + from cython.cython_add import add_piece_wise_const_cython as \ add_piece_wise_const_impl except ImportError: print("Warning: add_piece_wise_const_cython not found. Make sure \ that PySpike is installed by running\n 'python setup.py build_ext --inplace'! \ \n Falling back to slow python backend.") # use python backend - from python_backend import add_piece_wise_const_python as \ + from cython.python_backend import add_piece_wise_const_python as \ add_piece_wise_const_impl self.x, self.y = add_piece_wise_const_impl(self.x, self.y, f.x, f.y) diff --git a/pyspike/PieceWiseLinFunc.py b/pyspike/PieceWiseLinFunc.py index 58a20e5..bc0aa2a 100644 --- a/pyspike/PieceWiseLinFunc.py +++ b/pyspike/PieceWiseLinFunc.py @@ -173,14 +173,14 @@ class PieceWiseLinFunc: # cython version try: - from cython_add import add_piece_wise_lin_cython as \ + from cython.cython_add import add_piece_wise_lin_cython as \ add_piece_wise_lin_impl except ImportError: print("Warning: add_piece_wise_lin_cython not found. Make sure \ that PySpike is installed by running\n 'python setup.py build_ext --inplace'! \ \n Falling back to slow python backend.") # use python backend - from python_backend import add_piece_wise_lin_python as \ + from cython.python_backend import add_piece_wise_lin_python as \ add_piece_wise_lin_impl self.x, self.y1, self.y2 = add_piece_wise_lin_impl( diff --git a/pyspike/cython_add.pyx b/pyspike/cython/cython_add.pyx index ac64005..ac64005 100644 --- a/pyspike/cython_add.pyx +++ b/pyspike/cython/cython_add.pyx diff --git a/pyspike/cython_distance.pyx b/pyspike/cython/cython_distance.pyx index 489aab9..489aab9 100644 --- a/pyspike/cython_distance.pyx +++ b/pyspike/cython/cython_distance.pyx diff --git a/pyspike/python_backend.py b/pyspike/cython/python_backend.py index 481daf9..481daf9 100644 --- a/pyspike/python_backend.py +++ b/pyspike/cython/python_backend.py diff --git a/pyspike/isi_distance.py b/pyspike/isi_distance.py index 745d280..c2ef8e8 100644 --- a/pyspike/isi_distance.py +++ b/pyspike/isi_distance.py @@ -35,13 +35,15 @@ def isi_profile(spikes1, spikes2): # load cython implementation try: - from cython_distance import isi_distance_cython as isi_distance_impl + from cython.cython_distance import isi_distance_cython \ + as isi_distance_impl except ImportError: print("Warning: isi_distance_cython not found. Make sure that PySpike \ is installed by running\n 'python setup.py build_ext --inplace'!\n \ Falling back to slow python backend.") # use python backend - from python_backend import isi_distance_python as isi_distance_impl + from cython.python_backend import isi_distance_python \ + as isi_distance_impl times, values = isi_distance_impl(spikes1, spikes2) return PieceWiseConstFunc(times, values) diff --git a/pyspike/spike_distance.py b/pyspike/spike_distance.py index 2c989a4..f721c86 100644 --- a/pyspike/spike_distance.py +++ b/pyspike/spike_distance.py @@ -35,14 +35,15 @@ def spike_profile(spikes1, spikes2): # cython implementation try: - from cython_distance import spike_distance_cython \ + from cython.cython_distance import spike_distance_cython \ as spike_distance_impl except ImportError: print("Warning: spike_distance_cython not found. Make sure that \ PySpike is installed by running\n 'python setup.py build_ext --inplace'!\n \ Falling back to slow python backend.") # use python backend - from python_backend import spike_distance_python as spike_distance_impl + from cython.python_backend import spike_distance_python \ + as spike_distance_impl times, y_starts, y_ends = spike_distance_impl(spikes1, spikes2) return PieceWiseLinFunc(times, y_starts, y_ends) diff --git a/pyspike/spike_sync.py b/pyspike/spike_sync.py index bded8da..342bf69 100644 --- a/pyspike/spike_sync.py +++ b/pyspike/spike_sync.py @@ -33,14 +33,14 @@ def spike_sync_profile(spikes1, spikes2): # cython implementation try: - from cython_distance import coincidence_cython \ + from cython.cython_distance import coincidence_cython \ as coincidence_impl except ImportError: print("Warning: spike_distance_cython not found. Make sure that \ PySpike is installed by running\n 'python setup.py build_ext --inplace'!\n \ Falling back to slow python backend.") # use python backend - from python_backend import coincidence_python \ + from cython.python_backend import coincidence_python \ as coincidence_impl times, coincidences, multiplicity = coincidence_impl(spikes1, spikes2) @@ -21,8 +21,8 @@ except ImportError: else: use_cython = True -if os.path.isfile("pyspike/cython_add.c") and \ - os.path.isfile("pyspike/cython_distance.c"): +if os.path.isfile("pyspike/cython/cython_add.c") and \ + os.path.isfile("pyspike/cython/cython_distance.c"): use_c = True else: use_c = False @@ -32,14 +32,14 @@ ext_modules = [] if use_cython: # Cython is available, compile .pyx -> .c ext_modules += [ - Extension("pyspike.cython_add", ["pyspike/cython_add.pyx"]), - Extension("pyspike.cython_distance", ["pyspike/cython_distance.pyx"]), + Extension("pyspike.cython.cython_add", ["pyspike/cython/cython_add.pyx"]), + Extension("pyspike.cython.cython_distance", ["pyspike/cython/cython_distance.pyx"]), ] cmdclass.update({'build_ext': build_ext}) elif use_c: # c files are there, compile to binaries ext_modules += [ - Extension("pyspike.cython_add", ["pyspike/cython_add.c"]), - Extension("pyspike.cython_distance", ["pyspike/cython_distance.c"]), + Extension("pyspike.cython.cython_add", ["pyspike/cython/cython_add.c"]), + Extension("pyspike.cython.cython_distance", ["pyspike/cython/cython_distance.c"]), ] # neither cython nor c files available -> automatic fall-back to python backend @@ -78,7 +78,7 @@ train similarity', 'Programming Language :: Python :: 2.7', ], package_data={ - 'pyspike': ['cython_add.c', 'cython_distance.c'], + 'pyspike': ['cython/cython_add.c', 'cython/cython_distance.c'], 'test': ['Spike_testdata.txt'] } ) |