Skip to content
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

[SHOW PR] Submodulev2 #44

Open
wants to merge 64 commits into
base: main
Choose a base branch
from
Open

[SHOW PR] Submodulev2 #44

wants to merge 64 commits into from

Commits on Mar 29, 2023

  1. [EXAMPLE DIFF] (Tree featuresv2) Fork of sklearn that maintains all n…

    …ecessary refactorings to enable downstream functionality (#32)
    
    #### Reference Issues/PRs
    This is the most up-to-date PR branch to consolidate all proposed
    refactor changes that work with:
    
    - unsupervised trees
    - oblique trees
    - no performance/runtime regressions against main
    
    #### What does this implement/fix? Explain your changes.
    Incorporates refactors to:
    
    Internal Cython of scikit-learn's:
    - criterion
    - splitter
    - tree
    
    Internals of Python in scikit-learns:
    - python Tree
    
    Adds the basic implementation of oblique trees. The implementation of
    oblique trees has been tested on all sklearn's `check_estimator` testing
    function and has error-checking bounds for the new hyperparameter
    introduced, which is `feature_combinations` that defaults to ``min(1.5,
    n_features)``.
    
    TODO:
    1. [ ] ~Add honest support for trees (splitting the data at the Python
    API level)~
    2. [x] Build wheels
    3. [ ] ~Brainstorm unit-tests, or weekly checks to determine when our
    fork is out-of-date compared to upstream sklearn~
    4. [x] Revamp README for the fork
    
    #### Any other comments?
    
    [cd build]
    
    ---------
    
    Signed-off-by: Adam Li <adam2392@gmail.com>
    Co-authored-by: Chester Huynh <chester.huynh924@gmail.com>
    Co-authored-by: Parth Vora <pvora4@jhu.edu>
    3 people committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    0ac8a71 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    927d2a9 View commit details
    Browse the repository at this point in the history
  3. Docs (#39)

    #### Reference Issues/PRs
    Fixes README and wheel building
    
    
    ---------
    
    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    475bd05 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    73a2176 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. Configuration menu
    Copy the full SHA
    f8d4697 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. Release v1.2.2

    <!--
    Thanks for contributing a pull request! Please ensure you have taken a
    look at
    the contribution guidelines:
    https://github.com/scikit-learn/scikit-learn/blob/main/CONTRIBUTING.md
    -->
    
    #### Reference Issues/PRs
    <!--
    Example: Fixes scikit-learn#1234. See also scikit-learn#3456.
    Please use keywords (e.g., Fixes) to create link to the issues or pull
    requests
    you resolved, so that they will automatically be closed when your pull
    request
    is merged. See
    https://github.com/blog/1506-closing-issues-via-pull-requests
    -->
    
    
    #### What does this implement/fix? Explain your changes.
    
    
    #### Any other comments?
    
    
    <!--
    Please be aware that we are a loose team of volunteers so patience is
    necessary; assistance handling other issues is very welcome. We value
    all user contributions, no matter how minor they are. If we are slow to
    review, either the pull request needs some benchmarking, tinkering,
    convincing, etc. or more likely the reviewers are simply busy. In either
    case, we ask for your understanding during the review process.
    For more information, see our FAQ on this topic:
    
    http://scikit-learn.org/dev/faq.html#why-is-my-pull-request-not-getting-any-attention.
    
    Thanks for contributing!
    -->
    
    ---------
    
    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    706a742 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    db58884 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2023

  1. Configuration menu
    Copy the full SHA
    1efc7a8 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. Update README

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    a22db03 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d3b6175 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Configuration menu
    Copy the full SHA
    be859f3 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

  1. Configuration menu
    Copy the full SHA
    e6853ba View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. Configuration menu
    Copy the full SHA
    13534a6 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Merging

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    c41c983 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fb5b69a View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. Configuration menu
    Copy the full SHA
    31723a6 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. Merging

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    12d45d3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1837ae8 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. Adding working submodule

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    9c5321d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b2544c5 View commit details
    Browse the repository at this point in the history
  3. Merged main

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    f82f258 View commit details
    Browse the repository at this point in the history
  4. Successful merge with the missing value support

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    7e38502 View commit details
    Browse the repository at this point in the history
  5. Add cyton headers

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    34a5621 View commit details
    Browse the repository at this point in the history
  6. Fix imports to be absolute

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    f35c758 View commit details
    Browse the repository at this point in the history
  7. Fix forest import

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    45320b4 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. Configuration menu
    Copy the full SHA
    6b4d0e7 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Configuration menu
    Copy the full SHA
    5a2ac9a View commit details
    Browse the repository at this point in the history
  2. Fix classes and criterion

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    49526f0 View commit details
    Browse the repository at this point in the history
  3. Working..

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    2105949 View commit details
    Browse the repository at this point in the history
  4. Add leaf storage ability

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    9b07f2a View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. [ENH] Adding leaf node samples to be stored when "quantile" tree is t…

    …urned on (#45)
    
    #### Reference Issues/PRs
    Addresses the quantile-trees part of:
    neurodata/scikit-tree#29
    
    
    #### What does this implement/fix? Explain your changes.
    1. Stores for each leaf node a 2D numpy array of the y-samples (remember
    `y` is (n_samples, n_outputs))
    2. Does this all the way in Criterion
    3. Only supports supervised tree/splitter/criterion
    4. merges in `main` changes.
    
    #### Any other comments?
    
    
    <!--
    Please be aware that we are a loose team of volunteers so patience is
    necessary; assistance handling other issues is very welcome. We value
    all user contributions, no matter how minor they are. If we are slow to
    review, either the pull request needs some benchmarking, tinkering,
    convincing, etc. or more likely the reviewers are simply busy. In either
    case, we ask for your understanding during the review process.
    For more information, see our FAQ on this topic:
    
    http://scikit-learn.org/dev/faq.html#why-is-my-pull-request-not-getting-any-attention.
    
    Thanks for contributing!
    -->
    
    ---------
    
    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    21ccb30 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    545e2a2 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. Add quantile

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    855ee19 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3b7b450 View commit details
    Browse the repository at this point in the history
  3. Add check input

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    3f5cb65 View commit details
    Browse the repository at this point in the history
  4. Try to fix docstring

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    7401ddc View commit details
    Browse the repository at this point in the history
  5. Try to fix docstring

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    13e2913 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2023

  1. Fix docstring

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    43aa3ef View commit details
    Browse the repository at this point in the history
  2. Fix docstring

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    fe3072f View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Fix the predict quantiles docstring

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    2d4de9a View commit details
    Browse the repository at this point in the history
  2. Fix the predict quantiles docstring

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    1c1ec8c View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. Merging main, but with two test failures

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    1994f15 View commit details
    Browse the repository at this point in the history
  2. Remove some diff

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    4bc651d View commit details
    Browse the repository at this point in the history
  3. Fix regression error

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    cc035d0 View commit details
    Browse the repository at this point in the history
  4. Fix boolean

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    4840d4e View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Configuration menu
    Copy the full SHA
    512f34c View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. Configuration menu
    Copy the full SHA
    a6a6b0e View commit details
    Browse the repository at this point in the history
  2. Added doc to store_leaf_values

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    fdf2e2d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    be902cc View commit details
    Browse the repository at this point in the history
  4. Merging main

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    5b7ce7e View commit details
    Browse the repository at this point in the history
  5. Fix now

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    9655d01 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. Bring in monotonicity (#47)

    <!--
    Thanks for contributing a pull request! Please ensure you have taken a
    look at
    the contribution guidelines:
    https://github.com/scikit-learn/scikit-learn/blob/main/CONTRIBUTING.md
    -->
    
    #### Reference Issues/PRs
    <!--
    Example: Fixes scikit-learn#1234. See also scikit-learn#3456.
    Please use keywords (e.g., Fixes) to create link to the issues or pull
    requests
    you resolved, so that they will automatically be closed when your pull
    request
    is merged. See
    https://github.com/blog/1506-closing-issues-via-pull-requests
    -->
    
    
    #### What does this implement/fix? Explain your changes.
    
    
    #### Any other comments?
    
    
    <!--
    Please be aware that we are a loose team of volunteers so patience is
    necessary; assistance handling other issues is very welcome. We value
    all user contributions, no matter how minor they are. If we are slow to
    review, either the pull request needs some benchmarking, tinkering,
    convincing, etc. or more likely the reviewers are simply busy. In either
    case, we ask for your understanding during the review process.
    For more information, see our FAQ on this topic:
    
    http://scikit-learn.org/dev/faq.html#why-is-my-pull-request-not-getting-any-attention.
    
    Thanks for contributing!
    -->
    
    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    6b57c58 View commit details
    Browse the repository at this point in the history
  2. Complete merge

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    df0fae2 View commit details
    Browse the repository at this point in the history
  3. Fix splitter

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    34e540a View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Merging main

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    a927669 View commit details
    Browse the repository at this point in the history
  2. Fix linter

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    e9d702b View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. Fix linting

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    ce6a727 View commit details
    Browse the repository at this point in the history
  2. Fix docstring

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    00a3595 View commit details
    Browse the repository at this point in the history
  3. Fix lint

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    329cbc8 View commit details
    Browse the repository at this point in the history
  4. Fix unit test

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    8b5d0f9 View commit details
    Browse the repository at this point in the history
  5. Fix lint

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    38bade7 View commit details
    Browse the repository at this point in the history
  6. Adding fix

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    feffdeb View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Fixed

    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    2bb5f1c View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. [MERGE] Merge changes from sklearn main (#52)

    Merging latest changes from sklearn main
    
    #### What does this implement/fix? Explain your changes.
    
    
    #### Any other comments?
    
    
    <!--
    Please be aware that we are a loose team of volunteers so patience is
    necessary; assistance handling other issues is very welcome. We value
    all user contributions, no matter how minor they are. If we are slow to
    review, either the pull request needs some benchmarking, tinkering,
    convincing, etc. or more likely the reviewers are simply busy. In either
    case, we ask for your understanding during the review process.
    For more information, see our FAQ on this topic:
    
    http://scikit-learn.org/dev/faq.html#why-is-my-pull-request-not-getting-any-attention.
    
    Thanks for contributing!
    -->
    
    ---------
    
    Signed-off-by: Adam Li <adam2392@gmail.com>
    adam2392 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    6ec023b View commit details
    Browse the repository at this point in the history