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

Use ert queue options #9486

Merged
merged 3 commits into from
Jan 13, 2025
Merged

Conversation

oyvindeide
Copy link
Collaborator

@oyvindeide oyvindeide commented Dec 9, 2024

Currently the queue options have to be kept manually in sync between the server and the simulator, while we also just have one long list of options, where we mix slurm, lsf and pbs related keywords. This bundles these together to simplify the configuration and the backend by just using the QueueOptions directly.

Resolves: #9611, resolves: #9613

  • PR title captures the intent of the changes, and is fitting for release notes.
  • Added appropriate release note label
  • Commit history is consistent and clean, in line with the contribution guidelines.
  • Make sure unit tests pass locally after every commit (git rebase -i main --exec 'pytest tests/ert/unit_tests -n logical -m "not integration_test"')

When applicable

  • When there are user facing changes: Updated documentation
  • New behavior or changes to existing untested code: Ensured that unit tests are added (See Ground Rules).
  • Large PR: Prepare changes in small commits for more convenient review
  • Bug fix: Add regression test for the bug
  • Bug fix: Create Backport PR to latest release

@oyvindeide oyvindeide force-pushed the use_ert_queue_options branch 8 times, most recently from 40d3659 to 44b1e73 Compare December 11, 2024 21:50
@codecov-commenter
Copy link

codecov-commenter commented Dec 11, 2024

Codecov Report

Attention: Patch coverage is 89.61039% with 8 lines in your changes missing coverage. Please review.

Project coverage is 91.70%. Comparing base (7b2bedf) to head (1ff75a9).
Report is 6 commits behind head on main.

Files with missing lines Patch % Lines
src/ert/scheduler/__init__.py 70.00% 3 Missing ⚠️
src/everest/config/server_config.py 91.30% 2 Missing ⚠️
src/ert/gui/simulation/experiment_panel.py 50.00% 1 Missing ⚠️
src/everest/config/everest_config.py 91.66% 1 Missing ⚠️
src/everest/config/simulator_config.py 95.45% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9486      +/-   ##
==========================================
- Coverage   91.73%   91.70%   -0.04%     
==========================================
  Files         426      424       -2     
  Lines       26535    26504      -31     
==========================================
- Hits        24342    24305      -37     
- Misses       2193     2199       +6     
Flag Coverage Δ
cli-tests 39.77% <43.75%> (-0.05%) ⬇️
everest-models-test 34.14% <76.62%> (-0.03%) ⬇️
gui-tests 74.33% <50.00%> (-0.01%) ⬇️
integration-test 37.90% <79.22%> (-0.10%) ⬇️
performance-tests 51.57% <50.00%> (-0.03%) ⬇️
test 39.26% <81.81%> (-0.26%) ⬇️
unit-tests 74.21% <50.64%> (-0.02%) ⬇️

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.

@oyvindeide oyvindeide force-pushed the use_ert_queue_options branch 6 times, most recently from bc1e0d6 to caa83a1 Compare December 13, 2024 07:05
@oyvindeide oyvindeide marked this pull request as ready for review December 13, 2024 07:06
@oyvindeide oyvindeide force-pushed the use_ert_queue_options branch 2 times, most recently from f5b5619 to 8570b6d Compare December 13, 2024 07:45
@oyvindeide oyvindeide added the release-notes:breaking-change Automatically categorise as breaking change in release notes label Dec 13, 2024
@oyvindeide oyvindeide force-pushed the use_ert_queue_options branch from 8570b6d to 865dee5 Compare December 19, 2024 08:01
Copy link

codspeed-hq bot commented Dec 19, 2024

CodSpeed Performance Report

Merging #9486 will not alter performance

Comparing oyvindeide:use_ert_queue_options (4cbf5d4) with main (5fb2308)

Summary

✅ 24 untouched benchmarks

@oyvindeide oyvindeide mentioned this pull request Dec 20, 2024
9 tasks
@oyvindeide oyvindeide force-pushed the use_ert_queue_options branch 4 times, most recently from 8024ead to 79150f9 Compare January 10, 2025 12:19
@yngve-sk
Copy link
Contributor

yngve-sk commented Jan 13, 2025

Seems to run fine. Docs seem fine too after building

Copy link
Contributor

@yngve-sk yngve-sk left a comment

Choose a reason for hiding this comment

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

🚀

@oyvindeide oyvindeide force-pushed the use_ert_queue_options branch 2 times, most recently from be930ab to a91916e Compare January 13, 2025 12:54
@oyvindeide oyvindeide enabled auto-merge (rebase) January 13, 2025 12:54
@oyvindeide oyvindeide force-pushed the use_ert_queue_options branch from a91916e to 4cbf5d4 Compare January 13, 2025 13:10
@oyvindeide oyvindeide merged commit 9b0a3b1 into equinor:main Jan 13, 2025
35 checks passed
@oyvindeide oyvindeide deleted the use_ert_queue_options branch January 13, 2025 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-notes:breaking-change Automatically categorise as breaking change in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support max_memory keywords also for LSF Align the queue config keywords with the keywords from ert
5 participants