Commit d96dcefe authored by Samuel GAIST's avatar Samuel GAIST

[toolchain] Rename loop_XXX fields to evaluator_XXX

This makes them coherent with the algorithm types.
parent 92dd0f72
......@@ -98,13 +98,13 @@
"uniqueItems": true,
"items": { "$ref": "common.json#/definitions/identifier" }
},
"loop_inputs": {
"evaluator_inputs": {
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": { "$ref": "common.json#/definitions/identifier" }
},
"loop_outputs": {
"evaluator_outputs": {
"type": "array",
"minItems": 1,
"uniqueItems": true,
......@@ -116,8 +116,8 @@
"synchronized_channel",
"inputs",
"outputs",
"loop_inputs",
"loop_outputs"
"evaluator_inputs",
"evaluator_outputs"
],
"additionalProperties": false
}
......
......@@ -47,10 +47,10 @@
"outputs": [
"out"
],
"loop_inputs": [
"evaluator_inputs": [
"in_loop"
],
"loop_outputs": [
"evaluator_outputs": [
"out_loop"
]
}
......
......@@ -67,10 +67,10 @@
"outputs": [
"out"
],
"loop_inputs": [
"evaluator_inputs": [
"in_loop"
],
"loop_outputs": [
"evaluator_outputs": [
"out_loop"
]
},
......@@ -83,10 +83,10 @@
"outputs": [
"out"
],
"loop_inputs": [
"evaluator_inputs": [
"in_loop"
],
"loop_outputs": [
"evaluator_outputs": [
"out_loop"
]
}
......
......@@ -232,10 +232,13 @@ class Toolchain(object):
else:
names[loop_name] = "/loops/%s[#%d]" % (loop_name, i)
inputs += ["%s.%s" % (loop_name, k) for k in loop["inputs"]]
inputs += ["%s.%s" % (loop_name, k) for k in loop["loop_inputs"]]
outputs += ["%s.%s" % (loop["name"], k) for k in loop["outputs"]]
outputs += ["%s.%s" % (loop["name"], k) for k in loop["loop_outputs"]]
for prefix in ["", "evaluator_"]:
inputs += [
"%s.%s" % (loop_name, k) for k in loop[prefix + "inputs"]
]
outputs += [
"%s.%s" % (loop["name"], k) for k in loop[prefix + "outputs"]
]
if loop["synchronized_channel"] not in channels:
self.errors.append(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment