Skip to content

Commit ad37155

Browse files
authored
Revert "[third party] Add interpolator"
1 parent c79dc97 commit ad37155

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+18
-340
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ silx/math/fit/functions.c
1212
silx/math/fit/peaks.c
1313
silx/math/marchingcubes.cpp
1414
silx/math/medianfilter/medianfilter.cpp
15-
silx/third_party/_local/scipy/qhull.c
16-
silx/third_party/_local/scipy/interpnd.c
15+
silx/third_party/_local/scipy_spatial/qhull.c
1716

1817
# Hidden files
1918
.*

silx/gui/plot3d/items/scatter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding: utf-8
22
# /*##########################################################################
33
#
4-
# Copyright (c) 2017-2018 European Synchrotron Radiation Facility
4+
# Copyright (c) 2017 European Synchrotron Radiation Facility
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal
@@ -405,7 +405,7 @@ def _updateScene(self):
405405
# Enough points to try a Delaunay tesselation
406406

407407
# Lazy loading of Delaunay
408-
from silx.third_party.scipy import Delaunay as _Delaunay
408+
from silx.third_party.scipy_spatial import Delaunay as _Delaunay
409409

410410
try:
411411
tri = _Delaunay(coordinates)

silx/third_party/_local/scipy/interpnd.pyx

Lines changed: 0 additions & 307 deletions
This file was deleted.

silx/third_party/_local/scipy/__init__.py renamed to silx/third_party/_local/scipy_spatial/__init__.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding: utf-8
22
# /*##########################################################################
33
#
4-
# Copyright (c) 2017-2018 European Synchrotron Radiation Facility
4+
# Copyright (c) 2017 European Synchrotron Radiation Facility
55
#
66
# Permission is hereby granted, free of charge, to any person obtaining a copy
77
# of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
2323
#
2424
# ###########################################################################*/
2525
"""
26-
Duplicate features from scipy for silx internal use only.
26+
Duplicated from scipy.spatial for silx internal use only.
2727
2828
See `SciPy <https://www.scipy.org/>`_
2929
"""
@@ -35,7 +35,6 @@
3535
__date__ = "07/11/2017"
3636

3737

38-
from .qhull import Delaunay # noqa
39-
from .interpnd import LinearNDInterpolator # noqa
38+
from .qhull import Delaunay
4039

41-
__all__ = ['Delaunay', 'LinearNDInterpolator']
40+
__all__ = ['Delaunay']

silx/third_party/_local/scipy/qhull.pyx renamed to silx/third_party/_local/scipy_spatial/qhull.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import threading
1616
import numpy as np
1717
cimport numpy as np
1818
cimport cython
19-
from silx.third_party._local.scipy cimport qhull
20-
from silx.third_party._local.scipy cimport setlist
19+
from silx.third_party._local.scipy_spatial cimport qhull
20+
from silx.third_party._local.scipy_spatial cimport setlist
2121
from libc cimport stdlib
2222

2323
from numpy.compat import asbytes

0 commit comments

Comments
 (0)