Commit 3da9a398 authored by André Anjos's avatar André Anjos 💬

Merge branch 'make_loop_processor_related_fields_clearer' into 'master'

Make loop processor related fields clearer

See merge request !92
parents 1f6fc3ae 353912f4
Pipeline #33417 passed with stages
in 24 minutes and 54 seconds
This diff is collapsed.
......@@ -52,12 +52,12 @@
"loop": {
"type": "object",
"properties": {
"algorithm": { "$ref": "../common/1.json#/definitions/reference" },
"parameters": { "$ref": "common.json#/definitions/parameter_set" },
"inputs": { "$ref": "common.json#/definitions/connection_map" },
"outputs": { "$ref": "common.json#/definitions/connection_map" },
"processor_algorithm": { "$ref": "../common/1.json#/definitions/reference" },
"processor_parameters": { "$ref": "common.json#/definitions/parameter_set" },
"processor_inputs": { "$ref": "common.json#/definitions/connection_map" },
"processor_outputs": { "$ref": "common.json#/definitions/connection_map" },
"queue": { "$ref": "common.json#/definitions/queue" },
"environment": { "$ref": "common.json#/definitions/environment" },
"processor_environment": { "$ref": "common.json#/definitions/environment" },
"nb_slots": { "$ref": "common.json#/definitions/slots" },
"evaluator_algorithm": { "$ref": "../common/1.json#/definitions/reference" },
"evaluator_parameters": { "$ref": "common.json#/definitions/parameter_set" },
......@@ -66,9 +66,9 @@
"evaluator_environment": { "$ref": "common.json#/definitions/environment" }
},
"required": [
"algorithm",
"inputs",
"outputs",
"processor_algorithm",
"processor_inputs",
"processor_outputs",
"evaluator_algorithm",
"evaluator_inputs",
"evaluator_outputs"
......
......@@ -86,13 +86,13 @@
"synchronized_channel": {
"$ref": "../database/1.json#/definitions/identifier"
},
"inputs": {
"processor_inputs": {
"type": "array",
"minItems": 1,
"uniqueItems": true,
"items": { "$ref": "common.json#/definitions/identifier" }
},
"outputs": {
"processor_outputs": {
"type": "array",
"minItems": 1,
"uniqueItems": true,
......@@ -114,8 +114,8 @@
"required": [
"name",
"synchronized_channel",
"inputs",
"outputs",
"processor_inputs",
"processor_outputs",
"evaluator_inputs",
"evaluator_outputs"
],
......
......@@ -4,13 +4,13 @@
},
"loops": {
"loop_super_block": {
"algorithm": "user/db_input_loop_processor/1",
"parameters": {
"processor_algorithm": "user/db_input_loop_processor/1",
"processor_parameters": {
},
"inputs": {
"processor_inputs": {
"in": "in"
},
"outputs": {
"processor_outputs": {
"out": "out"
},
......@@ -63,7 +63,7 @@
},
"queue": "queue",
"user/db_input_loop_evaluator/1" : {
"threshold": 9
"threshold": 1
}
}
}
......@@ -25,11 +25,11 @@
},
"loops": {
"loop_super_block": {
"algorithm": "user/db_input_loop_processor/1",
"inputs": {
"processor_algorithm": "user/db_input_loop_processor/1",
"processor_inputs": {
"in": "in"
},
"outputs": {
"processor_outputs": {
"out": "out"
},
......@@ -45,11 +45,11 @@
}
},
"echo_loop_block": {
"algorithm": "user/block_input_loop_processor/1",
"inputs": {
"processor_algorithm": "user/block_input_loop_processor/1",
"processor_inputs": {
"in": "in"
},
"outputs": {
"processor_outputs": {
"out": "out"
},
......@@ -98,7 +98,7 @@
},
"queue": "queue",
"user/db_input_loop_evaluator/1" : {
"threshold": 9
"threshold": 1
},
"user/block_input_loop_evaluator/1" : {
"threshold": 9
......
......@@ -41,10 +41,10 @@
{
"name": "loop_super_block",
"synchronized_channel": "integers",
"inputs": [
"processor_inputs": [
"in"
],
"outputs": [
"processor_outputs": [
"out"
],
"evaluator_inputs": [
......
......@@ -61,10 +61,10 @@
{
"name": "loop_super_block",
"synchronized_channel": "integers",
"inputs": [
"processor_inputs": [
"in"
],
"outputs": [
"processor_outputs": [
"out"
],
"evaluator_inputs": [
......@@ -77,10 +77,10 @@
{
"name": "echo_loop_block",
"synchronized_channel": "integers",
"inputs": [
"processor_inputs": [
"in"
],
"outputs": [
"processor_outputs": [
"out"
],
"evaluator_inputs": [
......
......@@ -232,7 +232,7 @@ class Toolchain(object):
else:
names[loop_name] = "/loops/%s[#%d]" % (loop_name, i)
for prefix in ["", "evaluator_"]:
for prefix in ["processor_", "evaluator_"]:
inputs += [
"%s.%s" % (loop_name, k) for k in loop[prefix + "inputs"]
]
......
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