Fix tests

Author: rth

setup.py

@@ -2,9 +2,15 @@
 """A template for scikit-learn compatible packages."""
 
 import codecs
+import warnings
 import os
 
-from setuptools import find_packages, setup
+from setuptools import find_packages, setup, Extension
+
+import numpy as np
+
+from Cython.Build import cythonize
+from Cython.Distutils import build_ext
 
 # get __version__ from _version.py
 ver_file = os.path.join('sklearn_extra', '_version.py')
@@ -20,7 +26,7 @@
 URL = 'https://github.com/scikit-learn-contrib/scikit-learn-extra'
 LICENSE = 'new BSD'
 DOWNLOAD_URL = 'https://github.com/scikit-learn-contrib/scikit-learn-extra'
-VERSION = __version__
+VERSION = __version__  # noqa
 INSTALL_REQUIRES = ['numpy', 'scipy', 'scikit-learn']
 CLASSIFIERS = ['Intended Audience :: Science/Research',
                'Intended Audience :: Developers',
@@ -48,6 +54,21 @@
     ]
 }
 
+args = {
+    "ext_modules": cythonize(
+        [
+            Extension(
+                "sklearn_extra.utils._cyfht",
+                ["sklearn_extra/utils/_cyfht.pyx"],
+                include_dirs=[np.get_include()]
+            )
+        ],
+        compiler_directives={"language_level": "3str"},
+    ),
+    "cmdclass": dict(build_ext=build_ext),
+    }
+
+
 setup(name=DISTNAME,
       maintainer=MAINTAINER,
       maintainer_email=MAINTAINER_EMAIL,
@@ -61,4 +82,5 @@
       classifiers=CLASSIFIERS,
       packages=find_packages(),
       install_requires=INSTALL_REQUIRES,
-      extras_require=EXTRAS_REQUIRE)
+      extras_require=EXTRAS_REQUIRE,
+      **args)

sklearn_extra/kernel_approximation/_fastfood.py

@@ -11,16 +11,16 @@
 
 import numpy as np
 import scipy.sparse as sp
-from sklearn.utils.cyfht import fht2 as cyfht
 from scipy.linalg import svd
 from scipy.stats import chi
-from sklearn.utils.random import choice
 
-from .base import BaseEstimator
-from .base import TransformerMixin
-from .utils import check_array, check_random_state, as_float_array
-from .utils.extmath import safe_sparse_dot
-from .metrics.pairwise import pairwise_kernels
+from sklearn.base import BaseEstimator
+from sklearn.base import TransformerMixin
+from sklearn.utils import check_array, check_random_state, as_float_array
+from sklearn.utils.extmath import safe_sparse_dot
+from sklearn.metrics.pairwise import pairwise_kernels
+
+from ..utils._cyfht import fht2 as cyfht
 
 
 class RBFSampler(BaseEstimator, TransformerMixin):
@@ -659,10 +659,10 @@ def fit(self, X, y=None):
         self.number_of_features_to_pad_with_zeros = self.d - d_orig
 
         self.G = self.rng.normal(size=(self.times_to_stack_v, self.d))
-        self.B = choice([-1, 1],
-                        size=(self.times_to_stack_v, self.d),
-                        replace=True,
-                        random_state=self.random_state)
+        self.B = self.rng.choice(
+                [-1, 1],
+                size=(self.times_to_stack_v, self.d),
+                replace=True)
         self.P = np.hstack([(i*self.d)+self.rng.permutation(self.d)
                             for i in range(self.times_to_stack_v)])
         self.S = np.multiply(1 / self.l2norm_along_axis1(self.G)

sklearn_extra/kernel_approximation/test_fastfood.py

@@ -13,6 +13,8 @@
 from sklearn.kernel_approximation import Nystroem
 from sklearn.metrics.pairwise import polynomial_kernel, rbf_kernel
 
+from sklearn_extra.kernel_approximation import Fastfood
+
 
 # generate data
 rng = np.random.RandomState(0)

sklearn_extra/utils/tests/test_fht.py

@@ -1,9 +1,11 @@
 import numpy as np
 import numpy.testing as npt
-import nose.tools as nt
 from scipy.linalg import hadamard
-from sklearn.utils.cyfht import fht as cyfht
-from sklearn.utils.cyfht import fht2 as cyfht2
+
+from sklearn.utils.testing import assert_raises
+
+from sklearn_extra.utils._cyfht import fht as cyfht
+from sklearn_extra.utils._cyfht import fht2 as cyfht2
 
 
 def test_wikipedia_example():
@@ -34,5 +36,5 @@ def test_numerical_fuzzing_fht2():
 
 
 def test_exception_when_input_not_power_two():
-    nt.assert_raises(ValueError, cyfht, np.zeros(9, dtype=np.float64))
-    nt.assert_raises(ValueError, cyfht2, np.zeros((2, 9), dtype=np.float64))
+    assert_raises(ValueError, cyfht, np.zeros(9, dtype=np.float64))
+    assert_raises(ValueError, cyfht2, np.zeros((2, 9), dtype=np.float64))