8000 Merge branch 'main' into feature-names-mlp · scikit-learn/scikit-learn@283b56d · GitHub
[go: up one dir, main page]
Skip to content

Commit 283b56d

Browse files
betatimbetatim
committed
Merge branch 'main' into feature-names-mlp
2 parents f269371 + 7af5297 commit 283b56d

File tree

199 files changed

+7699
-2900
lines changed

Some content is hidden

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

199 files changed

+7699
-2900
lines changed

‎benchmarks/bench_hist_gradient_boosting_higgsboson.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
parser.add_argument("--max-bins", type=int, default=255)
2525
parser.add_argument("--no-predict", action="store_true", default=False)
2626
parser.add_argument("--cache-loc", type=str, default="/tmp")
27+
parser.add_argument("--no-interactions", type=bool, default=False)
2728
args = parser.parse_args()
2829

2930
HERE = os.path.dirname(__file__)
@@ -88,6 +89,11 @@ def predict(est, data_test, target_test):
8889
n_samples, n_features = data_train.shape
8990
print(f"Training set with {n_samples} records with {n_features} features.")
9091

92+
if args.no_interactions:
93+
interaction_cst = [[i] for i in range(n_features)]
94+
else:
95+
interaction_cst = None
96+
9197
est = HistGradientBoostingClassifier(
9298
loss="log_loss",
9399
learning_rate=lr,
@@ -97,6 +103,7 @@ def predict(est, data_test, target_test):
97103
early_stopping=False,
98104
random_state=0,
99105
verbose=1,
106+
interaction_cst=interaction_cst,
100107
)
101108
fit(est, data_train, target_train, "sklearn")
102109
predict(est, data_test, target_test)

‎build_tools/azure/install_win.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ set -x
77
source build_tools/shared.sh
88

99
if [[ "$DISTRIB" == "conda" ]]; then
10-
conda update -n base conda -y
11-
conda install pip -y
12-
pip install "$(get_dep conda-lock min)"
10+
conda install -c conda-forge "$(get_dep conda-lock min)" -y
1311
conda-lock install --name $VIRTUALENV $LOCK_FILE
1412
source activate $VIRTUALENV
1513
else

‎build_tools/azure/py38_conda_defaults_openblas_linux-64_conda.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Generated by conda-lock.
22
# platform: linux-64
3-
# input_hash: 048385daf715eef2c6aac97e4eb4f3ca221842684d77bbd4ec3a98361302a425
3+
# input_hash: b8a0f3bd13671606365ba6bf6380fcc64a1188ae76d1d0999dda4e26371e7742
44
@EXPLICIT
55
https://repo.anaconda.com/pkgs/main/linux-64/_libgcc_mutex-0.1-main.conda#c3473ff8bdb3d124ed5ff11ec380d6f9
66
https://repo.anaconda.com/pkgs/main/linux-64/blas-1.0-openblas.conda#9ddfcaef10d79366c90128f5dc444be8
77
https://repo.anaconda.com/pkgs/main/linux-64/ca-certificates-2022.10.11-h06a4308_0.conda#e9b86b388e2cf59585fefca34037b783
88
https://repo.anaconda.com/pkgs/main/linux-64/ld_impl_linux-64-2.38-h1181459_1.conda#68eedfd9c06f2b0e6888d8db345b7f5b
99
https://repo.anaconda.com/pkgs/main/linux-64/libgfortran4-7.5.0-ha8ba4b0_17.conda#e3883581cbf0a98672250c3e80d292bf
10-
https://repo.anaconda.com/pkgs/main/linux-64/libstdcxx-ng-11.2.0-h1234567_1.conda#57623d10a70e09e1d048c2b2b6f4e2dd
1110
https://repo.anaconda.com/pkgs/main/linux-64/libgfortran-ng-7.5.0-ha8ba4b0_17.conda#ecb35c8952579d5c8dc56c6e076ba948
1211
https://repo.anaconda.com/pkgs/main/linux-64/libgomp-11.2.0-h1234567_1.conda#b372c0eea9b60732fdae4b817a63c8cd
12+
https://repo.anaconda.com/pkgs/main/linux-64/libstdcxx-ng-11.2.0-h1234567_1.conda#57623d10a70e09e1d048c2b2b6f4e2dd
1313
https://repo.anaconda.com/pkgs/main/linux-64/_openmp_mutex-5.1-1_gnu.conda#71d281e9c2192cb3fa425655a8defb85
1414
https://repo.anaconda.com/pkgs/main/linux-64/libgcc-ng-11.2.0-h1234567_1.conda#a87728dabf3151fb9cfa990bd2eb0464
1515
https://repo.anaconda.com/pkgs/main/linux-64/expat-2.4.9-h6a678d5_0.conda#3a6139fbcd96384855f0e6037502bf28
@@ -20,7 +20,7 @@ https://repo.anaconda.com/pkgs/main/linux-64/lerc-3.0-h295c915_0.conda#b97309770
2020
https://repo.anaconda.com/pkgs/main/linux-64/libdeflate-1.8-h7f8727e_5.conda#6942d65edab9a800900f43e750b3ad1f
2121
https://repo.anaconda.com/pkgs/main/linux-64/libffi-3.3-he6710b0_2.conda#88a54b8f50e351c650e16f4ee781440c
2222
https://repo.anaconda.com/pkgs/main/linux-64/libopenblas-0.3.18-hf726d26_0.conda#10422bb3b9b022e27798fc368cda69ba
23-
https://repo.anaconda.com/pkgs/main/linux-64/libuuid-1.0.3-h7f8727e_2.conda#6c4c9e96bfa4744d4839b9ed128e1114
23+
https://repo.anaconda.com/pkgs/main/linux-64/libuuid-1.41.5-h5eee18b_0.conda#4a6a2354414c9080327274aa514e5299
2424
https://repo.anaconda.com/pkgs/main/linux-64/libwebp-base-1.2.4-h5eee18b_0.conda#f5f56389136bcd9ca92ee1d64afcceb3
2525
https://repo.anaconda.com/pkgs/main/linux-64/libxcb-1.15-h7f8727e_0.conda#ada518dcadd6aaee9aae47ba9a671553
2626
https://repo.anaconda.com/pkgs/main/linux-64/lz4-c-1.9.3-h295c915_1.conda#d9bd18f73ff566e08add10a54a3463cf
@@ -45,18 +45,18 @@ https://repo.anaconda.com/pkgs/main/linux-64/freetype-2.12.1-h4a9f257_0.conda#bd
4545
https://repo.anaconda.com/pkgs/main/linux-64/gstreamer-1.14.0-h28cd5cc_2.conda#6af5d0cbd7310e1cd8a6a5c1c99649b2
4646
https://repo.anaconda.com/pkgs/main/linux-64/krb5-1.19.2-hac12032_0.conda#62a43976b48799377103390c340a3824
4747
https://repo.anaconda.com/pkgs/main/linux-64/libclang-10.0.1-default_hb85057a_2.conda#9e39ee5217327ba25e341c629b642247
48-
https://repo.anaconda.com/pkgs/main/linux-64/libtiff-4.4.0-hecacb30_1.conda#6b83bcbadf7137e2ac06299816b74d94
48+
https://repo.anaconda.com/pkgs/main/linux-64/libtiff-4.4.0-hecacb30_2.conda#debd52cb518dce3d4f48833cdc1032e4
4949
https://repo.anaconda.com/pkgs/main/linux-64/libxkbcommon-1.0.1-hfa300c1_0.conda#913e6c7c04026ff341960a9700889498
5050
https://repo.anaconda.com/pkgs/main/linux-64/libxslt-1.1.35-h4e12654_0.conda#328c111d87dccd5a3e471a691833f670
51-
https://repo.anaconda.com/pkgs/main/linux-64/sqlite-3.39.3-h5082296_0.conda#1fd3c10003776a5c0ebd14205327f541
51+
https://repo.anaconda.com/pkgs/main/linux-64/sqlite-3.40.0-h5082296_0.conda#d1300b056e728ea61a0bf135b035e60d
5252
https://repo.anaconda.com/pkgs/main/linux-64/fontconfig-2.13.1-hef1e5e3_1.conda#104cd6f83a6edd3e1fd662887f4bc215
5353
https://repo.anaconda.com/pkgs/main/linux-64/gst-plugins-base-1.14.0-h8213a91_2.conda#838648422452405b86699e780e293c1d
5454
https://repo.anaconda.com/pkgs/main/linux-64/lcms2-2.12-h3be6417_0.conda#719db47afba9f6586eecb5eacac70bff
5555
https://repo.anaconda.com/pkgs/main/linux-64/libpq-12.9-h16c4e8d_3.conda#0f127be216a734916faf456bb21404e9
5656
https://repo.anaconda.com/pkgs/main/linux-64/libwebp-1.2.4-h11a3e52_0.conda#971acc20767cc834a6baffdeaae6a100
5757
https://repo.anaconda.com/pkgs/main/linux-64/nss-3.74-h0370c37_0.conda#fb2426b2f3cb17c9015fcbdf917a2f7b
5858
https://repo.anaconda.com/pkgs/main/linux-64/python-3.8.13-haa1d7c7_1.conda#43a2c043262c004b0ad1b77fca992639
59-
https://repo.anaconda.com/pkgs/main/noarch/attrs-21.4.0-pyhd3eb1b0_0.conda#3bc977a57587a7964921e3e1e2e31f9e
59+
https://repo.anaconda.com/pkgs/main/linux-64/attrs-22.1.0-py38h06a4308_0.conda#51beb64c6f06b5a69529df7ecaccc3f9
6060
https://repo.anaconda.com/pkgs/main/linux-64/certifi-2022.9.24-py38h06a4308_0.conda#2c24987d7c70c1c4c3a8c0f0e744b853
6161
https://repo.anaconda.com/pkgs/main/noarch/charset-normalizer-2.0.4-pyhd3eb1b0_0.conda#e7a441d94234b2b5fafee06e25dbf076
6262
https://repo.anaconda.com/pkgs/main/linux-64/coverage-6.2-py38h7f8727e_0.conda#34a3006ca7d8d286b63593b31b845ace

0 commit comments

Comments
 (0)
0