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.

Sign up for GitHub

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

Jump to bottom

fix x_o and broken link tutorial 7 #1003

Merged
merged 3 commits into from
Mar 19, 2024
Merged

fix x_o and broken link tutorial 7 #1003

merged 3 commits into from
Mar 19, 2024

Conversation

Matthijspals
Copy link
Contributor

What does this implement/fix? Explain your changes

Tutorial 7, x_o needed to be redefined as a 4 dimensional vector for the second example. Additionally the link to the sampling tutorial was broken and is now updated.

Does this close any currently open issues?

Fixes #1000

Any relevant code examples, logs, error output, etc?

Tutorial 7 now runs from start to finish

Checklist

Put an x in the boxes that apply. You can also fill these out after creating
the PR. If you're unsure about any of them, don't hesitate to ask. We're here to
help! This is simply a reminder of what we are going to look for before merging
your code.

@janfb
Copy link
Contributor

janfb commented Mar 18, 2024

Thanks @Matthijspals! Are you OK with the license change from AGPLv3 to Apache-2.0, see #997?

@Matthijspals
Copy link
Contributor Author

Thanks @Matthijspals! Are you OK with the license change from AGPLv3 to Apache-2.0, see #997?

yes!

@codecov Codecov
Copy link

codecov bot commented Mar 18, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 76.37%. Comparing base (232b185) to head (abb21cb).
Report is 2 commits behind head on main.

❗ Current head abb21cb differs from pull request most recent head b1bf798. Consider uploading reports for the commit b1bf798 to get more accurate results

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #1003   +/-   ##
=======================================
  Coverage   76.37%   76.37%           
=======================================
  Files          84       84           
  Lines        6507     6507           
=======================================
  Hits         4970     4970           
  Misses       1537     1537
Flag Coverage Δ
unittests 76.37% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Baschdl
Copy link
Contributor

Baschdl commented Mar 18, 2024

@Matthijspals Would you mind correcting the typo in the heading? "mechansims" --> "mechanisms"

@Matthijspals
Copy link
Contributor Author

@Matthijspals Would you mind correcting the typo in the heading? "mechansims" --> "mechanisms"

updated!

@janfb janfb self-requested a review March 19, 2024 06:39
janfb
janfb approved these changes Mar 19, 2024
View reviewed changes
Copy link
Contributor

@janfb janfb left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!
nitpick: Can you please add a ; after the plotting call in the last cell to avoid the figure output 🤓

@janfb janfb self-requested a review March 19, 2024 06:41
@Matthijspals
Copy link
Contributor Author

thanks!
nitpick: Can you please add a ; after the plotting call in the last cell to avoid the figure output 🤓

Done!

@janfb janfb merged commit 28ff613 into sbi-dev:main Mar 19, 2024
1 of 3 checks passed
@janfb janfb mentioned this pull request Mar 19, 2024
Merged
8 tasks
Baschdl pushed a commit to Baschdl/sbi that referenced this pull request Mar 19, 2024
@Matthijspals @Baschdl
fix x_o and broken link tutorial 7 (sbi-dev#1003)
433efe3 
* fix x_o and broken link tutorial 7

* typo in title

* suppress plotting output

---------

Co-authored-by: Matthijs <matthijs@example.com>
anastasiakrouglova pushed a commit to bkmi/sbi that referenced this pull request Mar 20, 2024
@Matthijspals
fix x_o and broken link tutorial 7 (sbi-dev#1003)
caa87a9 
* fix x_o and broken link tutorial 7

* typo in title

* suppress plotting output

---------

Co-authored-by: Matthijs <matthijs@example.com>
anastasiakrouglova added a commit that referenced this pull request Mar 27, 2024
@anastasiakrouglova @bkmi
@janfb @tomMoral @Matthijspals @zinaStef @Baschdl
Zuko density estimators (#1088)
bf65102 
* update zuko to 1.1.0

* test zuko_gmm commit

* build_zuko_nsf added

* add build_zuko_naf, update test

* add license change to pr template.

* CLN pyproject.toml (#1009)

* CLN pyproject.toml

* CLN optional deps comment

* CLN alphabetical order

* fix x_o and broken link tutorial 7 (#1003)

* fix x_o and broken link tutorial 7

* typo in title

* suppress plotting output

---------

Co-authored-by: Matthijs <matthijs@example.com>

* replace prepare_for_sbi in tutorials (#1013)

* add zuko density estimators

* not working gmm

* update tests for PR

* update PR for pyright

* resolve pyright

* add reportArgumentType

* resolve pyright issue

* resolve all issues pyright

* resolve pyright

* add typing and docstring

* add functions from factory to test

* remove comment mdn file

* add docstrings flow file

* add docstring in density_estimator_test.py

* Update sbi/neural_nets/flow.py

Co-authored-by: Sebastian Bischoff <sebastian@salzreute.de>

* Update sbi/neural_nets/flow.py

Co-authored-by: Sebastian Bischoff <sebastian@salzreute.de>

* Update sbi/neural_nets/flow.py

Co-authored-by: Sebastian Bischoff <sebastian@salzreute.de>

* removed pyright

---------

Co-authored-by: bkmi <12955549+bkmi@users.noreply.github.com>
Co-authored-by: Nastya Krouglova <nastyakrouglova@Nastyas-MacBook-Pro.local>
Co-authored-by: Jan Boelts <jan.boelts@mailbox.org>
Co-authored-by: Thomas Moreau <thomas.moreau.2010@gmail.com>
Co-authored-by: Matthijs Pals <34062419+Matthijspals@users.noreply.github.com>
Co-authored-by: Matthijs <matthijs@example.com>
Co-authored-by: zinaStef <49067201+zinaStef@users.noreply.github.com>
Co-authored-by: Sebastian Bischoff <sebastian@salzreute.de>
janfb added a commit that referenced this pull request Apr 5, 2024
@anastasiakrouglova @bkmi
@janfb @tomMoral @Matthijspals @zinaStef @Baschdl
Zuko density estimators (#1088)
dea309c 
* update zuko to 1.1.0

* test zuko_gmm commit

* build_zuko_nsf added

* add build_zuko_naf, update test

* add license change to pr template.

* CLN pyproject.toml (#1009)

* CLN pyproject.toml

* CLN optional deps comment

* CLN alphabetical order

* fix x_o and broken link tutorial 7 (#1003)

* fix x_o and broken link tutorial 7

* typo in title

* suppress plotting output

---------

Co-authored-by: Matthijs <matthijs@example.com>

* replace prepare_for_sbi in tutorials (#1013)

* add zuko density estimators

* not working gmm

* update tests for PR

* update PR for pyright

* resolve pyright

* add reportArgumentType

* resolve pyright issue

* resolve all issues pyright

* resolve pyright

* add typing and docstring

* add functions from factory to test

* remove comment mdn file

* add docstrings flow file

* add docstring in density_estimator_test.py

* Update sbi/neural_nets/flow.py

Co-authored-by: Sebastian Bischoff <sebastian@salzreute.de>

* Update sbi/neural_nets/flow.py

Co-authored-by: Sebastian Bischoff <sebastian@salzreute.de>

* Update sbi/neural_nets/flow.py

Co-authored-by: Sebastian Bischoff <sebastian@salzreute.de>

* removed pyright

---------

Co-authored-by: bkmi <12955549+bkmi@users.noreply.github.com>
Co-authored-by: Nastya Krouglova <nastyakrouglova@Nastyas-MacBook-Pro.local>
Co-authored-by: Jan Boelts <jan.boelts@mailbox.org>
Co-authored-by: Thomas Moreau <thomas.moreau.2010@gmail.com>
Co-authored-by: Matthijs Pals <34062419+Matthijspals@users.noreply.github.com>
Co-authored-by: Matthijs <matthijs@example.com>
Co-authored-by: zinaStef <49067201+zinaStef@users.noreply.github.com>
Co-authored-by: Sebastian Bischoff <sebastian@salzreute.de>
janfb added a commit that referenced this pull request Apr 5, 2024
@anastasiakrouglova @bkmi
@janfb @tomMoral @Matthijspals @zinaStef @Baschdl
Zuko density estimators (#1088) (#1116)
cbf9dca 
* Zuko density estimators (#1088)

* update zuko to 1.1.0

* test zuko_gmm commit

* build_zuko_nsf added

* add build_zuko_naf, update test

* add license change to pr template.

* CLN pyproject.toml (#1009)

* CLN pyproject.toml

* CLN optional deps comment

* CLN alphabetical order

* fix x_o and broken link tutorial 7 (#1003)

* fix x_o and broken link tutorial 7

* typo in title

* suppress plotting output

---------

Co-authored-by: Matthijs <matthijs@example.com>

* replace prepare_for_sbi in tutorials (#1013)

* add zuko density estimators

* not working gmm

* update tests for PR

* update PR for pyright

* resolve pyright

* add reportArgumentType

* resolve pyright issue

* resolve all issues pyright

* resolve pyright

* add typing and docstring

* add functions from factory to test

* remove comment mdn file

* add docstrings flow file

* add docstring in density_estimator_test.py

* Update sbi/neural_nets/flow.py

Co-authored-by: Sebastian Bischoff <sebastian@salzreute.de>

* Update sbi/neural_nets/flow.py

Co-authored-by: Sebastian Bischoff <sebastian@salzreute.de>

* Update sbi/neural_nets/flow.py

Co-authored-by: Sebastian Bischoff <sebastian@salzreute.de>

* removed pyright

---------

Co-authored-by: bkmi <12955549+bkmi@users.noreply.github.com>
Co-authored-by: Nastya Krouglova <nastyakrouglova@Nastyas-MacBook-Pro.local>
Co-authored-by: Jan Boelts <jan.boelts@mailbox.org>
Co-authored-by: Thomas Moreau <thomas.moreau.2010@gmail.com>
Co-authored-by: Matthijs Pals <34062419+Matthijspals@users.noreply.github.com>
Co-authored-by: Matthijs <matthijs@example.com>
Co-authored-by: zinaStef <49067201+zinaStef@users.noreply.github.com>
Co-authored-by: Sebastian Bischoff <sebastian@salzreute.de>

* merge

* hate

* merge

* merge

* merge

* merge

* MERGE

* remove cnf

* implement changes Jan

* Update sbi/neural_nets/factory.py

Co-authored-by: Jan <janfb@users.noreply.github.com>

* resolve issues Jan

* undo changes to tutorials folder.

* sort dependencies.

---------

Co-authored-by: bkmi <12955549+bkmi@users.noreply.github.com>
Co-authored-by: Nastya Krouglova <nastyakrouglova@Nastyas-MacBook-Pro.local>
Co-authored-by: Jan Boelts <jan.boelts@mailbox.org>
Co-authored-by: Thomas Moreau <thomas.moreau.2010@gmail.com>
Co-authored-by: Matthijs Pals <34062419+Matthijspals@users.noreply.github.com>
Co-authored-by: Matthijs <matthijs@example.com>
Co-authored-by: zinaStef <49067201+zinaStef@users.noreply.github.com>
Co-authored-by: Sebastian Bischoff <sebastian@salzreute.de>
Co-authored-by: Jan <janfb@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@janfb janfb Awaiting requested review from janfb

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Tutorial 07 - conditional distribtions - throws error
3 participants
@Matthijspals @janfb @Baschdl