Skip to content

[Track v1.4] New PR branch to serve as submodule for scikit-tree #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 111 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
ea330a7
Fix merge main
adam2392 Sep 8, 2023
63e7241
Merge branch 'scikit-learn:main' into submodulev3
adam2392 Sep 11, 2023
e2fee00
Fix lint
adam2392 Sep 11, 2023
0b6803f
Merge main
adam2392 Sep 14, 2023
e7c04f9
Merge branch 'scikit-learn:main' into submodulev3
adam2392 Sep 15, 2023
679c9a2
Merge branch 'scikit-learn:main' into submodulev3
adam2392 Sep 19, 2023
6086c9c
Merge branch 'scikit-learn:main' into submodulev3
adam2392 Sep 26, 2023
d9d1ea6
Merge branch 'scikit-learn:main' into submodulev3
adam2392 Sep 29, 2023
9a5d91b
Merge main
adam2392 Oct 9, 2023
8a304d3
Merge branch 'scikit-learn:main' into submodulev3
adam2392 Oct 11, 2023
45b9e33
Fix utils.pyx typing
adam2392 Oct 12, 2023
01d2630
Try absolute import
adam2392 Oct 12, 2023
5715cfc
Try again
adam2392 Oct 12, 2023
5336b1f
Update import path
adam2392 Oct 12, 2023
d49572a
Make submodule install easier
adam2392 Oct 12, 2023
99a9f91
Change ctypedef in random
adam2392 Oct 12, 2023
6c7a5f4
Revert UINT32_t
adam2392 Oct 12, 2023
60287ae
Merge branch 'scikit-learn:main' into submodulev3
adam2392 Oct 13, 2023
09f7785
Change cnp.float64 to float64_t
adam2392 Oct 17, 2023
1adb209
Merging main
adam2392 Oct 17, 2023
8ea6ab0
Merge branch 'scikit-learn:main' into submodulev3
adam2392 Oct 24, 2023
f5c68b0
Merge branch 'scikit-learn:main' into submodulev3
adam2392 Oct 27, 2023
5211846
Merge branch 'scikit-learn:main' into submodulev3
adam2392 Oct 31, 2023
6cedaea
Merge main
adam2392 Nov 3, 2023
3d377ad
Merge branch 'scikit-learn:main' into submodulev3
adam2392 Nov 8, 2023
dc2ab62
Merge branch 'scikit-learn:main' into submodulev3
adam2392 Nov 19, 2023
41dd7cb
Remove base estimator deprecated name
adam2392 Nov 29, 2023
0cd63c6
Merge branch 'submodulev3' of https://github.com/neurodata/scikit-lea…
adam2392 Nov 29, 2023
b872ca5
Merge branch 'main' into submodulev3
adam2392 Dec 6, 2023
26fa366
Merge branch 'main' into submodulev3
adam2392 Dec 15, 2023
b838238
Merge branch 'main' into submodulev3
adam2392 Jan 11, 2024
a6a62e0
Merge branch 'main' into submodulev3
adam2392 Jan 18, 2024
d9c9a39
Merging main
adam2392 Jan 23, 2024
3bfdf49
Merge branch 'main' into submodulev3
adam2392 Feb 17, 2024
db91ddb
Merge branch 'main' into submodulev3
adam2392 Feb 20, 2024
4ffa093
Make sure build_tree returns self
adam2392 Feb 22, 2024
3ec238b
Merge branch 'main' into submodulev3
adam2392 Feb 22, 2024
d48716a
Allow max samples to be higher
adam2392 Feb 22, 2024
33039e2
Factor out construct trees API
adam2392 Feb 23, 2024
94517a3
Merge branch 'main' into submodulev3
adam2392 Feb 23, 2024
db5b137
Merge branch 'main' into submodulev3
adam2392 Feb 28, 2024
94fc432
Allow extra args in cinit
adam2392 Mar 2, 2024
72fd2b7
Merge branch 'main' into submodulev3
adam2392 Mar 2, 2024
e1224a4
Merge branch 'main' into submodulev3
adam2392 Mar 9, 2024
5ccd00f
Migrate n_constant_features within SplitRecord
adam2392 Mar 10, 2024
b61ae3d
Export shift_missing_values_to_left_if_required
adam2392 Mar 10, 2024
02e7765
demo pr
adam2392 Mar 11, 2024
3e2cfc7
Demo
adam2392 Mar 12, 2024
561b335
Merge branch 'main' into nconstantv2
adam2392 Mar 15, 2024
9acdf1b
Benchmarks
adam2392 Mar 21, 2024
382da02
Merge main
adam2392 Mar 21, 2024
9fc7847
Merge main
adam2392 Mar 21, 2024
13a3f89
Bench size
adam2392 Mar 21, 2024
e8214df
Adding parentrecord
adam2392 Mar 21, 2024
c5a8239
Merge branch 'nconstantv2' of https://github.com/adam2392/scikit-lear…
adam2392 Mar 21, 2024
1d3299b
Fix lint
adam2392 Mar 21, 2024
4fccb2a
Fix bestfirst
adam2392 Mar 22, 2024
d0a8d2f
Init parent record
adam2392 Mar 22, 2024
b59be6a
Merge branch 'main' into nconstantv2
adam2392 Mar 25, 2024
3adaecb
Merge branch 'main' into nconstantv2
adam2392 Mar 28, 2024
6329331
Merge branch 'main' into submodulev3
adam2392 Mar 29, 2024
0762bc4
Merge branch 'main' into nconstantv2
adam2392 Mar 29, 2024
82c9428
Address thomas comments' -s
adam2392 Apr 1, 2024
7bc919e
Merge branch 'nconstantv2' of https://github.com/adam2392/scikit-lear…
adam2392 Apr 1, 2024
3ce53ec
Merge branch 'main' into submodulev3
adam2392 Apr 2, 2024
b2dfe8f
Revert to unit32_t
adam2392 Apr 2, 2024
9ea8e67
Fix build
adam2392 Apr 2, 2024
d90befc
UPdate submodule commit and remove extraneous code
adam2392 Apr 2, 2024
a52ec74
Fixing LOC
adam2392 Apr 2, 2024
750573c
Fix update tree node
adam2392 Apr 2, 2024
ec66190
Fix ci
adam2392 Apr 2, 2024
f360749
Fix ci
adam2392 Apr 2, 2024
e020253
MAINT Fix builder partial fit (#62)
adam2392 Apr 2, 2024
775f0b7
Try again for partial fit
adam2392 Apr 3, 2024
cb26e74
Merging main
adam2392 Apr 11, 2024
e03a15b
Adding inline comment
adam2392 May 24, 2024
9a1d4b4
Merge branch 'main' into submodulev3
adam2392 May 24, 2024
86a0d62
Merging main
adam2392 Jun 7, 2024
74b2e69
Merging main
adam2392 Jun 11, 2024
ba18c4d
Merging main
adam2392 Jun 18, 2024
08658c6
Simplify cython partition api
adam2392 Jun 20, 2024
f0f69be
Simplify cython partition api
adam2392 Jun 20, 2024
d455aa1
cimport _build pruned tree
adam2392 Jun 21, 2024
0d0c449
Merge branch 'main' into submodulev3
adam2392 Jul 2, 2024
465d47f
Merge branch 'main' into submodulev3
adam2392 Jul 5, 2024
05f2f9f
Merging main
adam2392 Jul 10, 2024
ae2604b
Make sure its defined
adam2392 Jul 11, 2024
2de80e1
Merged latest changes from sklearn upstream 07/20/24
adam2392 Jul 21, 2024
971c41d
Merging main 080724
adam2392 Aug 8, 2024
b201fcb
Update wrt main
adam2392 Aug 8, 2024
ac5cb8a
Merging main
adam2392 Aug 13, 2024
1f1cbd9
Merging main
adam2392 Sep 5, 2024
600187a
Merging main
adam2392 Sep 5, 2024
d9c9bd4
Merging main
adam2392 Sep 6, 2024
473f7bc
Reverting
adam2392 Sep 6, 2024
ee4b9b7
Fixed
adam2392 Sep 6, 2024
d3788bf
Fixed
adam2392 Sep 6, 2024
8f32f29
Fixed
adam2392 Sep 6, 2024
8c6be9f
Fixed
adam2392 Sep 6, 2024
5b074dd
Reverting back to imports
adam2392 Sep 9, 2024
8095921
Fixed
adam2392 Sep 9, 2024
960b589
Fix validate
adam2392 Sep 9, 2024
4551602
Fix partial fit
adam2392 Sep 9, 2024
dd58597
Fix partial fit
adam2392 Sep 9, 2024
504770a
Merge branch 'main' into submodulev3
adam2392 Sep 9, 2024
e4b9728
Adding unit test for partial fit
adam2392 Sep 9, 2024
4fd15fd
Merge branch 'main' into submodulev3
adam2392 Oct 10, 2024
a569233
Merging main
adam2392 Oct 21, 2024
66658db
Merge main
adam2392 Nov 6, 2024
dda0df6
FIX remove regressor multi_label tag (#71)
PSSF23 Mar 5, 2025
0e43e91
FIX remove xfail_checks (#74)
PSSF23 Jul 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions sklearn/ensemble/_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,18 @@
import numpy as np
from joblib import effective_n_jobs

from ..base import BaseEstimator, MetaEstimatorMixin, clone, is_classifier, is_regressor
from ..utils import Bunch, check_random_state
from ..utils._tags import get_tags
from ..utils._user_interface import _print_elapsed_time
from ..utils.metadata_routing import _routing_enabled
from ..utils.metaestimators import _BaseComposition
from sklearn.base import (
BaseEstimator,
MetaEstimatorMixin,
clone,
is_classifier,
is_regressor,
)
from sklearn.utils import Bunch, check_random_state
from sklearn.utils._tags import get_tags
from sklearn.utils._user_interface import _print_elapsed_time
from sklearn.utils.metadata_routing import _routing_enabled
from sklearn.utils.metaestimators import _BaseComposition


def _fit_single_estimator(
Expand Down
Loading