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

Merge upstream #10

Merged
merged 28 commits into from
Mar 7, 2024
Merged

Merge upstream #10

merged 28 commits into from
Mar 7, 2024

Conversation

sadamov
Copy link
Collaborator

@sadamov sadamov commented Mar 6, 2024

This PR consists of a merge with upstream/main including reformating and linting using new pre-comits. I suggest to review this PR by doing the following (instead of checking each line change):

  • Create env with pip
  • Create env with conda
  • Run slurm_train.sh
  • Run slurm_eval.sh

If all runs through smoothly without errors, we can merge. I am handling this a bit like an initial commit.

joeloskarsson and others added 20 commits October 12, 2023 12:18
- Move all data dimensionality constants to constants.py
- Add note about ccai_paper_2023 branch
- Create metrics module with common interface
- Introduce nll and crps_gauss metrics, also available as losses
- Introduce output_std option to let models output std.-devs.
- Change validation metric from mae to rmse
- Change definition of rmse to take sqrt after spatial averaging only
- Add possibility to watch specific metrics and log as scalars, specified in constants.py
- Added linting and formatting using pre-commits
- Trigger pre-commit on main-branch push
- Change line length to 80
- Fixing existing formatting issues
- Added section about development with pre-commits
---------

Co-authored-by: joeloskarsson <[email protected]>
- Make github action env completely match installation instructions in readme
- Configure duplicate code threshold to be less harsh
@sadamov sadamov requested a review from twicki March 6, 2024 17:40
@sadamov
Copy link
Collaborator Author

sadamov commented Mar 6, 2024

@joeloskarsson Just wanted to let you know that I have prepared myself for our co-coding session in May 💻. Our main-branch is up-to-date with yours 🤝 Thanks again for implementing the pre-commits!

.vscode/launch.json Outdated Show resolved Hide resolved
pyproject.toml Show resolved Hide resolved
xarray>=2024.1.1
tueplots>=0.0.8
plotly>=5.15.0
# for dev
Copy link

Choose a reason for hiding this comment

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

normally you would do a two-stepped approach here where you specify the two requirements in two files. See here for example:
https://github.com/MeteoSwiss-APN/nwp_log_mining/blob/main/requirements/requirements_build.txt
https://github.com/MeteoSwiss-APN/nwp_log_mining/blob/main/requirements/requirements_run.txt

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is directly defined by upstream. If you have strong feelings about it I can create a PR? otherwise I would suggest to use the conda within MeteoSwiss as it is easier and consistent with our common practices.

Copy link

Choose a reason for hiding this comment

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

ah I see. Then this is clearly out of scope of this PR.

I think I can create a PR upstream then

slurm_eval.sh Show resolved Hide resolved
train_model.py Outdated Show resolved Hide resolved
@sadamov sadamov merged commit c1fcef3 into main Mar 7, 2024
1 check passed
@sadamov sadamov deleted the merge_upstream branch March 7, 2024 16:42
clechartre pushed a commit to clechartre/neural-lam that referenced this pull request May 30, 2024
Merge upstream
Conflicts:
	.github/workflows/pre-commit.yml
	.gitignore
	.pre-commit-config.yaml
	README.md
	create_grid_features.py
	create_mesh.py
	create_parameter_weights.py
	create_static_features.py
	create_zarr_archive.py
	environment.yml
	helper.py
	neural_lam/constants.py
	neural_lam/models/ar_model.py
	neural_lam/models/base_graph_model.py
	neural_lam/models/base_hi_graph_model.py
	neural_lam/rotate_grid.py
	neural_lam/utils.py
	neural_lam/vis.py
	neural_lam/weather_dataset.py
	plot_graph.py
	pyproject.toml
	requirements.txt
	slurm_eval.sh
	slurm_train.sh
	train_model.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants