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

Improve transformer api #280

Open
wants to merge 89 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 76 commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
ad45ea7
added tests
BalzaniEdoardo Dec 5, 2024
24697c2
linted
BalzaniEdoardo Dec 5, 2024
63b04e4
added improved unpacking of transformer basis.
BalzaniEdoardo Dec 5, 2024
0785e31
added docstrings
BalzaniEdoardo Dec 5, 2024
e2bea6b
linted and fixed shared tests
BalzaniEdoardo Dec 5, 2024
6747629
fixed shared tests
BalzaniEdoardo Dec 5, 2024
909ead1
added tests for new functionalities
BalzaniEdoardo Dec 6, 2024
f31999f
broken Transformer
BalzaniEdoardo Dec 6, 2024
7c7ccdc
modified all attrs that gets set by basis method to match the sklearn…
BalzaniEdoardo Dec 6, 2024
879a383
fixed typing
BalzaniEdoardo Dec 6, 2024
0bff056
fixed testing and reset logic
BalzaniEdoardo Dec 7, 2024
861b946
allow multi-dim inputs
BalzaniEdoardo Dec 9, 2024
aaf413b
added tests for fit and fit_transform on input types
BalzaniEdoardo Dec 9, 2024
59c0ef2
added tests for fit and fit_transform on input types
BalzaniEdoardo Dec 9, 2024
b5aac2a
added pipeline testing with composite bases
BalzaniEdoardo Dec 9, 2024
2c43690
merged multi-dim eval
BalzaniEdoardo Dec 10, 2024
fbf0aeb
Merge branch 'multi_dim_eval_basis' into set_shape_basis_method
BalzaniEdoardo Dec 11, 2024
8318716
Merge branch 'multi_dim_eval_basis' into set_shape_basis_method
BalzaniEdoardo Dec 12, 2024
881f371
Merge branch 'multi_dim_eval_basis' into set_shape_basis_method
BalzaniEdoardo Dec 12, 2024
dc7f554
removed kernel attr for eval bases. moved to conv bases only. create …
BalzaniEdoardo Dec 12, 2024
aeeb89c
runtime wrapping
BalzaniEdoardo Dec 12, 2024
387bcad
fixed chaining, doctests
BalzaniEdoardo Dec 13, 2024
f53dc34
fixed chaining, doctests, and tests
BalzaniEdoardo Dec 13, 2024
c0d7749
add clone method
BalzaniEdoardo Dec 13, 2024
f646ad0
add clone method
BalzaniEdoardo Dec 13, 2024
6e4d423
linted
BalzaniEdoardo Dec 13, 2024
409215d
partial merge dev
BalzaniEdoardo Dec 13, 2024
fc23a35
merged stuff
BalzaniEdoardo Dec 13, 2024
ac1cf29
merged dev
BalzaniEdoardo Dec 13, 2024
6e1e9ef
fixed attr names
BalzaniEdoardo Dec 13, 2024
2778fb9
Merge branch 'development' into set_shape_basis_method
BalzaniEdoardo Dec 13, 2024
34ac528
merged set input shape
BalzaniEdoardo Dec 13, 2024
ad1dc9a
ignore plot utils warns
BalzaniEdoardo Dec 13, 2024
ce5dff2
re-struct bases
BalzaniEdoardo Dec 13, 2024
52271c3
fixed docs
BalzaniEdoardo Dec 13, 2024
47174ec
removed par from docstrings
BalzaniEdoardo Dec 13, 2024
fd95bcc
improved modularity of sklearn clone
BalzaniEdoardo Dec 13, 2024
096b9bd
added test for list component
BalzaniEdoardo Dec 13, 2024
dc6bd9e
linted
BalzaniEdoardo Dec 13, 2024
7471d3c
linted
BalzaniEdoardo Dec 13, 2024
f85be92
fixed warn
BalzaniEdoardo Dec 13, 2024
59d8657
comments on ignore
BalzaniEdoardo Dec 13, 2024
4c5e3b7
fix warns
BalzaniEdoardo Dec 13, 2024
ac6323e
linted tests
BalzaniEdoardo Dec 13, 2024
50548f0
improved unpacking
BalzaniEdoardo Dec 13, 2024
9281a00
lint
BalzaniEdoardo Dec 13, 2024
5667dd8
start note to transformer
BalzaniEdoardo Dec 13, 2024
9829777
finished note and modified the logic
BalzaniEdoardo Dec 13, 2024
23a276c
note on transformer
BalzaniEdoardo Dec 13, 2024
1d81199
renamed tutorials
BalzaniEdoardo Dec 13, 2024
0340a3b
fixed docs
BalzaniEdoardo Dec 14, 2024
9629f7f
edited docs and linted
BalzaniEdoardo Dec 14, 2024
15f547e
improved svg, fixed docstring
BalzaniEdoardo Dec 14, 2024
8c8c273
fixed rendering docstrings
BalzaniEdoardo Dec 14, 2024
3333eb7
added image logos for thumbnail
BalzaniEdoardo Dec 14, 2024
4c4758e
merged set_shape
BalzaniEdoardo Dec 14, 2024
9d6fbae
fixed rendering merge completed
BalzaniEdoardo Dec 14, 2024
95d0cd4
fixed doctests
BalzaniEdoardo Dec 14, 2024
4234c51
add a generator
BalzaniEdoardo Dec 15, 2024
0c3fc32
use a generator for unpacking in a mem efficient way
BalzaniEdoardo Dec 15, 2024
5998a2d
fixed typing
BalzaniEdoardo Dec 15, 2024
3d91df1
return generator for iterating over components
BalzaniEdoardo Dec 15, 2024
f8dfb64
merged changes
BalzaniEdoardo Dec 15, 2024
32a6153
change docstrings
BalzaniEdoardo Dec 15, 2024
28599c8
change docstrings
BalzaniEdoardo Dec 15, 2024
bb5363e
change docstrings
BalzaniEdoardo Dec 15, 2024
e2d653b
Merge branch 'set_shape_basis_method' into improve_transformer_api
BalzaniEdoardo Dec 15, 2024
99d9c4c
typo test name
BalzaniEdoardo Dec 16, 2024
33fa274
added transformer tests
BalzaniEdoardo Dec 16, 2024
ad88294
improved coverage transformer basis
BalzaniEdoardo Dec 16, 2024
61a6091
add test and lint
BalzaniEdoardo Dec 16, 2024
8bff762
linted
BalzaniEdoardo Dec 16, 2024
1112dfe
Merge branch 'set_shape_basis_method' into improve_transformer_api
BalzaniEdoardo Dec 16, 2024
f0cb040
added a test for window size after init for orth exp
BalzaniEdoardo Dec 16, 2024
4d49aeb
Merge branch 'set_shape_basis_method' into improve_transformer_api
BalzaniEdoardo Dec 16, 2024
4888907
typos
sjvenditto Dec 17, 2024
090fa40
Update src/nemos/basis/_basis.py
BalzaniEdoardo Dec 18, 2024
65c0618
Update src/nemos/basis/_basis_mixin.py
BalzaniEdoardo Dec 18, 2024
afdd392
fixes docs
BalzaniEdoardo Dec 18, 2024
dc33cee
Merge branch 'set_shape_basis_method' into improve_transformer_api
BalzaniEdoardo Dec 18, 2024
7a93a46
Merge branch 'improve_transformer_api' of github.com:flatironinstitut…
BalzaniEdoardo Dec 18, 2024
2ade4bd
linted
BalzaniEdoardo Dec 18, 2024
51584bb
Merge branch 'set_shape_basis_method' into improve_transformer_api
BalzaniEdoardo Dec 18, 2024
b5b5e3f
Merge branch 'development' into set_shape_basis_method
BalzaniEdoardo Dec 18, 2024
cbf014b
add ignore links
BalzaniEdoardo Dec 18, 2024
0038600
first round of edits
BalzaniEdoardo Dec 18, 2024
efc138f
fixes from PR
BalzaniEdoardo Dec 18, 2024
734ea9d
removed properties
BalzaniEdoardo Dec 18, 2024
b3da6b1
Merge branch 'set_shape_basis_method' into improve_transformer_api
BalzaniEdoardo Dec 18, 2024
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
119 changes: 119 additions & 0 deletions docs/assets/nemos_sklearn.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions docs/assets/pipeline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 20 additions & 5 deletions docs/how_to_guide/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pip install nemos[examples]
:::


::::{grid} 1 2 3 3
::::{grid} 1 2 3 4

:::{grid-item-card}

Expand Down Expand Up @@ -58,27 +58,42 @@ plot_04_batch_glm.md
:::{grid-item-card}

<figure>
<img src="../_static/thumbnails/how_to_guide/plot_05_sklearn_pipeline_cv_demo.svg" style="height: 100px", alt="Pipelining and cross-validation."/>
<img src="../_static/nemos_sklearn.svg" style="height: 100px", alt="NeMoS vs sklearn."/>
</figure>

```{toctree}
:maxdepth: 2

plot_05_sklearn_pipeline_cv_demo.md
plot_05_transformer_basis.md
```
:::

:::{grid-item-card}

<figure>
<img src="../_static/thumbnails/how_to_guide/plot_06_glm_pytree.svg" style="height: 100px", alt="PyTrees."/>
<img src="../_static/thumbnails/how_to_guide/plot_06_sklearn_pipeline_cv_demo.svg" style="height: 100px", alt="PyTrees."/>
</figure>

```{toctree}
:maxdepth: 2

plot_06_glm_pytree.md
plot_06_sklearn_pipeline_cv_demo.md
```

:::

:::{grid-item-card}

<figure>
<img src="../_static/thumbnails/how_to_guide/plot_07_glm_pytree.svg" style="height: 100px", alt="PyTrees."/>
</figure>

```{toctree}
:maxdepth: 2

plot_07_glm_pytree.md
```

:::

::::
Loading
Loading