Skip to content

Misc fixes on combustion/gnns#11

Merged
A669015 merged 7 commits intomainfrom
fix-gnn
Feb 28, 2022
Merged

Misc fixes on combustion/gnns#11
A669015 merged 7 commits intomainfrom
fix-gnn

Conversation

@A669015
Copy link
Contributor

@A669015 A669015 commented Feb 24, 2022

This PR proposes several fixes identified by running the combustion/gnns/trainer.py on toy dataset with a full cpu machine:

  • complete the requirements.txt
  • add missing parameters in the configuration files
  • remove the _/ folder
  • allow the dataloader to accept different dataset size

@github-actions
Copy link

github-actions bot commented Feb 24, 2022 •
edited
Loading

✅ Result of Pytest Coverage

---------- coverage: platform linux, python 3.9.10-final-0 -----------

Name Stmts Miss Cover
combustion/gnns/init.py 0 0 100%
combustion/gnns/config.py 21 21 0%
combustion/gnns/data.py 71 71 0%
combustion/gnns/models.py 82 82 0%
combustion/gnns/plotters.py 103 103 0%
combustion/gnns/test.py 48 48 0%
combustion/gnns/tests/test_snippet.py 12 1 92%
combustion/gnns/trainer.py 26 26 0%
TOTAL 363 352 3%

~ 2 passed in 0.10s ~

alxyok
alxyok suggested changes Feb 25, 2022
View reviewed changes
rmslm
rmslm reviewed Feb 25, 2022
View reviewed changes
combustion/gnns/.gitignore Outdated
experiments/
_/

# Byte-compiled / optimized / DLL files
Copy link
Contributor

@rmslm rmslm Feb 25, 2022

Choose a reason for hiding this comment

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

There is a lot of formats we might never use in here, should we keep it minimal and append stuff when needed or is it a standard gitignore file ?

Copy link
Contributor Author

@A669015 A669015 Feb 25, 2022

Choose a reason for hiding this comment

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

Yes that should be better to keep the minimal version of it. Someone has any idea from where this file comes from, and what are actually the relevant lines ?

@rmslm
Copy link
Contributor

rmslm commented Feb 25, 2022

FYI : also we've decided a while ago to squash our commits when asking for PR if you could do so that would be great thx :)

@A669015
Copy link
Contributor Author

A669015 commented Feb 25, 2022

Not sure to see your point ... in the history there is a lot of commit that are not squashed.
You mean when the PR will be merged, I should choose the "squash and merge" strategy?

@A669015 A669015 closed this Feb 25, 2022
@A669015 A669015 reopened this Feb 25, 2022
@rmslm
Copy link
Contributor

rmslm commented Feb 25, 2022

yes that's right, in the history all are not squashed my bad.... Nonetheless, that what was decided.

@A669015 A669015 force-pushed the fix-gnn branch 3 times, most recently from 149ab2d to 383e849 Compare February 25, 2022 16:21
@A669015 A669015 requested a review from rmslm February 25, 2022 16:24
@alxyok alxyok self-requested a review February 28, 2022 11:57
@A669015 A669015 merged commit 5e4d4de into main Feb 28, 2022
@A669015 A669015 deleted the fix-gnn branch April 5, 2022 13:34
A669015 pushed a commit that referenced this pull request Feb 25, 2026
@dependabot
Bump the uv group across 5 directories with 8 updates (#11)
dd6e37a 
Bumps the uv group with 8 updates in the /reactive-flows/cnf-combustion/gnns directory:

| Package | From | To |
| --- | --- | --- |
| [certifi](https://github.com/certifi/python-certifi) | `2022.12.7` | `2024.7.4` |
| [filelock](https://github.com/tox-dev/py-filelock) | `3.20.0` | `3.20.3` |
| [idna](https://github.com/kjd/idna) | `3.4` | `3.7` |
| [pillow](https://github.com/python-pillow/Pillow) | `12.0.0` | `12.1.1` |
| [requests](https://github.com/psf/requests) | `2.28.1` | `2.32.4` |
| [setuptools](https://github.com/pypa/setuptools) | `70.2.0` | `78.1.1` |
| [urllib3](https://github.com/urllib3/urllib3) | `1.26.13` | `2.6.3` |
| [werkzeug](https://github.com/pallets/werkzeug) | `3.1.5` | `3.1.6` |

Bumps the uv group with 1 update in the /reactive-flows/cnf-combustion/unets directory: [werkzeug](https://github.com/pallets/werkzeug).
Bumps the uv group with 1 update in the /weather-forecast/ecrad-3d-correction/unets directory: [werkzeug](https://github.com/pallets/werkzeug).
Bumps the uv group with 4 updates in the /weather-forecast/gravity-wave-drag/cnns directory: [filelock](https://github.com/tox-dev/py-filelock), [idna](https://github.com/kjd/idna), [setuptools](https://github.com/pypa/setuptools) and [werkzeug](https://github.com/pallets/werkzeug).
Bumps the uv group with 5 updates in the /weather-forecast/nwp-emulation/panguweather directory:

| Package | From | To |
| --- | --- | --- |
| [certifi](https://github.com/certifi/python-certifi) | `2022.12.7` | `2024.7.4` |
| [filelock](https://github.com/tox-dev/py-filelock) | `3.20.0` | `3.20.3` |
| [idna](https://github.com/kjd/idna) | `3.4` | `3.7` |
| [pillow](https://github.com/python-pillow/Pillow) | `12.0.0` | `12.1.1` |
| [setuptools](https://github.com/pypa/setuptools) | `70.2.0` | `78.1.1` |



Updates `certifi` from 2022.12.7 to 2024.7.4
- [Commits](certifi/python-certifi@2022.12.07...2024.07.04)

Updates `filelock` from 3.20.0 to 3.20.3
- [Release notes](https://github.com/tox-dev/py-filelock/releases)
- [Changelog](https://github.com/tox-dev/filelock/blob/main/docs/changelog.rst)
- [Commits](tox-dev/filelock@3.20.0...3.20.3)

Updates `idna` from 3.4 to 3.7
- [Release notes](https://github.com/kjd/idna/releases)
- [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst)
- [Commits](kjd/idna@v3.4...v3.7)

Updates `pillow` from 12.0.0 to 12.1.1
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](python-pillow/Pillow@12.0.0...12.1.1)

Updates `requests` from 2.28.1 to 2.32.4
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](psf/requests@v2.28.1...v2.32.4)

Updates `setuptools` from 70.2.0 to 78.1.1
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst)
- [Commits](pypa/setuptools@v70.2.0...v78.1.1)

Updates `urllib3` from 1.26.13 to 2.6.3
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.26.13...2.6.3)

Updates `werkzeug` from 3.1.5 to 3.1.6
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](pallets/werkzeug@3.1.5...3.1.6)

Updates `werkzeug` from 3.1.5 to 3.1.6
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](pallets/werkzeug@3.1.5...3.1.6)

Updates `werkzeug` from 3.1.5 to 3.1.6
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](pallets/werkzeug@3.1.5...3.1.6)

Updates `filelock` from 3.20.0 to 3.20.3
- [Release notes](https://github.com/tox-dev/py-filelock/releases)
- [Changelog](https://github.com/tox-dev/filelock/blob/main/docs/changelog.rst)
- [Commits](tox-dev/filelock@3.20.0...3.20.3)

Updates `idna` from 3.4 to 3.7
- [Release notes](https://github.com/kjd/idna/releases)
- [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst)
- [Commits](kjd/idna@v3.4...v3.7)

Updates `setuptools` from 70.2.0 to 78.1.1
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst)
- [Commits](pypa/setuptools@v70.2.0...v78.1.1)

Updates `werkzeug` from 3.1.5 to 3.1.6
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](pallets/werkzeug@3.1.5...3.1.6)

Updates `certifi` from 2022.12.7 to 2024.7.4
- [Commits](certifi/python-certifi@2022.12.07...2024.07.04)

Updates `filelock` from 3.20.0 to 3.20.3
- [Release notes](https://github.com/tox-dev/py-filelock/releases)
- [Changelog](https://github.com/tox-dev/filelock/blob/main/docs/changelog.rst)
- [Commits](tox-dev/filelock@3.20.0...3.20.3)

Updates `idna` from 3.4 to 3.7
- [Release notes](https://github.com/kjd/idna/releases)
- [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst)
- [Commits](kjd/idna@v3.4...v3.7)

Updates `pillow` from 12.0.0 to 12.1.1
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](python-pillow/Pillow@12.0.0...12.1.1)

Updates `setuptools` from 70.2.0 to 78.1.1
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst)
- [Commits](pypa/setuptools@v70.2.0...v78.1.1)

---
updated-dependencies:
- dependency-name: certifi
  dependency-version: 2024.7.4
  dependency-type: indirect
  dependency-group: uv
- dependency-name: filelock
  dependency-version: 3.20.3
  dependency-type: indirect
  dependency-group: uv
- dependency-name: idna
  dependency-version: '3.7'
  dependency-type: indirect
  dependency-group: uv
- dependency-name: pillow
  dependency-version: 12.1.1
  dependency-type: indirect
  dependency-group: uv
- dependency-name: requests
  dependency-version: 2.32.4
  dependency-type: indirect
  dependency-group: uv
- dependency-name: setuptools
  dependency-version: 78.1.1
  dependency-type: indirect
  dependency-group: uv
- dependency-name: urllib3
  dependency-version: 2.6.3
  dependency-type: indirect
  dependency-group: uv
- dependency-name: werkzeug
  dependency-version: 3.1.6
  dependency-type: indirect
  dependency-group: uv
- dependency-name: werkzeug
  dependency-version: 3.1.6
  dependency-type: indirect
  dependency-group: uv
- dependency-name: werkzeug
  dependency-version: 3.1.6
  dependency-type: indirect
  dependency-group: uv
- dependency-name: filelock
  dependency-version: 3.20.3
  dependency-type: indirect
  dependency-group: uv
- dependency-name: idna
  dependency-version: '3.7'
  dependency-type: indirect
  dependency-group: uv
- dependency-name: setuptools
  dependency-version: 78.1.1
  dependency-type: indirect
  dependency-group: uv
- dependency-name: werkzeug
  dependency-version: 3.1.6
  dependency-type: indirect
  dependency-group: uv
- dependency-name: certifi
  dependency-version: 2024.7.4
  dependency-type: indirect
  dependency-group: uv
- dependency-name: filelock
  dependency-version: 3.20.3
  dependency-type: indirect
  dependency-group: uv
- dependency-name: idna
  dependency-version: '3.7'
  dependency-type: indirect
  dependency-group: uv
- dependency-name: pillow
  dependency-version: 12.1.1
  dependency-type: indirect
  dependency-group: uv
- dependency-name: setuptools
  dependency-version: 78.1.1
  dependency-type: indirect
  dependency-group: uv
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cbovalo cbovalo cbovalo approved these changes

@rdruilhe rdruilhe Awaiting requested review from rdruilhe

@leonicoletti leonicoletti Awaiting requested review from leonicoletti

+2 more reviewers

@alxyok alxyok alxyok approved these changes

@rmslm rmslm rmslm approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@A669015 @rmslm @alxyok @cbovalo