Enable capability to provide cores/nodes request via a <native> tag.

christopherwharrop · May 29, 2019 · 6f8ae27 · 6f8ae27
1 parent fac5d74
commit 6f8ae27
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 32 deletions.
diff --git a/lib/workflowmgr/schema_with_metatasks.rng b/lib/workflowmgr/schema_with_metatasks.rng
@@ -465,14 +465,30 @@
           </element>
         </optional>
 
-        <!-- Either one cores tag or one nodes tag-->
+        <!-- Either one cores tag or one nodes or at least one native tag is required-->
         <choice>
-          <element name="cores">
-            <data type="positiveInteger"/>          
-          </element>
-          <element name="nodes">
-            <data type="string"/>          
-          </element>
+          <interleave>
+	    <choice>
+	      <element name="cores">
+		<data type="positiveInteger"/>
+	      </element>
+	      <element name="nodes">
+		<data type="string"/>
+	      </element>
+	    </choice>
+	    <optional>
+              <oneOrMore>
+	        <element name="native">
+		  <ref name="compoundTimeString"/>
+	        </element>
+              </oneOrMore>
+	    </optional>
+          </interleave>
+          <oneOrMore>
+            <element name="native">
+              <ref name="compoundTimeString"/>
+            </element>
+          </oneOrMore>
         </choice>
 
         <!-- One walltime tag -->
@@ -518,15 +534,6 @@
           </element>
         </optional>
 
-        <!-- One or more native tags -->
-        <optional>
-          <oneOrMore>
-            <element name="native">
-              <ref name="compoundTimeString"/>
-            </element>
-          </oneOrMore>
-        </optional>
-
         <!-- Optional nodesize tag -->
         <optional>
           <element name="nodesize">

diff --git a/lib/workflowmgr/schema_without_metatasks.rng b/lib/workflowmgr/schema_without_metatasks.rng
@@ -446,14 +446,30 @@
           </element>
         </optional>
 
-        <!-- Either one cores tag or one nodes tag-->
+        <!-- Either one cores tag or one nodes or at least one native tag is required-->
         <choice>
-          <element name="cores">
-            <data type="positiveInteger"/>
-          </element>
-          <element name="nodes">
-            <data type="string"/>
-          </element>
+          <interleave>
+	    <choice>
+	      <element name="cores">
+		<data type="positiveInteger"/>
+	      </element>
+	      <element name="nodes">
+		<data type="string"/>
+	      </element>
+	    </choice>
+	    <optional>
+              <oneOrMore>
+	        <element name="native">
+		  <ref name="compoundTimeString"/>
+	        </element>
+              </oneOrMore>
+	    </optional>
+          </interleave>
+          <oneOrMore>
+            <element name="native">
+              <ref name="compoundTimeString"/>
+            </element>
+          </oneOrMore>
         </choice>
 
         <!-- One walltime tag -->
@@ -499,15 +515,6 @@
           </element>
         </optional>
 
-        <!-- Zero or more native tags -->
-        <optional>
-          <oneOrMore>
-            <element name="native">
-              <ref name="compoundTimeString"/>
-            </element>
-          </oneOrMore>
-        </optional>
-
         <!-- Optional nodesize tag -->
         <optional>
           <element name="nodesize">