Merge branch 'scikit-learn:main' into submodulev3

.github/workflows/lint.yml

@@ -7,7 +7,7 @@ on:
   - pull_request_target
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref }}
   cancel-in-progress: true
 
 jobs:
@@ -62,7 +62,7 @@ jobs:
 
   comment:
     needs: lint
-    if: always()
+    if: ${{ !cancelled() }}
     runs-on: ubuntu-latest
 
     # We need these permissions to be able to post / update comments

README.rst

@@ -80,7 +80,7 @@ scikit-learn 1.0 and later require Python 3.7 or newer.
 scikit-learn 1.1 and later require Python 3.8 or newer.
 
 Scikit-learn plotting capabilities (i.e., functions start with ``plot_`` and
-classes end with "Display") require Matplotlib (>= |MatplotlibMinVersion|).
+classes end with ``Display``) require Matplotlib (>= |MatplotlibMinVersion|).
 For running the examples Matplotlib >= |MatplotlibMinVersion| is required.
 A few examples require scikit-image >= |Scikit-ImageMinVersion|, a few examples
 require pandas >= |PandasMinVersion|, some examples require seaborn >=

benchmarks/bench_hist_gradient_boosting_higgsboson.py

@@ -25,6 +25,7 @@
 parser.add_argument("--no-predict", action="store_true", default=False)
 parser.add_argument("--cache-loc", type=str, default="/tmp")
 parser.add_argument("--no-interactions", type=bool, default=False)
+parser.add_argument("--max-features", type=float, default=1)
 args = parser.parse_args()
 
 HERE = os.path.dirname(__file__)
@@ -36,6 +37,7 @@
 subsample = args.subsample
 lr = args.learning_rate
 max_bins = args.max_bins
+max_features = args.max_features
 
 
 @m.cache
@@ -104,6 +106,7 @@ def predict(est, data_test, target_test):
     random_state=0,
     verbose=1,
     interaction_cst=interaction_cst,
+    max_features=max_features,
 )
 fit(est, data_train, target_train, "sklearn")
 predict(est, data_test, target_test)

build_tools/azure/py38_conda_defaults_openblas_linux-64_conda.lock

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 59b748d4b41a3e69462c0c657961aebaa5b15bc3caad670dff038296fa151c6e
+# input_hash: 8b8c2bedfa05e30194cd2410b5d2ff2d99cfb73ae610329657de8c0e0d51ec04
 @EXPLICIT
 https://repo.anaconda.com/pkgs/main/linux-64/_libgcc_mutex-0.1-main.conda#c3473ff8bdb3d124ed5ff11ec380d6f9
 https://repo.anaconda.com/pkgs/main/linux-64/blas-1.0-openblas.conda#9ddfcaef10d79366c90128f5dc444be8

build_tools/azure/py38_conda_forge_mkl_win-64_conda.lock

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: 4ac1abe3eccdd48c0d50af8de11dd3c144459b84f500eae8f575232e0be3a07d
+# input_hash: bea34b6b198d6e378e140c30b6362cfd4a721a94eb9883a66cf2a3fbf426f590
 @EXPLICIT
 https://conda.anaconda.org/conda-forge/win-64/ca-certificates-2023.7.22-h56e8100_0.conda#b1c2327b36f1a25d96f2039b0d3e3739
 https://conda.anaconda.org/conda-forge/win-64/intel-openmp-2023.2.0-h57928b3_50497.conda#a401f3cae152deb75bbed766a90a6312
@@ -14,7 +14,7 @@ https://conda.anaconda.org/conda-forge/win-64/vc14_runtime-14.36.32532-hdcecf7f_
 https://conda.anaconda.org/conda-forge/win-64/m2w64-gcc-libs-core-5.3.0-7.tar.bz2#4289d80fb4d272f1f3b56cfe87ac90bd
 https://conda.anaconda.org/conda-forge/win-64/vc-14.3-h64f974e_17.conda#67ff6791f235bb606659bf2a5c169191
 https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.36.32532-h05e6639_17.conda#4618046c39f7c81861e53ded842e738a
-https://conda.anaconda.org/conda-forge/win-64/bzip2-1.0.8-h8ffe710_4.tar.bz2#7c03c66026944073040cb19a4f3ec3c9
+https://conda.anaconda.org/conda-forge/win-64/bzip2-1.0.8-hcfcfb64_5.conda#26eb8ca6ea332b675e11704cce84a3be
 https://conda.anaconda.org/conda-forge/win-64/icu-73.2-h63175ca_0.conda#0f47d9e3192d9e09ae300da0d28e0f56
 https://conda.anaconda.org/conda-forge/win-64/lerc-4.0.0-h63175ca_0.tar.bz2#1900cb3cab5055833cfddb0ba233b074
 https://conda.anaconda.org/conda-forge/win-64/libbrotlicommon-1.1.0-hcfcfb64_1.conda#f77f319fb82980166569e1280d5b2864
@@ -57,7 +57,7 @@ https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#3427
 https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
 https://conda.anaconda.org/conda-forge/win-64/kiwisolver-1.4.5-py38hb1fd069_1.conda#19a5ecd89c16b22db1d1830e93392aab
 https://conda.anaconda.org/conda-forge/win-64/libclang-15.0.7-default_h77d9078_3.conda#71c8b6249c9e9e18b3aec705e95c1040
-https://conda.anaconda.org/conda-forge/win-64/libglib-2.78.0-he8f3873_0.conda#25f5b3502a82ac425c72c3bc0efbecb5
+https://conda.anaconda.org/conda-forge/win-64/libglib-2.78.1-he8f3873_0.conda#7022abdf53daa6566caebbe1c2d328ae
 https://conda.anaconda.org/conda-forge/win-64/libhwloc-2.9.3-default_haede6df_1009.conda#87da045f6d26ce9fe20ad76a18f6a18a
 https://conda.anaconda.org/conda-forge/win-64/libtiff-4.6.0-h6e2ebb7_2.conda#08d653b74ee2dec0131ad4259ffbb126
 https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
@@ -82,35 +82,34 @@ https://conda.anaconda.org/conda-forge/win-64/xorg-libxdmcp-1.1.3-hcd874cb_0.tar
 https://conda.anaconda.org/conda-forge/noarch/zipp-3.17.0-pyhd8ed1ab_0.conda#2e4d6bc0b14e10f895fc6791a7d9b26a
 https://conda.anaconda.org/conda-forge/win-64/brotli-1.1.0-hcfcfb64_1.conda#f47f6db2528e38321fb00ae31674c133
 https://conda.anaconda.org/conda-forge/win-64/coverage-7.3.2-py38h91455d4_0.conda#6d4fd016918358448d9055caa59cb616
-https://conda.anaconda.org/conda-forge/win-64/glib-tools-2.78.0-h12be248_0.conda#466538fb59949a3c015b55671dc7e52c
-https://conda.anaconda.org/conda-forge/noarch/importlib_resources-6.1.0-pyhd8ed1ab_0.conda#48b0d98e0c0ec810d3ccc2a0926c8c0e
+https://conda.anaconda.org/conda-forge/win-64/glib-tools-2.78.1-h12be248_0.conda#7d9280579328b01cddbb1c4e91ca2df1
+https://conda.anaconda.org/conda-forge/noarch/importlib_resources-6.1.1-pyhd8ed1ab_0.conda#3d5fa25cf42f3f32a12b2d874ace8574
 https://conda.anaconda.org/conda-forge/noarch/joblib-1.3.2-pyhd8ed1ab_0.conda#4da50d410f553db77e62ab62ffaa1abc
 https://conda.anaconda.org/conda-forge/win-64/lcms2-2.15-h67d730c_3.conda#f92e86636451e3f6cea03e395346fa90
 https://conda.anaconda.org/conda-forge/win-64/libxcb-1.15-hcd874cb_0.conda#090d91b69396f14afef450c285f9758c
 https://conda.anaconda.org/conda-forge/win-64/openjpeg-2.5.0-h3d672ee_3.conda#45a9628a04efb6fc326fff0a8f47b799
 https://conda.anaconda.org/conda-forge/noarch/pip-23.3.1-pyhd8ed1ab_0.conda#2400c0b86889f43aa52067161e1fb108
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.0.0-pyhd8ed1ab_0.conda#6bb4ee32cd435deaeac72776c001e7ac
 https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyh0701188_6.tar.bz2#56cd9fe388baac0e90c7149cfac95b60
 https://conda.anaconda.org/conda-forge/noarch/pytest-7.4.3-pyhd8ed1ab_0.conda#5bdca0aca30b0ee62bb84854e027eae0
 https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
 https://conda.anaconda.org/conda-forge/win-64/sip-6.7.12-py38hd3f51b4_0.conda#8234c36685a08c47f11865ffc7ed36a9
 https://conda.anaconda.org/conda-forge/win-64/tbb-2021.10.0-h91493d7_2.conda#5b8c97cf8f0e81d6c22c0bda9978790d
-https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.8.0-hd8ed1ab_0.conda#384462e63262a527bda564fa2d9126c0
-https://conda.anaconda.org/conda-forge/win-64/fonttools-4.44.0-py38h91455d4_0.conda#c9d185ddf7b36fbc3b95649dcde7c0cc
-https://conda.anaconda.org/conda-forge/win-64/glib-2.78.0-h12be248_0.conda#1ed98e4da48693079f2fe83298c5b0ac
-https://conda.anaconda.org/conda-forge/noarch/importlib-resources-6.1.0-pyhd8ed1ab_0.conda#6a62c2cc25376a0d050b3d1d221c3ee9
+https://conda.anaconda.org/conda-forge/win-64/fonttools-4.44.1-py38h91455d4_0.conda#bf67e8137f9e6985f14d65ccad3fd01a
+https://conda.anaconda.org/conda-forge/win-64/glib-2.78.1-h12be248_0.conda#55a9176ace9721d0b89cbf99f78e6b04
+https://conda.anaconda.org/conda-forge/noarch/importlib-resources-6.1.1-pyhd8ed1ab_0.conda#d04bd1b5bed9177dd7c3cef15e2b6710
 https://conda.anaconda.org/conda-forge/win-64/mkl-2023.2.0-h6a75c08_50496.conda#03da367d935ecf4d3e4005cf705d0e21
 https://conda.anaconda.org/conda-forge/win-64/pillow-10.1.0-py38hc375fad_0.conda#d671ae9247896e544d8b2df9feaf1f89
-https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.11.0-pyhd8ed1ab_0.conda#8f567c0a74aa44cf732f15773b4083b0
 https://conda.anaconda.org/conda-forge/win-64/pyqt5-sip-12.12.2-py38hd3f51b4_5.conda#32974507018705cbe32a392473cd6ec1
 https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.1.0-pyhd8ed1ab_0.conda#06eb685a3a0b146347a58dda979485da
 https://conda.anaconda.org/conda-forge/noarch/pytest-forked-1.6.0-pyhd8ed1ab_0.conda#a46947638b6e005b63d2d6271da529b0
-https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.7-pyhd8ed1ab_0.conda#270e71c14d37074b1d066ee21cf0c4a6
-https://conda.anaconda.org/conda-forge/win-64/gstreamer-1.22.6-hb4038d2_2.conda#e6d2009457a1e5d9653fd06873a7a367
+https://conda.anaconda.org/conda-forge/noarch/urllib3-2.1.0-pyhd8ed1ab_0.conda#f8ced8ee63830dec7ecc1be048d1470a
+https://conda.anaconda.org/conda-forge/win-64/gstreamer-1.22.7-hb4038d2_0.conda#9b2f6622276ed34d20eb36e6a4ce2f50
 https://conda.anaconda.org/conda-forge/win-64/libblas-3.9.0-19_win64_mkl.conda#4f8a1a63cfbf74bc7b2813d9c6c205be
 https://conda.anaconda.org/conda-forge/win-64/mkl-devel-2023.2.0-h57928b3_50496.conda#381330681b4506191e1a71699ea9e6fc
 https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-2.5.0-pyhd8ed1ab_0.tar.bz2#1fdd1f3baccf0deb647385c677a1a48e
 https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda#a30144e4156cdbb236f99ebb49828f8b
-https://conda.anaconda.org/conda-forge/win-64/gst-plugins-base-1.22.6-h001b923_2.conda#20e57b894392cb792cdf5c501b35a8f6
+https://conda.anaconda.org/conda-forge/win-64/gst-plugins-base-1.22.7-h001b923_0.conda#e4b56ad6c21e861456f32bfc79b43c4b
 https://conda.anaconda.org/conda-forge/win-64/libcblas-3.9.0-19_win64_mkl.conda#1b9ede5cff953aa1a5f4d9f8ec644972
 https://conda.anaconda.org/conda-forge/win-64/liblapack-3.9.0-19_win64_mkl.conda#574e6e8bcc85df2885eb2a87d31ae005
 https://conda.anaconda.org/conda-forge/noarch/pooch-1.8.0-pyhd8ed1ab_0.conda#134b2b57b7865d2316a7cce1915a51ed