diff --git a/example/__pycache__/test_pyflann.cpython-38-pytest-6.1.1.pyc b/example/__pycache__/test_pyflann.cpython-38-pytest-6.1.1.pyc new file mode 100644 index 0000000..bcc0dc0 Binary files /dev/null and b/example/__pycache__/test_pyflann.cpython-38-pytest-6.1.1.pyc differ diff --git a/example/test_pyflann.py b/example/test_pyflann.py index 618473b..3802c2d 100644 --- a/example/test_pyflann.py +++ b/example/test_pyflann.py @@ -13,13 +13,13 @@ flann = FLANN() result, dists = flann.nn( dataset, testset, 2, algorithm="kmeans", branching=32, iterations=7, checks=16) -print result -print dists +print(result) +print(dists) dataset = np.random.rand(10000, 128) testset = np.random.rand(1000, 128) flann = FLANN() result, dists = flann.nn( dataset, testset, 5, algorithm="kmeans", branching=32, iterations=7, checks=16) -print result -print dists +print(result) +print(dists) diff --git a/pyflann/__init__.py b/pyflann/__init__.py index f8ecad3..0d94956 100755 --- a/pyflann/__init__.py +++ b/pyflann/__init__.py @@ -24,9 +24,9 @@ #(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF #THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from index import * -from io.dataset import load, save +from .index import * +from .io.dataset import load, save try: - from io.hdf5_dataset import load_range + from .io.hdf5_dataset import load_range except: pass diff --git a/pyflann/__pycache__/__init__.cpython-36.pyc b/pyflann/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..7e9cdb8 Binary files /dev/null and b/pyflann/__pycache__/__init__.cpython-36.pyc differ diff --git a/pyflann/__pycache__/__init__.cpython-38.pyc b/pyflann/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..da7c71f Binary files /dev/null and b/pyflann/__pycache__/__init__.cpython-38.pyc differ diff --git a/pyflann/__pycache__/exceptions.cpython-36.pyc b/pyflann/__pycache__/exceptions.cpython-36.pyc new file mode 100644 index 0000000..1e68895 Binary files /dev/null and b/pyflann/__pycache__/exceptions.cpython-36.pyc differ diff --git a/pyflann/__pycache__/exceptions.cpython-38.pyc b/pyflann/__pycache__/exceptions.cpython-38.pyc new file mode 100644 index 0000000..83257c2 Binary files /dev/null and b/pyflann/__pycache__/exceptions.cpython-38.pyc differ diff --git a/pyflann/__pycache__/index.cpython-36.pyc b/pyflann/__pycache__/index.cpython-36.pyc new file mode 100644 index 0000000..7199daf Binary files /dev/null and b/pyflann/__pycache__/index.cpython-36.pyc differ diff --git a/pyflann/__pycache__/index.cpython-38.pyc b/pyflann/__pycache__/index.cpython-38.pyc new file mode 100644 index 0000000..277adee Binary files /dev/null and b/pyflann/__pycache__/index.cpython-38.pyc differ diff --git a/pyflann/bindings/__init__.py b/pyflann/bindings/__init__.py index 332f8fa..5e3ae2e 100755 --- a/pyflann/bindings/__init__.py +++ b/pyflann/bindings/__init__.py @@ -27,4 +27,4 @@ #from pyflann import * #from pyflann_parameters import parameter_list, algorithm_names #from pyflann_parameters import centers_init_names, log_level_names -from flann_ctypes import * +from .flann_ctypes import * diff --git a/pyflann/bindings/__pycache__/__init__.cpython-36.pyc b/pyflann/bindings/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..5d87e28 Binary files /dev/null and b/pyflann/bindings/__pycache__/__init__.cpython-36.pyc differ diff --git a/pyflann/bindings/__pycache__/__init__.cpython-38.pyc b/pyflann/bindings/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..c01bca5 Binary files /dev/null and b/pyflann/bindings/__pycache__/__init__.cpython-38.pyc differ diff --git a/pyflann/bindings/__pycache__/flann_ctypes.cpython-36.pyc b/pyflann/bindings/__pycache__/flann_ctypes.cpython-36.pyc new file mode 100644 index 0000000..0229dc6 Binary files /dev/null and b/pyflann/bindings/__pycache__/flann_ctypes.cpython-36.pyc differ diff --git a/pyflann/bindings/__pycache__/flann_ctypes.cpython-38.pyc b/pyflann/bindings/__pycache__/flann_ctypes.cpython-38.pyc new file mode 100644 index 0000000..e65da92 Binary files /dev/null and b/pyflann/bindings/__pycache__/flann_ctypes.cpython-38.pyc differ diff --git a/pyflann/bindings/flann_ctypes.py b/pyflann/bindings/flann_ctypes.py index 1c6c2b6..330994e 100755 --- a/pyflann/bindings/flann_ctypes.py +++ b/pyflann/bindings/flann_ctypes.py @@ -50,7 +50,7 @@ def __init__(self): self.update(self._defaults_) def update(self, dict): - for k, v in dict.iteritems(): + for k, v in dict.items(): if k in self.__field_names: setattr(self, k, self.__translate(k, v)) @@ -75,7 +75,7 @@ def __translate(self, k, v): def __translate_back(self, k, v): if k in self._translation_: - for tk, tv in self._translation_[k].iteritems(): + for tk, tv in self._translation_[k].items(): if tv == v: return tk return v @@ -148,7 +148,7 @@ def load_flann_library(): try: flannlib = cdll[os.path.join(root_dir, libdir, libname)] return flannlib - except Exception, e: + except Exception as e: pass tmp = os.path.dirname(root_dir) if tmp == root_dir: @@ -198,7 +198,7 @@ class FlannLib: def define_functions(str): for type in type_mappings: - exec str % {'C': type[0], 'numpy': type[1]} + exec(str % {'C': type[0], 'numpy': type[1]}) flann.build_index = {} define_functions(r""" diff --git a/pyflann/index.py b/pyflann/index.py index f8209f2..287c29f 100755 --- a/pyflann/index.py +++ b/pyflann/index.py @@ -24,8 +24,8 @@ #(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF #THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from bindings.flann_ctypes import * -from io.dataset import * +from .bindings.flann_ctypes import * +from .io.dataset import * import numpy.random as _rn diff --git a/pyflann/io/__init__.py b/pyflann/io/__init__.py index de9de45..e24c494 100755 --- a/pyflann/io/__init__.py +++ b/pyflann/io/__init__.py @@ -24,4 +24,4 @@ #(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF #THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from dataset import * \ No newline at end of file +from .dataset import * \ No newline at end of file diff --git a/pyflann/io/__pycache__/__init__.cpython-36.pyc b/pyflann/io/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..eb4b710 Binary files /dev/null and b/pyflann/io/__pycache__/__init__.cpython-36.pyc differ diff --git a/pyflann/io/__pycache__/__init__.cpython-38.pyc b/pyflann/io/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..e458732 Binary files /dev/null and b/pyflann/io/__pycache__/__init__.cpython-38.pyc differ diff --git a/pyflann/io/__pycache__/binary_dataset.cpython-36.pyc b/pyflann/io/__pycache__/binary_dataset.cpython-36.pyc new file mode 100644 index 0000000..1045de7 Binary files /dev/null and b/pyflann/io/__pycache__/binary_dataset.cpython-36.pyc differ diff --git a/pyflann/io/__pycache__/binary_dataset.cpython-38.pyc b/pyflann/io/__pycache__/binary_dataset.cpython-38.pyc new file mode 100644 index 0000000..f77213d Binary files /dev/null and b/pyflann/io/__pycache__/binary_dataset.cpython-38.pyc differ diff --git a/pyflann/io/__pycache__/dat_dataset.cpython-36.pyc b/pyflann/io/__pycache__/dat_dataset.cpython-36.pyc new file mode 100644 index 0000000..8771178 Binary files /dev/null and b/pyflann/io/__pycache__/dat_dataset.cpython-36.pyc differ diff --git a/pyflann/io/__pycache__/dat_dataset.cpython-38.pyc b/pyflann/io/__pycache__/dat_dataset.cpython-38.pyc new file mode 100644 index 0000000..7103da9 Binary files /dev/null and b/pyflann/io/__pycache__/dat_dataset.cpython-38.pyc differ diff --git a/pyflann/io/__pycache__/dataset.cpython-36.pyc b/pyflann/io/__pycache__/dataset.cpython-36.pyc new file mode 100644 index 0000000..13539d7 Binary files /dev/null and b/pyflann/io/__pycache__/dataset.cpython-36.pyc differ diff --git a/pyflann/io/__pycache__/dataset.cpython-38.pyc b/pyflann/io/__pycache__/dataset.cpython-38.pyc new file mode 100644 index 0000000..156ca8b Binary files /dev/null and b/pyflann/io/__pycache__/dataset.cpython-38.pyc differ diff --git a/pyflann/io/__pycache__/hdf5_dataset.cpython-36.pyc b/pyflann/io/__pycache__/hdf5_dataset.cpython-36.pyc new file mode 100644 index 0000000..cb9b52d Binary files /dev/null and b/pyflann/io/__pycache__/hdf5_dataset.cpython-36.pyc differ diff --git a/pyflann/io/__pycache__/hdf5_dataset.cpython-38.pyc b/pyflann/io/__pycache__/hdf5_dataset.cpython-38.pyc new file mode 100644 index 0000000..7a7f202 Binary files /dev/null and b/pyflann/io/__pycache__/hdf5_dataset.cpython-38.pyc differ diff --git a/pyflann/io/__pycache__/npy_dataset.cpython-36.pyc b/pyflann/io/__pycache__/npy_dataset.cpython-36.pyc new file mode 100644 index 0000000..06f76f3 Binary files /dev/null and b/pyflann/io/__pycache__/npy_dataset.cpython-36.pyc differ diff --git a/pyflann/io/__pycache__/npy_dataset.cpython-38.pyc b/pyflann/io/__pycache__/npy_dataset.cpython-38.pyc new file mode 100644 index 0000000..a65cd53 Binary files /dev/null and b/pyflann/io/__pycache__/npy_dataset.cpython-38.pyc differ diff --git a/pyflann/io/dataset.py b/pyflann/io/dataset.py index 0b95109..00e9418 100755 --- a/pyflann/io/dataset.py +++ b/pyflann/io/dataset.py @@ -27,10 +27,10 @@ from __future__ import with_statement from pyflann.exceptions import FLANNException -import binary_dataset -import dat_dataset -import npy_dataset -import hdf5_dataset +from . import binary_dataset +from . import dat_dataset +from . import npy_dataset +from . import hdf5_dataset import os.path from numpy import float32 @@ -58,5 +58,5 @@ def save(dataset, filename, format = None, **kwargs): format = extension[1:] handler = dataset_formats[format] handler.save(dataset, filename, **kwargs) - except Exception,e: + except Exception as e: raise FLANNException(e) diff --git a/pyflann/io/hdf5_dataset.py b/pyflann/io/hdf5_dataset.py index 43a41d8..fca765e 100755 --- a/pyflann/io/hdf5_dataset.py +++ b/pyflann/io/hdf5_dataset.py @@ -31,7 +31,7 @@ have_h5py = True try: import h5py -except Exception,e: +except Exception as e: have_h5py = False if not have_h5py: @@ -64,7 +64,7 @@ def save(dataset, filename, **kwargs): h5file = h5py.File(filename) h5file.create_dataset(dataset_name, data=dataset) h5file.close() - except Exception,e: + except Exception as e: h5file.close() raise FLANNException(e) @@ -82,7 +82,7 @@ def load(filename, rows = -1, cols = -1, dtype = numpy.float32, **kwargs): data = numpy.array(h5file[node]) h5file.close() return data - except Exception,e: + except Exception as e: h5file.close() raise FLANNException(e)