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

Remove deprecated queue options #9501

Merged

Conversation

jonathan-eq
Copy link
Contributor

@jonathan-eq jonathan-eq commented Dec 10, 2024

Issue
Resolves #9500
Resolves #9177

Approach
✂️
(Screenshot of new behavior in GUI if applicable)

  • 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

@jonathan-eq jonathan-eq added the release-notes:maintenance Automatically categorise as maintenance change in release notes label Dec 10, 2024
@jonathan-eq
Copy link
Contributor Author

Will squash commits^

@jonathan-eq jonathan-eq force-pushed the remove-depecated-queue-options branch 2 times, most recently from 22a898f to 1db89d8 Compare December 11, 2024 09:12
@codecov-commenter
Copy link

codecov-commenter commented Dec 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.83%. Comparing base (2e9c71a) to head (05e4043).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9501      +/-   ##
==========================================
- Coverage   91.89%   91.83%   -0.06%     
==========================================
  Files         433      433              
  Lines       26813    26768      -45     
==========================================
- Hits        24639    24582      -57     
- Misses       2174     2186      +12     
Flag Coverage Δ
cli-tests 39.75% <0.00%> (+0.01%) ⬆️
everest-models-test 34.59% <0.00%> (-0.01%) ⬇️
gui-tests 72.20% <0.00%> (+0.05%) ⬆️
integration-test 38.73% <0.00%> (-0.01%) ⬇️
performance-tests 52.00% <0.00%> (+0.06%) ⬆️
test 40.07% <0.00%> (+<0.01%) ⬆️
unit-tests 74.08% <100.00%> (-0.06%) ⬇️

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.

@berland berland changed the title Remove depecated queue options Remove deprecated queue options Dec 11, 2024
driver = OpenPBSDriver(memory_per_job="10gb")
await driver.submit(0, "sleep")
assert " -l mem=10gb" in Path("captured_qsub_args").read_text(encoding="utf-8")
async def test_realization_memory():
Copy link
Contributor

@xjules xjules Dec 12, 2024

Choose a reason for hiding this comment

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

I think there are some realization_memory tests already

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will delete

@pytest.mark.usefixtures("capturing_qsub")
async def test_full_resource_string(memory_per_job, num_cpu, cluster_label):
async def test_full_resource_string(realization_memory, num_cpu, cluster_label):
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the name still valid though? Since this one tests only realization memory in the resource string

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We also test for the select and cspus portion of the resource_string. The github preview of the changes is just acting up...

@xjules
Copy link
Contributor

xjules commented Dec 16, 2024

You need to rebase here.

@@ -332,23 +295,6 @@ The following is a list of all queue-specific configuration options:

QUEUE_OPTION TORQUE SUBMIT_SLEEP 0.5
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

After clarification, this will stay.

@xjules
Copy link
Contributor

xjules commented Dec 16, 2024

Need rebasing but otherwise very good job @jonathan-eq !

@jonathan-eq jonathan-eq force-pushed the remove-depecated-queue-options branch from 12b73f2 to 371c568 Compare December 17, 2024 09:10
Copy link

codspeed-hq bot commented Dec 17, 2024

CodSpeed Performance Report

Merging #9501 will not alter performance

Comparing jonathan-eq:remove-depecated-queue-options (177a3f3) with main (722e0fc)

Summary

✅ 24 untouched benchmarks

@jonathan-eq jonathan-eq force-pushed the remove-depecated-queue-options branch 2 times, most recently from 039337f to cf31328 Compare December 18, 2024 07:46
@jonathan-eq jonathan-eq requested a review from xjules December 18, 2024 07:46
@jonathan-eq jonathan-eq force-pushed the remove-depecated-queue-options branch 2 times, most recently from 13a3e24 to 05e4043 Compare December 20, 2024 08:25
Copy link
Contributor

@xjules xjules left a comment

Choose a reason for hiding this comment

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

Very nice job @jonathan-eq ! Just fix the commit message and it is good to go! 🚀

This commit removes the deprecated torque/openpbs queue options:
* QUEUE_QUERY_TIMEOUT
* NUM_NODES
* NUM_CPUS_PER_NODE
* QSTAT_OPTIONS
* MEMORY_PER_JOB
@jonathan-eq jonathan-eq force-pushed the remove-depecated-queue-options branch from 05e4043 to 177a3f3 Compare December 20, 2024 14:08
@jonathan-eq jonathan-eq merged commit b13ad45 into equinor:main Dec 20, 2024
40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-notes:maintenance Automatically categorise as maintenance change in release notes
Projects
None yet
4 participants