Skip to content

Commit ba18c4d

Browse files
committed
Merging main
Signed-off-by: Adam Li <adam2392@gmail.com>
2 parents 74b2e69 + 329a1cf commit ba18c4d

File tree

392 files changed

+1216
-1577
lines changed

Some content is hidden

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

392 files changed

+1216
-1577
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ jobs:
247247
- template: build_tools/azure/posix.yml
248248
parameters:
249249
name: macOS
250-
vmImage: macOS-11
250+
vmImage: macOS-12
251251
dependsOn: [linting, git_commit, Ubuntu_Jammy_Jellyfish]
252252
# Runs when dependencies succeeded or skipped
253253
condition: |

benchmarks/bench_covertype.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@
4141
4242
"""
4343

44-
# Author: Peter Prettenhofer <peter.prettenhofer@gmail.com>
45-
# Arnaud Joly <arnaud.v.joly@gmail.com>
46-
# License: BSD 3 clause
44+
# Authors: The scikit-learn developers
45+
# SPDX-License-Identifier: BSD-3-Clause
4746

4847
import argparse
4948
import os

benchmarks/bench_mnist.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@
2626
dummy 0.00s 0.01s 0.8973
2727
"""
2828

29-
# Author: Issam H. Laradji
30-
# Arnaud Joly <arnaud.v.joly@gmail.com>
31-
# License: BSD 3 clause
29+
# Authors: The scikit-learn developers
30+
# SPDX-License-Identifier: BSD-3-Clause
3231

3332
import argparse
3433
import os

benchmarks/bench_plot_nmf.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
Benchmarks of Non-Negative Matrix Factorization
33
"""
44

5-
# Authors: Tom Dupre la Tour (benchmark)
6-
# Chih-Jen Linn (original projected gradient NMF implementation)
7-
# Anthony Di Franco (projected gradient, Python and NumPy port)
8-
# License: BSD 3 clause
5+
# Authors: The scikit-learn developers
6+
# SPDX-License-Identifier: BSD-3-Clause
97

108
import numbers
119
import sys

benchmarks/bench_plot_parallel_pairwise.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Author: Mathieu Blondel <mathieu@mblondel.org>
2-
# License: BSD 3 clause
1+
# Authors: The scikit-learn developers
2+
# SPDX-License-Identifier: BSD-3-Clause
33
import time
44

55
import matplotlib.pyplot as plt

benchmarks/bench_plot_polynomial_kernel_approximation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
4040
"""
4141

42-
# Author: Daniel Lopez-Sanchez <lope@usal.es>
43-
# License: BSD 3 clause
42+
# Authors: The scikit-learn developers
43+
# SPDX-License-Identifier: BSD-3-Clause
4444

4545
# Load data manipulation functions
4646
# Will use this for timing results

benchmarks/bench_rcv1_logreg_convergence.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
# Authors: Tom Dupre la Tour <tom.dupre-la-tour@m4x.org>
2-
# Olivier Grisel <olivier.grisel@ensta.org>
3-
#
4-
# License: BSD 3 clause
1+
# Authors: The scikit-learn developers
2+
# SPDX-License-Identifier: BSD-3-Clause
53

64
import gc
75
import time

benchmarks/bench_sgd_regression.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Author: Peter Prettenhofer <peter.prettenhofer@gmail.com>
2-
# License: BSD 3 clause
1+
# Authors: The scikit-learn developers
2+
# SPDX-License-Identifier: BSD-3-Clause
33

44
import gc
55
from time import time

benchmarks/bench_tsne_mnist.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
"""
77

8-
# License: BSD 3 clause
8+
# SPDX-License-Identifier: BSD-3-Clause
99

1010
import argparse
1111
import json

build_tools/azure/cpython_free_threaded_lock.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.13
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --output-file=/scikit-learn/build_tools/azure/cpython_free_threaded_lock.txt /scikit-learn/build_tools/azure/cpython_free_threaded_requirements.txt
5+
# pip-compile --output-file=/scikit-learn/build_tools/azure/cpython_free_threaded_lock.txt /scikit-learn/build_tools/azure/cpython_free_threaded_requirements.txt
66
#
77
execnet==2.1.1
88
# via pytest-xdist
@@ -33,7 +33,3 @@ pytest-xdist==3.6.1
3333
# via -r /scikit-learn/build_tools/azure/cpython_free_threaded_requirements.txt
3434
threadpoolctl==3.5.0
3535
# via -r /scikit-learn/build_tools/azure/cpython_free_threaded_requirements.txt
36-
37-
# The following packages are considered to be unsafe in a requirements file:
38-
setuptools==70.0.0
39-
# via -r /scikit-learn/build_tools/azure/cpython_free_threaded_requirements.txt

0 commit comments

Comments
 (0)