Skip to content

Commit

Permalink
Bug fix for LSF.
Browse files Browse the repository at this point in the history
The LSB_PJL_TASK_GEOMETRY variable was not set properly.
Fixed quoting of env values as well.
  • Loading branch information
christopherwharrop-noaa committed Apr 28, 2015
1 parent f607041 commit 0f7e3c4
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions lib/workflowmgr/lsfbatchsystem.rb
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def submit(task)
if env.nil?
envstr += "export #{name}\n"
else
envstr += "export #{name}=#{env}\n"
envstr += "export #{name}='#{env}'\n"
end
}

Expand Down Expand Up @@ -169,7 +169,7 @@ def submit(task)
end
cmd += " -R span[ptile=#{span}]"
cmd += " -n #{nval}"
envstr += "export #{ROCOTO_TASK_GEO}=#{task_geometry}\n"
envstr += "export ROCOTO_TASK_GEO='#{task_geometry}'\n"
end
when :nodes
# Get largest ppn*tpp to calculate ptile
Expand Down Expand Up @@ -212,7 +212,8 @@ def submit(task)
cmd += " -n #{nnodes*ptile}"

# Setenv the LSB_PJL_TASK_GEOMETRY to specify task layout
envstr += "export #{ROCOTO_TASK_GEO}=#{task_geometry}\n"
envstr += "export ROCOTO_TASK_GEO='#{task_geometry}'\n"

when :walltime
hhmm=WorkflowMgr.seconds_to_hhmm(WorkflowMgr.ddhhmmss_to_seconds(value))
cmd += " -W #{hhmm}"
Expand Down

0 comments on commit 0f7e3c4

Please sign in to comment.