Merge pull request #69 from christopherwharrop/release/1.3.1

Bugfix release
christopherwharrop · Jul 3, 2019 · 6ffbf6f · 6ffbf6f
2 parents c3a0ade + 3e174be
commit 6ffbf6f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,10 @@
 # Release Notes
 
+## New for Version 1.3.1
+
+* Fix XML validation bug that caused sensitivity to ordering of tags
+* Fix <nodes> handling for PBSPro to allow specificaiton of node features 
+
 ## New for Version 1.3.0
 
 * Update SLURM support to handle pack groups

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.3.0
+1.3.1
diff --git a/lib/workflowmgr/pbsprobatchsystem.rb b/lib/workflowmgr/pbsprobatchsystem.rb
@@ -231,7 +231,6 @@ def submit(task)
                  ompthreads=$1.to_i
                end
                input += chunk.gsub(/ppn=\d+/,"mpiprocs=#{mpiprocs}").gsub(/tpp=\d+/,"ompthreads=#{ompthreads}")
-#               input += ":ncpus=#{nodesize}"
                input += ":ncpus=#{mpiprocs * ompthreads}"
                input += ":mem=#{task.attributes[:memory]}" unless task.attributes[:memory].nil?
                input += "+"