diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2015-12-14 17:25:53 +0100 |
---|---|---|
committer | Mario Mulansky <mario.mulansky@gmx.net> | 2015-12-14 17:25:53 +0100 |
commit | f7b90618f01d4dbf015b3d21c6c06dec8d26bd9f (patch) | |
tree | 799a2fa0e0f7558ece400de15ca8d1358565c066 /pyspike/PieceWiseLinFunc.py | |
parent | d985f3a8de6ae840c8a127653b3d9affb1a8aa40 (diff) | |
parent | 9061f2a0c13134e53f937d730295a421fd671ea3 (diff) |
Merge pull request #20 from mariomulansky/develop
Develop merge for version 0.4
Diffstat (limited to 'pyspike/PieceWiseLinFunc.py')
-rw-r--r-- | pyspike/PieceWiseLinFunc.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pyspike/PieceWiseLinFunc.py b/pyspike/PieceWiseLinFunc.py index c0dd475..8145e63 100644 --- a/pyspike/PieceWiseLinFunc.py +++ b/pyspike/PieceWiseLinFunc.py @@ -2,10 +2,11 @@ # Copyright 2014-2015, Mario Mulansky <mario.mulansky@gmx.net> # Distributed under the BSD License -from __future__ import print_function +from __future__ import absolute_import, print_function import numpy as np import collections +import pyspike ############################################################## @@ -221,20 +222,22 @@ class PieceWiseLinFunc: assert self.x[-1] == f.x[-1], "The functions have different intervals" # python implementation - # from python_backend import add_piece_wise_lin_python + # from .python_backend import add_piece_wise_lin_python # self.x, self.y1, self.y2 = add_piece_wise_lin_python( # self.x, self.y1, self.y2, f.x, f.y1, f.y2) # cython version try: - from cython.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.") + if not(pyspike.disable_backend_warning): + 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 cython.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( |