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

changes needed for hobart and hyperthreading #62

Merged
merged 1 commit into from
Jul 23, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion machines/config_machines.xml
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@
<BATCHSUBMIT>qsub </BATCHSUBMIT>
<GMAKE_J>4</GMAKE_J>
<MAX_TASKS_PER_NODE>48</MAX_TASKS_PER_NODE>
<PES_PER_NODE>24</PES_PER_NODE>
<batch_system type="pbs" version="x.y">
<queues>
<queue walltimemax="01:00:00" jobmin="1" jobmax="16">short</queue>
Expand Down Expand Up @@ -1104,7 +1105,7 @@
<SUPPORTED_BY>cseg</SUPPORTED_BY>
<GMAKE_J>8</GMAKE_J>
<MAX_TASKS_PER_NODE>30</MAX_TASKS_PER_NODE>
<PES_PER_NODE>16</PES_PER_NODE>
<PES_PER_NODE>16</PES_PER_NODE>
<PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
<batch_system type="lsf" version="9.1">
<queues>
Expand Down
11 changes: 11 additions & 0 deletions machines/config_pes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,12 @@
<PES_LEVEL>0</PES_LEVEL>
</pes>

<pes GRID="a%ne30np4" MACH="hobart">
<NTASKS_ATM>96</NTASKS_ATM> <NTHRDS_ATM>2</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM> <NINST_ATM>1</NINST_ATM>
<PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>24</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
<PES_LEVEL>0</PES_LEVEL>
</pes>

<pes GRID="a%ne30np4" MACH="eos">
<NTASKS_ATM>960</NTASKS_ATM> <NTHRDS_ATM>4</NTHRDS_ATM> <ROOTPE_ATM>0</ROOTPE_ATM> <NINST_ATM>1</NINST_ATM>
<PIO_NUMTASKS>-1</PIO_NUMTASKS><PIO_STRIDE>32</PIO_STRIDE> <PIO_TYPENAME>pnetcdf</PIO_TYPENAME> <PIO_ROOT>1</PIO_ROOT>
Expand Down Expand Up @@ -1729,6 +1735,11 @@
<PES_LEVEL>0p</PES_LEVEL>
</pes>

<pes MACH="hobart" COMPILER="nag|pgi|gnu">
<PIO_TYPENAME>netcdf</PIO_TYPENAME>
</pes>


<!-- tasks/thread setup - special case - GRID for CLM single-point regional grids
These ONLY can be used for I compsets CCSM_LCOMPSET=DATM.+CLM -->

Expand Down
3 changes: 2 additions & 1 deletion utils/perl5lib/Batch/BatchUtils.pm
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ sub submitSingleJob()
print "Submitting CESM job script $scriptname\n";
#my $runcmd = "$config{'BATCHSUBMIT'} $submitargs $config{'BATCHREDIRECT'} ./$scriptname $sta_argument";
my $runcmd = "$config{'BATCHSUBMIT'} $submitargs $config{'BATCHREDIRECT'} ./$scriptname ";

print "RUNCMD: $runcmd\n";
my $output;

eval {
Expand Down Expand Up @@ -598,6 +598,7 @@ sub submitSingleJob()

print "Submitting CESM job script $scriptname\n";
my $runcmd = "$config{'BATCHSUBMIT'} $submitargs $config{'BATCHREDIRECT'} ./$scriptname";
print "Runcmd: $runcmd\n";

my $output;

Expand Down
12 changes: 10 additions & 2 deletions utils/perl5lib/Task/TaskMaker.pm
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ sub new

}

sub max ($$) { $_[$_[0] < $_[1]] }
sub min ($$) { $_[$_[0] > $_[1]] }

#==============================================================================
# get a new ConfigCase object, resolve the case values.
Expand Down Expand Up @@ -242,7 +244,11 @@ sub _computeValues
{
print "self Max_TASKS_PER_NODE: $self->{'MAX_TASKS_PER_NODE'}\n";
print "threadcount $threadcount\n";
$taskpernode = $self->{'MAX_TASKS_PER_NODE'} / $threadcount;
if(defined $self->{'PES_PER_NODE'}){
$taskpernode = min($self->{'PES_PER_NODE'},$self->{'MAX_TASKS_PER_NODE'} / $threadcount);
}else{
$taskpernode = $self->{'MAX_TASKS_PER_NODE'} / $threadcount;
}
$taskpernode = ($taskpernode > $taskcount) ? $taskcount : $taskpernode;
$aprun = $aprun . " -n $taskcount -N $taskpernode -d $threadcount \${$self->{'EXEROOT'}/cesm.exe";
my $nodecount = $taskcount / $taskpernode;
Expand All @@ -260,7 +266,7 @@ sub _computeValues
$self->{'fullsum'} = $fullsum;
$taskgeom = $taskgeom.")";
$self->{'taskgeom'} = $taskgeom;
$taskpernode = $self->{'MAX_TASKS_PER_NODE'} / $threadcount;
$taskpernode = min($self->{'PES_PER_NODE'},$self->{'MAX_TASKS_PER_NODE'} / $threadcount);
$taskpernode = ($taskpernode > $taskcount) ? $taskcount : $taskpernode;
if($self->{'COMPILER'} eq "intel" && $taskpernode > 1)
{
Expand Down Expand Up @@ -475,4 +481,6 @@ sub document()

return $doc;
}


1;