scikit-learn · rth · Apr 13, 2019 · Apr 12, 2019 · rth · Apr 13, 2019
diff --git a/sklearn/__check_build/_check_build.pyx b/sklearn/__check_build/_check_build.pyx
@@ -1,4 +1,2 @@
-# cython: language_level=3
-
 def check_build():
     return
diff --git a/sklearn/_build_utils/__init__.py b/sklearn/_build_utils/__init__.py
@@ -81,4 +81,6 @@ def maybe_cythonize_extensions(top_path, config):
             exc.args += (message,)
             raise
 
-        config.ext_modules = cythonize(config.ext_modules)
+        config.ext_modules = cythonize(
+            config.ext_modules,
+            compiler_directives={'language_level': 3})
diff --git a/sklearn/_isotonic.pyx b/sklearn/_isotonic.pyx
@@ -4,7 +4,7 @@
 # enhancement of searching for the longest decreasing subsequence to
 # pool at each step.
 #
-# cython: language_level=3, boundscheck=False, wraparound=False, cdivision=True
+# cython: boundscheck=False, wraparound=False, cdivision=True
 
 import numpy as np
 cimport numpy as np

diff --git a/sklearn/cluster/_dbscan_inner.pyx b/sklearn/cluster/_dbscan_inner.pyx
@@ -2,7 +2,7 @@
 # Author: Lars Buitinck
 # License: 3-clause BSD
 #
-# cython: language_level=3, boundscheck=False, wraparound=False
+# cython: boundscheck=False, wraparound=False
 
 cimport cython
 from libcpp.vector cimport vector

diff --git a/sklearn/cluster/_hierarchical.pyx b/sklearn/cluster/_hierarchical.pyx
@@ -1,6 +1,4 @@
 # Author: Gael Varoquaux <gael.varoquaux@normalesup.org>
-#
-# cython: language_level=3
 
 import numpy as np
 cimport numpy as np

diff --git a/sklearn/cluster/_k_means.pyx b/sklearn/cluster/_k_means.pyx
@@ -8,7 +8,7 @@
 #
 # License: BSD 3 clause
 #
-# cython: language_level=3, boundscheck=False, wraparound=False, cdivision=True
+# cython: boundscheck=False, wraparound=False, cdivision=True
 
 from libc.math cimport sqrt
 import numpy as np

diff --git a/sklearn/cluster/_k_means_elkan.pyx b/sklearn/cluster/_k_means_elkan.pyx
@@ -1,7 +1,6 @@
 # cython: cdivision=True
 # cython: boundscheck=False
 # cython: wraparound=False
-# cython: language_level=3
 #
 # Author: Andreas Mueller
 #

diff --git a/sklearn/datasets/_svmlight_format.pyx b/sklearn/datasets/_svmlight_format.pyx
@@ -5,7 +5,7 @@
 #          Olivier Grisel <olivier.grisel@ensta.org>
 # License: BSD 3 clause
 #
-# cython: language_level=2, boundscheck=False, wraparound=False
+# cython: boundscheck=False, wraparound=False
 
 import array
 from cpython cimport array
@@ -61,7 +61,7 @@ def _load_svmlight_file(f, dtype, bint multilabel, bint zero_based,
     for line in f:
         # skip comments
         line_cstr = line
-        hash_ptr = strchr(line_cstr, '#')
+        hash_ptr = strchr(line_cstr, 35)  # ASCII value of '#' is 35
         if hash_ptr != NULL:
             line = line[:hash_ptr - line_cstr]
 

diff --git a/sklearn/decomposition/_online_lda.pyx b/sklearn/decomposition/_online_lda.pyx
@@ -1,5 +1,5 @@
 #
-# cython: language_level=3, boundscheck=False, wraparound=False
+# cython: boundscheck=False, wraparound=False
 
 cimport cython
 cimport numpy as np

diff --git a/sklearn/decomposition/cdnmf_fast.pyx b/sklearn/decomposition/cdnmf_fast.pyx
@@ -1,7 +1,6 @@
 # cython: cdivision=True
 # cython: boundscheck=False
 # cython: wraparound=False
-# cython: language_level=3
 
 # Author: Mathieu Blondel, Tom Dupre la Tour
 # License: BSD 3 clause

diff --git a/sklearn/ensemble/_gradient_boosting.pyx b/sklearn/ensemble/_gradient_boosting.pyx
@@ -1,7 +1,6 @@
 # cython: cdivision=True
 # cython: boundscheck=False
 # cython: wraparound=False
-# cython: language_level=3
 #
 # Author: Peter Prettenhofer
 #

diff --git a/sklearn/feature_extraction/_hashing.pyx b/sklearn/feature_extraction/_hashing.pyx
@@ -1,7 +1,7 @@
 # Author: Lars Buitinck
 # License: BSD 3 clause
 #
-# cython: language_level=3, boundscheck=False, cdivision=True
+# cython: boundscheck=False, cdivision=True
 
 import sys
 import array

diff --git a/sklearn/linear_model/cd_fast.pyx b/sklearn/linear_model/cd_fast.pyx
@@ -6,7 +6,7 @@
 #
 # License: BSD 3 clause
 #
-# cython: language_level=3, boundscheck=False, wraparound=False, cdivision=True
+# cython: boundscheck=False, wraparound=False, cdivision=True
 
 from libc.math cimport fabs
 cimport numpy as np

diff --git a/sklearn/linear_model/sag_fast.pyx.tp b/sklearn/linear_model/sag_fast.pyx.tp
@@ -34,7 +34,6 @@ def get_dispatch(dtypes):
 # cython: cdivision=True
 # cython: boundscheck=False
 # cython: wraparound=False
-# cython: language_level=3
 #
 # Authors: Danny Sullivan <dbsullivan23@gmail.com>
 #          Tom Dupre la Tour <tom.dupre-la-tour@m4x.org>

diff --git a/sklearn/linear_model/sgd_fast.pxd b/sklearn/linear_model/sgd_fast.pxd
@@ -1,6 +1,4 @@
 # License: BSD 3 clause
-#
-# cython: language_level=3
 """Helper to load LossFunction from sgd_fast.pyx to sag_fast.pyx"""
 
 cdef class LossFunction:

diff --git a/sklearn/linear_model/sgd_fast.pyx b/sklearn/linear_model/sgd_fast.pyx
@@ -1,7 +1,6 @@
 # cython: cdivision=True
 # cython: boundscheck=False
 # cython: wraparound=False
-# cython: language_level=3
 #
 # Author: Peter Prettenhofer <peter.prettenhofer@gmail.com>
 #         Mathieu Blondel (partial_fit support)

diff --git a/sklearn/manifold/_barnes_hut_tsne.pyx b/sklearn/manifold/_barnes_hut_tsne.pyx
@@ -1,7 +1,6 @@
 # cython: boundscheck=False
 # cython: wraparound=False
 # cython: cdivision=True
-# cython: language_level=3
 #
 # Author: Christopher Moody <chrisemoody@gmail.com>
 # Author: Nick Travers <nickt@squareup.com>

diff --git a/sklearn/manifold/_utils.pyx b/sklearn/manifold/_utils.pyx
@@ -1,4 +1,4 @@
-# cython: language_level=3, boundscheck=False
+# cython: boundscheck=False
 
 from libc cimport math
 cimport cython

diff --git a/sklearn/metrics/cluster/expected_mutual_info_fast.pyx b/sklearn/metrics/cluster/expected_mutual_info_fast.pyx
@@ -1,7 +1,6 @@
 # cython: cdivision=True
 # cython: boundscheck=False
 # cython: wraparound=False
-# cython: language_level=3
 #
 # Authors: Robert Layton <robertlayton@gmail.com>
 #           Corey Lynch <coreylynch9@gmail.com>

diff --git a/sklearn/metrics/pairwise_fast.pyx b/sklearn/metrics/pairwise_fast.pyx
@@ -1,7 +1,6 @@
 #cython: boundscheck=False
 #cython: cdivision=True
 #cython: wraparound=False
-# cython: language_level=3
 #
 # Author: Andreas Mueller <amueller@ais.uni-bonn.de>
 #         Lars Buitinck

diff --git a/sklearn/neighbors/ball_tree.pyx b/sklearn/neighbors/ball_tree.pyx
@@ -2,7 +2,6 @@
 #cython: boundscheck=False
 #cython: wraparound=False
 #cython: cdivision=True
-# cython: language_level=3
 
 # Author: Jake Vanderplas <vanderplas@astro.washington.edu>
 # License: BSD 3 clause

diff --git a/sklearn/neighbors/binary_tree.pxi b/sklearn/neighbors/binary_tree.pxi
@@ -1,5 +1,4 @@
 #!python
-# cython: language_level=3
 
 
 # KD Tree and Ball Tree

diff --git a/sklearn/neighbors/dist_metrics.pxd b/sklearn/neighbors/dist_metrics.pxd
@@ -2,7 +2,6 @@
 #cython: boundscheck=False
 #cython: wraparound=False
 #cython: cdivision=True
-# cython: language_level=3
 
 cimport cython
 cimport numpy as np

diff --git a/sklearn/neighbors/dist_metrics.pyx b/sklearn/neighbors/dist_metrics.pyx
@@ -2,7 +2,6 @@
 #cython: boundscheck=False
 #cython: wraparound=False
 #cython: cdivision=True
-# cython: language_level=3
 
 # By Jake Vanderplas (2013) <jakevdp@cs.washington.edu>
 # written for the scikit-learn project

diff --git a/sklearn/neighbors/kd_tree.pyx b/sklearn/neighbors/kd_tree.pyx
@@ -2,7 +2,6 @@
 #cython: boundscheck=False
 #cython: wraparound=False
 #cython: cdivision=True
-# cython: language_level=3
 
 # By Jake Vanderplas (2013) <jakevdp@cs.washington.edu>
 # written for the scikit-learn project

diff --git a/sklearn/neighbors/quad_tree.pxd b/sklearn/neighbors/quad_tree.pxd
@@ -1,7 +1,6 @@
 # cython: boundscheck=False
 # cython: wraparound=False
 # cython: cdivision=True
-# cython: language_level=3
 #
 # Author: Thomas Moreau <thomas.moreau.2010@gmail.com>
 # Author: Olivier Grisel <olivier.grisel@ensta.fr>

diff --git a/sklearn/neighbors/quad_tree.pyx b/sklearn/neighbors/quad_tree.pyx
@@ -1,7 +1,6 @@
 # cython: boundscheck=False
 # cython: wraparound=False
 # cython: cdivision=True
-# cython: language_level=3
 #
 # Author: Thomas Moreau <thomas.moreau.2010@gmail.com>
 # Author: Olivier Grisel <olivier.grisel@ensta.fr>

diff --git a/sklearn/neighbors/typedefs.pxd b/sklearn/neighbors/typedefs.pxd
@@ -1,5 +1,4 @@
 #!python
-# cython: language_level=3
 cimport numpy as np
 
 # Floating point/data type

diff --git a/sklearn/neighbors/typedefs.pyx b/sklearn/neighbors/typedefs.pyx
@@ -1,6 +1,4 @@
 #!python
-#
-# cython: language_level=3
 
 import numpy as np
 cimport numpy as np

diff --git a/sklearn/preprocessing/_csr_polynomial_expansion.pyx b/sklearn/preprocessing/_csr_polynomial_expansion.pyx
@@ -1,7 +1,6 @@
 # cython: cdivision=True
 # cython: boundscheck=False
 # cython: wraparound=False
-# cython: language_level=3
 
 # Author: Andrew nystrom <awnystrom@gmail.com>
 

diff --git a/sklearn/svm/liblinear.pxd b/sklearn/svm/liblinear.pxd
@@ -1,5 +1,3 @@
-# cython: language_level=3
-
 cimport numpy as np
 
 

diff --git a/sklearn/svm/liblinear.pyx b/sklearn/svm/liblinear.pyx
@@ -1,4 +1,3 @@
-# cython: language_level=3
 """
 Wrapper for liblinear
 

diff --git a/sklearn/svm/libsvm.pxd b/sklearn/svm/libsvm.pxd
@@ -1,5 +1,3 @@
-# cython: language_level=3
-
 cimport numpy as np
 
 ################################################################################

diff --git a/sklearn/svm/libsvm.pyx b/sklearn/svm/libsvm.pyx
@@ -1,4 +1,3 @@
-# cython: language_level=3
 """
 Binding for libsvm_skl
 ----------------------

diff --git a/sklearn/svm/libsvm_sparse.pyx b/sklearn/svm/libsvm_sparse.pyx
@@ -1,5 +1,3 @@
-# cython: language_level=3
-
 import warnings
 import  numpy as np
 cimport numpy as np

diff --git a/sklearn/tree/_criterion.pxd b/sklearn/tree/_criterion.pxd
@@ -1,4 +1,3 @@
-# cython: language_level=3
 # Authors: Gilles Louppe <g.louppe@gmail.com>
 #          Peter Prettenhofer <peter.prettenhofer@gmail.com>
 #          Brian Holt <bdholt1@gmail.com>

diff --git a/sklearn/tree/_criterion.pyx b/sklearn/tree/_criterion.pyx
@@ -1,7 +1,6 @@
 # cython: cdivision=True
 # cython: boundscheck=False
 # cython: wraparound=False
-# cython: language_level=3
 
 # Authors: Gilles Louppe <g.louppe@gmail.com>
 #          Peter Prettenhofer <peter.prettenhofer@gmail.com>

diff --git a/sklearn/tree/_splitter.pxd b/sklearn/tree/_splitter.pxd
@@ -1,4 +1,3 @@
-# cython: language_level=3
 # Authors: Gilles Louppe <g.louppe@gmail.com>
 #          Peter Prettenhofer <peter.prettenhofer@gmail.com>
 #          Brian Holt <bdholt1@gmail.com>

diff --git a/sklearn/tree/_splitter.pyx b/sklearn/tree/_splitter.pyx
@@ -1,7 +1,6 @@
 # cython: cdivision=True
 # cython: boundscheck=False
 # cython: wraparound=False
-# cython: language_level=3
 
 # Authors: Gilles Louppe <g.louppe@gmail.com>
 #          Peter Prettenhofer <peter.prettenhofer@gmail.com>

diff --git a/sklearn/tree/_tree.pxd b/sklearn/tree/_tree.pxd
@@ -7,8 +7,6 @@
 #          Nelson Liu <nelson@nelsonliu.me>
 #
 # License: BSD 3 clause
-#
-# cython: language_level=3
 
 # See _tree.pyx for details.
 

diff --git a/sklearn/tree/_tree.pyx b/sklearn/tree/_tree.pyx
@@ -1,7 +1,6 @@
 # cython: cdivision=True
 # cython: boundscheck=False
 # cython: wraparound=False
-# cython: language_level=3
 
 # Authors: Gilles Louppe <g.louppe@gmail.com>
 #          Peter Prettenhofer <peter.prettenhofer@gmail.com>

diff --git a/sklearn/tree/_utils.pxd b/sklearn/tree/_utils.pxd
@@ -1,14 +1,10 @@
-# cython: language_level=3
-
 # Authors: Gilles Louppe <g.louppe@gmail.com>
 #          Peter Prettenhofer <peter.prettenhofer@gmail.com>
 #          Arnaud Joly <arnaud.v.joly@gmail.com>
 #          Jacob Schreiber <jmschreiber91@gmail.com>
 #          Nelson Liu <nelson@nelsonliu.me>
 #
 # License: BSD 3 clause
-#
-# cython: language_level=3
 
 # See _utils.pyx for details.
 

diff --git a/sklearn/tree/_utils.pyx b/sklearn/tree/_utils.pyx
@@ -1,7 +1,6 @@
 # cython: cdivision=True
 # cython: boundscheck=False
 # cython: wraparound=False
-# cython: language_level=3
 
 # Authors: Gilles Louppe <g.louppe@gmail.com>
 #          Peter Prettenhofer <peter.prettenhofer@gmail.com>

diff --git a/sklearn/utils/_cython_blas.pxd b/sklearn/utils/_cython_blas.pxd
@@ -1,5 +1,3 @@
-# cython: language_level=3
-
 from cython cimport floating
 
 

diff --git a/sklearn/utils/_logistic_sigmoid.pyx b/sklearn/utils/_logistic_sigmoid.pyx
@@ -1,7 +1,6 @@
 #cython: boundscheck=False
 #cython: cdivision=True
 #cython: wraparound=False
-#cython: language_level=3
 
 from libc.math cimport log, exp
 

diff --git a/sklearn/utils/_random.pxd b/sklearn/utils/_random.pxd
@@ -1,8 +1,6 @@
 # Authors: Arnaud Joly
 #
 # License: BSD 3 clause
-#
-# cython: language_level=3
 
 
 import numpy as np

diff --git a/sklearn/utils/_random.pyx b/sklearn/utils/_random.pyx
@@ -1,7 +1,5 @@
-# cython: language_level=3
 # cython: boundscheck=False
 # cython: wraparound=False
-# cython: language_level=3
 #
 # Author: Arnaud Joly
 #

diff --git a/sklearn/utils/arrayfuncs.pyx b/sklearn/utils/arrayfuncs.pyx
@@ -1,4 +1,3 @@
-# cython: language_level=3
 """
 Small collection of auxiliary functions that operate on arrays
 

diff --git a/sklearn/utils/fast_dict.pxd b/sklearn/utils/fast_dict.pxd
@@ -1,7 +1,5 @@
 # Author: Gael Varoquaux
 # License: BSD
-#
-# cython: language_level=3
 """
 Uses C++ map containers for fast dict-like behavior with keys being
 integers, and values float.

diff --git a/sklearn/utils/fast_dict.pyx b/sklearn/utils/fast_dict.pyx
@@ -4,8 +4,6 @@ integers, and values float.
 """
 # Author: Gael Varoquaux
 # License: BSD
-#
-# cython: language_level=3
 
 cimport cython
 

diff --git a/sklearn/utils/graph_shortest_path.pyx b/sklearn/utils/graph_shortest_path.pyx
@@ -1,7 +1,5 @@
 # Author: Jake Vanderplas  -- <vanderplas@astro.washington.edu>
 # License: BSD 3 clause, (C) 2011
-#
-# cython: language_level=3
 
 """
 Routines for performing shortest-path graph searches
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,3 @@
		# cython: language_level=3

		cimport numpy as np


Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,3 @@
		# cython: language_level=3

		from cython cimport floating


Expand Down