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

Variable name change to MAX_MPITASKS_PER_NODE for edison #1888

Closed
wants to merge 3 commits into from

Conversation

ndkeen
Copy link
Contributor

@ndkeen ndkeen commented Nov 6, 2017

For edison only:
Variable name change to MAX_MPITASKS_PER_NODE
And modify -c flag to account for threads. If using hyper-threads, make sure to change MAX_TASKS_PER_NODE.
No change if not using threads.
[BFB]

Variable name change to MAX_MPITASKS_PER_NODE
And modify -c flag to account for threads.  If using hyper-threads, make sure to change MAX_TASKS_PER_NODE.
No change if not using threads.
@ndkeen ndkeen added the Edison label Nov 6, 2017
@ndkeen ndkeen self-assigned this Nov 6, 2017
ndkeen added a commit that referenced this pull request Nov 6, 2017
…t (PR #1888)

For edison only:
Variable name change to MAX_MPITASKS_PER_NODE
And modify -c flag to account for threads. If using hyper-threads, make sure to change MAX_TASKS_PER_NODE.
No change if not using threads.
[BFB]
ndkeen added a commit that referenced this pull request Nov 7, 2017
@amametjanov
Copy link
Member

Are you sure about this?

@ndkeen
Copy link
Contributor Author

ndkeen commented Nov 7, 2017

My intention here was to simply back out the changes to edison (so that there would be no conflicts) as we are making those changes already in PR 1888. And this PR should only be for Cori. It's possible I did something wrong. Should I make another PR to avoid confusion?

@amametjanov
Copy link
Member

Did you test? E.g.: SMS.ne30_ne30.FC5AV1C-L.edison_intel.

@ndkeen
Copy link
Contributor Author

ndkeen commented Nov 7, 2017

Are you concerned about this PR or PR 1888?

@amametjanov
Copy link
Member

The name change was from PES_PER_NODE to MAX_MPITASKS_PER_NODE.

ndkeen added a commit that referenced this pull request Nov 7, 2017
…into next (PR #1888)"

This reverts commit ef4fd72, reversing
changes made to c115686.
ndkeen added a commit that referenced this pull request Nov 7, 2017
This reverts commit ccb0042.
Adjust the -c flag to srun, affecting hyper-threading.
@ndkeen
Copy link
Contributor Author

ndkeen commented Nov 7, 2017

reverted, making another

@ndkeen ndkeen closed this Nov 7, 2017
agsalin pushed a commit that referenced this pull request Nov 10, 2017
jgfouca pushed a commit to ESMCI/cime that referenced this pull request Nov 13, 2017
jgfouca pushed a commit to ESMCI/cime that referenced this pull request Nov 13, 2017
jgfouca added a commit that referenced this pull request Nov 13, 2017
…branch-for-to-acme-11-13-2017-pr

* commit '9442c938717a641d50c9ed5a0f9b2d34cf35a4ea':
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in #1888"
  Revert the change to edison as this is now in #1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
jgfouca added a commit that referenced this pull request Nov 13, 2017
…1896)

Update cime to ESMCI 5.4.0-alpha.09

Feature list:

Add optional COSTPES_PER_NODE field
Bugfix for checking locked files, BUILD_COMPLETE should not cause check to fail

[BFB]

* jgfouca/branch-for-to-acme-11-13-2017-pr:
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in #1888"
  Revert the change to edison as this is now in #1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
jgfouca added a commit that referenced this pull request Nov 14, 2017
#1896)

Update cime to ESMCI 5.4.0-alpha.09

Feature list:

Add optional COSTPES_PER_NODE field
Bugfix for checking locked files, BUILD_COMPLETE should not cause check to fail

[BFB]

* jgfouca/branch-for-to-acme-11-13-2017-pr:
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in #1888"
  Revert the change to edison as this is now in #1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
jgfouca added a commit to ESMCI/cime that referenced this pull request Dec 8, 2017
#1896)

Update cime to ESMCI 5.4.0-alpha.09

Feature list:

Add optional COSTPES_PER_NODE field
Bugfix for checking locked files, BUILD_COMPLETE should not cause check to fail

[BFB]

* jgfouca/branch-for-to-acme-11-13-2017-pr:
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
@rljacob rljacob deleted the ndk/machinefiles/edison-MAX_MPITASKS_PER_NODE branch February 15, 2018 16:11
jgfouca pushed a commit to ESMCI/cime that referenced this pull request Feb 23, 2018
jgfouca pushed a commit to ESMCI/cime that referenced this pull request Feb 23, 2018
jgfouca added a commit to ESMCI/cime that referenced this pull request Feb 23, 2018
…branch-for-to-acme-11-13-2017-pr

* commit '9442c938717a641d50c9ed5a0f9b2d34cf35a4ea':
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
jgfouca added a commit to ESMCI/cime that referenced this pull request Feb 23, 2018
#1896)

Update cime to ESMCI 5.4.0-alpha.09

Feature list:

Add optional COSTPES_PER_NODE field
Bugfix for checking locked files, BUILD_COMPLETE should not cause check to fail

[BFB]

* jgfouca/branch-for-to-acme-11-13-2017-pr:
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
jgfouca pushed a commit to ESMCI/cime that referenced this pull request Mar 13, 2018
jgfouca pushed a commit to ESMCI/cime that referenced this pull request Mar 13, 2018
jgfouca added a commit to ESMCI/cime that referenced this pull request Mar 13, 2018
…branch-for-to-acme-11-13-2017-pr

* commit '9442c938717a641d50c9ed5a0f9b2d34cf35a4ea':
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
jgfouca added a commit to ESMCI/cime that referenced this pull request Mar 13, 2018
#1896)

Update cime to ESMCI 5.4.0-alpha.09

Feature list:

Add optional COSTPES_PER_NODE field
Bugfix for checking locked files, BUILD_COMPLETE should not cause check to fail

[BFB]

* jgfouca/branch-for-to-acme-11-13-2017-pr:
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
sjsprecious pushed a commit to sjsprecious/CAM that referenced this pull request Oct 5, 2020
…branch-for-to-acme-11-13-2017-pr

* commit '9442c938717a641d50c9ed5a0f9b2d34cf35a4ea':
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
sjsprecious pushed a commit to sjsprecious/CAM that referenced this pull request Oct 5, 2020
…PR #1896)

Update cime to ESMCI 5.4.0-alpha.09

Feature list:

Add optional COSTPES_PER_NODE field
Bugfix for checking locked files, BUILD_COMPLETE should not cause check to fail

[BFB]

* jgfouca/branch-for-to-acme-11-13-2017-pr:
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
fischer-ncar pushed a commit to fischer-ncar/Tasks that referenced this pull request Jan 27, 2021
…branch-for-to-acme-11-13-2017-pr

* commit '9442c938717a641d50c9ed5a0f9b2d34cf35a4ea':
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
fischer-ncar pushed a commit to fischer-ncar/Tasks that referenced this pull request Jan 27, 2021
…PR #1896)

Update cime to ESMCI 5.4.0-alpha.09

Feature list:

Add optional COSTPES_PER_NODE field
Bugfix for checking locked files, BUILD_COMPLETE should not cause check to fail

[BFB]

* jgfouca/branch-for-to-acme-11-13-2017-pr:
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
fischer-ncar pushed a commit to ESCOMP/CESM_share that referenced this pull request Apr 9, 2021
…branch-for-to-acme-11-13-2017-pr

* commit '9442c938717a641d50c9ed5a0f9b2d34cf35a4ea':
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
fischer-ncar pushed a commit to ESCOMP/CESM_share that referenced this pull request Apr 9, 2021
…PR #1896)

Update cime to ESMCI 5.4.0-alpha.09

Feature list:

Add optional COSTPES_PER_NODE field
Bugfix for checking locked files, BUILD_COMPLETE should not cause check to fail

[BFB]

* jgfouca/branch-for-to-acme-11-13-2017-pr:
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
rljacob pushed a commit that referenced this pull request Apr 21, 2021
…branch-for-to-acme-11-13-2017-pr

* commit '3915cfda8866df152183f2b49f7b095142c50523':
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in #1888"
  Revert the change to edison as this is now in #1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
rljacob pushed a commit that referenced this pull request Apr 21, 2021
…branch-for-to-acme-11-13-2017-pr

* commit '3915cfda8866df152183f2b49f7b095142c50523':
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in #1888"
  Revert the change to edison as this is now in #1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
rljacob pushed a commit that referenced this pull request Apr 21, 2021
#1896)

Update cime to ESMCI 5.4.0-alpha.09

Feature list:

Add optional COSTPES_PER_NODE field
Bugfix for checking locked files, BUILD_COMPLETE should not cause check to fail

[BFB]

* jgfouca/branch-for-to-acme-11-13-2017-pr:
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in #1888"
  Revert the change to edison as this is now in #1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
ekluzek pushed a commit to ekluzek/mizuRoute that referenced this pull request Nov 30, 2022
…branch-for-to-acme-11-13-2017-pr

* commit '0664ddcbb0b1e6c64f094f97926c2e9be54d0288':
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
ekluzek pushed a commit to ekluzek/mizuRoute that referenced this pull request Nov 30, 2022
…PR #1896)

Update cime to ESMCI 5.4.0-alpha.09

Feature list:

Add optional COSTPES_PER_NODE field
Bugfix for checking locked files, BUILD_COMPLETE should not cause check to fail

[BFB]

* jgfouca/branch-for-to-acme-11-13-2017-pr:
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
wlin7 pushed a commit that referenced this pull request Feb 26, 2023
billsacks pushed a commit to billsacks/cprnc that referenced this pull request Dec 2, 2023
…branch-for-to-acme-11-13-2017-pr

* commit '2bea72733aafbb32b497eacc902bb58918dccdb4':
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
billsacks pushed a commit to billsacks/cprnc that referenced this pull request Dec 2, 2023
…branch-for-to-acme-11-13-2017-pr

* commit '2bea72733aafbb32b497eacc902bb58918dccdb4':
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
billsacks pushed a commit to billsacks/cprnc that referenced this pull request Dec 2, 2023
…PR #1896)

Update cime to ESMCI 5.4.0-alpha.09

Feature list:

Add optional COSTPES_PER_NODE field
Bugfix for checking locked files, BUILD_COMPLETE should not cause check to fail

[BFB]

* jgfouca/branch-for-to-acme-11-13-2017-pr:
  fix pylint issue
  rename
  locked files needs to handle BUILD_COMPLETE better
  Switch melvin to use officially supported pfunit
  add optional COST_PER_NODE
  Remove hardcoded email options for lc_slurm, cascade, constance, sooty
  Fix cobalt indent
  Remove hardcoded mail option for PBS
  Revert "Revert the change to edison as this is now in E3SM-Project/E3SM#1888"
  Revert the change to edison as this is now in E3SM-Project/E3SM#1888
  Undo/remove things that keep causing problems in the ESMCI merge.
  Update Slurm task-to-core affinities
  Efficiency updates for coupler bypass
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants