pandas.algos -> pandas.libs.algos

Author: jreback

doc/source/whatsnew/v0.20.0.txt

@@ -467,6 +467,7 @@ If indicated, a deprecation warning will be issued if you reference that module.
     "pandas._hash", "pandas.tools.libhash", ""
     "pandas.tslib", "pandas.libs.tslib", ""
     "pandas.index", "pandas.libs.index", ""
+    "pandas.algos", "pandas.libs.algos", ""
 
 
 .. _whatsnew_0200.api_breaking.groupby_describe:

pandas/core/algorithms.py

@@ -34,9 +34,9 @@
 from pandas.types.missing import isnull
 
 import pandas.core.common as com
-import pandas.algos as algos
 import pandas.hashtable as htable
 from pandas.compat import string_types
+from pandas.libs import algos
 from pandas.libs.tslib import iNaT
 
 

pandas/core/categorical.py

@@ -6,7 +6,7 @@
 
 from pandas import compat, lib
 from pandas.compat import u, lzip
-import pandas.algos as _algos
+from pandas.libs import algos as _algos
 
 from pandas.types.generic import ABCSeries, ABCIndexClass, ABCCategoricalIndex
 from pandas.types.missing import isnull, notnull

pandas/core/frame.py

@@ -94,7 +94,7 @@
 import pandas.tools.plotting as gfx
 
 import pandas.lib as lib
-import pandas.algos as _algos
+import pandas.libs.algos as _algos
 
 from pandas.core.config import get_option
 

pandas/core/groupby.py

@@ -60,8 +60,7 @@
 from pandas.core.config import option_context
 import pandas.lib as lib
 from pandas.lib import Timestamp
-import pandas.libs.tslib as tslib
-import pandas.algos as _algos
+from pandas.libs import tslib, algos as _algos
 
 _doc_template = """
 

pandas/core/missing.py

@@ -5,7 +5,7 @@
 import numpy as np
 from distutils.version import LooseVersion
 
-import pandas.algos as algos
+from pandas.libs import algos
 import pandas.lib as lib
 from pandas.compat import range, string_types
 from pandas.types.common import (is_numeric_v_string_like,

pandas/core/nanops.py

@@ -9,8 +9,8 @@
 except ImportError:  # pragma: no cover
     _USE_BOTTLENECK = False
 
-from pandas import compat, lib, algos
-from pandas.libs import tslib
+from pandas import compat, lib
+from pandas.libs import tslib, algos
 from pandas.types.common import (_get_dtype,
                                  is_float, is_scalar,
                                  is_integer, is_complex, is_float_dtype,

pandas/core/ops.py

@@ -14,11 +14,11 @@
 from pandas.util.decorators import Appender
 import pandas.computation.expressions as expressions
 from pandas.lib import isscalar
-from pandas.libs import index as _index, tslib
+from pandas.libs import index as _index, tslib, algos as _algos
 from pandas.libs.tslib import iNaT
 from pandas.compat import bind_method
 import pandas.core.missing as missing
-import pandas.algos as _algos
+
 from pandas.core.common import (_values_from_object, _maybe_match_name,
                                 PerformanceWarning)
 from pandas.types.missing import notnull, isnull

pandas/core/reshape.py

@@ -24,7 +24,7 @@
                                  decons_obs_group_ids)
 
 import pandas.core.algorithms as algos
-import pandas.algos as _algos
+import pandas.libs.algos as _algos
 
 from pandas.core.index import MultiIndex, _get_na_value
 

pandas/core/sorting.py

@@ -8,7 +8,7 @@
                                  is_categorical_dtype)
 from pandas.types.missing import isnull
 import pandas.core.algorithms as algos
-import pandas.algos as _algos
+from pandas.libs import algos as _algos
 import pandas.hashtable as _hash
 from pandas import lib
 

pandas/indexes/base.py

@@ -3,10 +3,9 @@
 import operator
 
 import numpy as np
-from pandas.libs import index as _index, tslib
+from pandas.libs import index as _index, tslib, algos as _algos
 import pandas.lib as lib
 import pandas._join as _join
-import pandas.algos as _algos
 from pandas.lib import Timestamp, Timedelta, is_datetime_array
 
 from pandas.compat import range, u
@@ -2966,7 +2965,7 @@ def _join_level(self, other, level, how='left', return_indexers=False,
         order of the data indexed by the MultiIndex will not be changed;
         otherwise, it will tie out with `other`.
         """
-        from pandas.algos import groupsort_indexer
+        from pandas.libs.algos import groupsort_indexer
         from .multi import MultiIndex
 
         def _get_leaf_sorter(labels):

pandas/indexes/numeric.py

@@ -1,8 +1,7 @@
 import numpy as np
 import pandas.lib as lib
 import pandas._join as _join
-import pandas.algos as _algos
-from pandas.libs import index as _index
+from pandas.libs import index as _index, algos as _algos
 
 from pandas.types.common import (is_dtype_equal, pandas_dtype,
                                  is_float_dtype, is_object_dtype,

pandas/io/pytables.py

@@ -45,8 +45,7 @@
 from pandas.computation.pytables import Expr, maybe_expression
 
 import pandas.lib as lib
-import pandas.libs.tslib as tslib
-import pandas.algos as algos
+from pandas.libs import tslib, algos
 
 from distutils.version import LooseVersion
 

pandas/algos.pyx renamed to pandas/libs/algos.pyx

@@ -37,15 +37,15 @@ float64 = np.dtype(np.float64)
 cdef double NaN = <double> np.NaN
 cdef double nan = NaN
 
-cdef extern from "src/headers/math.h":
+cdef extern from "../src/headers/math.h":
     double sqrt(double x) nogil
     double fabs(double) nogil
 
 # this is our util.pxd
 from util cimport numeric, get_nat
 
-cimport lib
-from lib cimport is_null_datetimelike
+from .. cimport lib
+from ..lib cimport is_null_datetimelike
 from pandas import lib
 
 cdef int64_t iNaT = get_nat()

pandas/libs/index.pyx

@@ -17,8 +17,8 @@ import numpy as np
 
 cimport tslib
 from ..hashtable cimport *
-from pandas import algos, hashtable as _hash
-from pandas.libs import tslib
+from pandas import hashtable as _hash
+from pandas.libs import tslib, algos
 from pandas.libs.tslib import Timestamp, Timedelta
 
 from datetime cimport (get_datetime64_value, _pydatetime_to_dts,

pandas/src/join.pyx

@@ -32,7 +32,7 @@ float64 = np.dtype(np.float64)
 cdef double NaN = <double> np.NaN
 cdef double nan = NaN
 
-from pandas.algos import groupsort_indexer, ensure_platform_int
+from pandas.libs.algos import groupsort_indexer, ensure_platform_int
 from pandas.core.algorithms import take_nd
 
 include "joins_func_helper.pxi"

pandas/tests/api/test_api.py

@@ -38,7 +38,7 @@ class TestPDApi(Base, tm.TestCase):
 
     # top-level packages that are c-imports, should rename to _*
     # to avoid naming conflicts
-    lib_to_rename = ['algos', 'hashtable', 'lib']
+    lib_to_rename = ['hashtable', 'lib']
 
     # these are already deprecated; awaiting removal
     deprecated_modules = ['stats', 'datetools', 'parser', 'json']

pandas/tests/groupby/test_bin_groupby.py

@@ -8,7 +8,7 @@
 from pandas.util.testing import assert_almost_equal
 import pandas.util.testing as tm
 import pandas.lib as lib
-import pandas.algos as algos
+import pandas.libs.algos as algos
 
 
 def test_series_grouper():

pandas/tests/groupby/test_transform.py

@@ -6,6 +6,7 @@
 from pandas import Series, DataFrame, Timestamp, MultiIndex, concat, date_range
 from pandas.types.common import _ensure_platform_int, is_timedelta64_dtype
 from pandas.compat import StringIO
+from pandas.libs import algos
 from .common import MixIn, assert_fp_equal
 
 from pandas.util.testing import assert_frame_equal, assert_series_equal
@@ -417,8 +418,8 @@ def test_cython_group_transform_algos(self):
         dtypes = [np.int8, np.int16, np.int32, np.int64, np.uint8, np.uint32,
                   np.uint64, np.float32, np.float64]
 
-        ops = [(pd.algos.group_cumprod_float64, np.cumproduct, [np.float64]),
-               (pd.algos.group_cumsum, np.cumsum, dtypes)]
+        ops = [(algos.group_cumprod_float64, np.cumproduct, [np.float64]),
+               (algos.group_cumsum, np.cumsum, dtypes)]
 
         is_datetimelike = False
         for pd_op, np_op, dtypes in ops:
@@ -436,21 +437,21 @@ def test_cython_group_transform_algos(self):
         data = np.array([[1], [2], [3], [np.nan], [4]], dtype='float64')
         actual = np.zeros_like(data)
         actual.fill(np.nan)
-        pd.algos.group_cumprod_float64(actual, data, labels, is_datetimelike)
+        algos.group_cumprod_float64(actual, data, labels, is_datetimelike)
         expected = np.array([1, 2, 6, np.nan, 24], dtype='float64')
         self.assert_numpy_array_equal(actual[:, 0], expected)
 
         actual = np.zeros_like(data)
         actual.fill(np.nan)
-        pd.algos.group_cumsum(actual, data, labels, is_datetimelike)
+        algos.group_cumsum(actual, data, labels, is_datetimelike)
         expected = np.array([1, 3, 6, np.nan, 10], dtype='float64')
         self.assert_numpy_array_equal(actual[:, 0], expected)
 
         # timedelta
         is_datetimelike = True
         data = np.array([np.timedelta64(1, 'ns')] * 5, dtype='m8[ns]')[:, None]
         actual = np.zeros_like(data, dtype='int64')
-        pd.algos.group_cumsum(actual, data.view('int64'), labels,
+        algos.group_cumsum(actual, data.view('int64'), labels,
                               is_datetimelike)
         expected = np.array([np.timedelta64(1, 'ns'), np.timedelta64(
             2, 'ns'), np.timedelta64(3, 'ns'), np.timedelta64(4, 'ns'),

pandas/tests/test_algos.py

@@ -10,7 +10,7 @@
 import pandas as pd
 
 from pandas import compat
-import pandas.algos as _algos
+import pandas.libs.algos as _algos
 from pandas.compat import lrange
 import pandas.core.algorithms as algos
 import pandas.util.testing as tm

pandas/tseries/index.py

@@ -45,11 +45,10 @@
 import pandas.tseries.tools as tools
 
 from pandas.lib import Timestamp
-from pandas.libs import index as _index, tslib
+from pandas.libs import index as _index, tslib, algos as _algos
 import pandas.lib as lib
 import pandas._period as period
 import pandas._join as _join
-import pandas.algos as _algos
 
 
 def _utc():

pandas/types/common.py

@@ -3,7 +3,8 @@
 import numpy as np
 from pandas.compat import (string_types, text_type, binary_type,
                            PY3, PY36)
-from pandas import lib, algos
+from pandas import lib
+from pandas.libs import algos
 from .dtypes import (CategoricalDtype, CategoricalDtypeType,
                      DatetimeTZDtype, DatetimeTZDtypeType,
                      PeriodDtype, PeriodDtypeType,

setup.py

@@ -330,7 +330,7 @@ class CheckSDist(sdist_class):
                  'pandas/hashtable.pyx',
                  'pandas/libs/tslib.pyx',
                  'pandas/libs/index.pyx',
-                 'pandas/algos.pyx',
+                 'pandas/libs/algos.pyx',
                  'pandas/join.pyx',
                  'pandas/window.pyx',
                  'pandas/io/parsers.pyx',
@@ -493,8 +493,8 @@ def pxd(name):
                                'pandas/src/datetime/np_datetime_strings.c'],
               'pxdfiles': ['src/util', 'hashtable'],
               'depends': _pxi_dep['index']},
-    'algos': {'pyxfile': 'algos',
-              'pxdfiles': ['src/util', 'hashtable'],
+    'libs.algos': {'pyxfile': 'libs/algos',
+                   'pxdfiles': ['src/util', 'hashtable'],
               'depends': _pxi_dep['algos']},
     '_join': {'pyxfile': 'src/join',
               'pxdfiles': ['src/util', 'hashtable'],