From f241a43863a051ab5311e2bddbb226eb369978ca Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Tue, 16 Jul 2019 18:06:06 +0200
Subject: [PATCH] [test][loop_executor] Refactor test to ensure proper run
Currently input and output cache files were "shared"
because of how the configuration was made.
Also, the input for the loop algorithm, although the same
as the loop_user, was not properly generated as a separate
input.
---
.../invalid_loop_validate_output/1.json | 4 +--
.../prefix/algorithms/autonomous/loop/1.json | 4 +--
.../prefix/algorithms/autonomous/loop/1.py | 5 ++--
.../algorithms/autonomous/loop_user/1.json | 4 +--
.../algorithms/autonomous/loop_user/1.py | 8 +++---
.../algorithms/sequential/loop_user/1.json | 4 +--
.../algorithms/sequential/loop_user/1.py | 4 +--
.../backend/python/test/test_loop_executor.py | 25 +++++++++++--------
8 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/beat/backend/python/test/prefix/algorithms/autonomous/invalid_loop_validate_output/1.json b/beat/backend/python/test/prefix/algorithms/autonomous/invalid_loop_validate_output/1.json
index 97e8978..fdcd100 100644
--- a/beat/backend/python/test/prefix/algorithms/autonomous/invalid_loop_validate_output/1.json
+++ b/beat/backend/python/test/prefix/algorithms/autonomous/invalid_loop_validate_output/1.json
@@ -7,12 +7,12 @@
"groups": [
{
"inputs": {
- "in": {
+ "in_loop": {
"type": "user/single_integer/1"
}
},
"outputs": {
- "out": {
+ "out_loop": {
"type": "user/single_integer/1"
}
},
diff --git a/beat/backend/python/test/prefix/algorithms/autonomous/loop/1.json b/beat/backend/python/test/prefix/algorithms/autonomous/loop/1.json
index 7dd7d7c..4647680 100644
--- a/beat/backend/python/test/prefix/algorithms/autonomous/loop/1.json
+++ b/beat/backend/python/test/prefix/algorithms/autonomous/loop/1.json
@@ -6,12 +6,12 @@
"groups": [
{
"inputs": {
- "in": {
+ "in_loop": {
"type": "user/single_integer/1"
}
},
"outputs": {
- "out": {
+ "out_loop": {
"type": "user/single_integer/1"
}
},
diff --git a/beat/backend/python/test/prefix/algorithms/autonomous/loop/1.py b/beat/backend/python/test/prefix/algorithms/autonomous/loop/1.py
index 19043c4..7f61262 100644
--- a/beat/backend/python/test/prefix/algorithms/autonomous/loop/1.py
+++ b/beat/backend/python/test/prefix/algorithms/autonomous/loop/1.py
@@ -53,7 +53,6 @@ class Algorithm:
return (result, {"value": np.int64(value)})
- def write(self, outputs):
- outputs["out"].write({"value": np.int32(self.output)})
+ def write(self, outputs, end_data_index):
+ outputs["out_loop"].write({"value": np.int32(self.output)}, end_data_index)
return True
-
diff --git a/beat/backend/python/test/prefix/algorithms/autonomous/loop_user/1.json b/beat/backend/python/test/prefix/algorithms/autonomous/loop_user/1.json
index aed1f93..28e49e7 100644
--- a/beat/backend/python/test/prefix/algorithms/autonomous/loop_user/1.json
+++ b/beat/backend/python/test/prefix/algorithms/autonomous/loop_user/1.json
@@ -7,12 +7,12 @@
"groups": [
{
"inputs": {
- "in": {
+ "in_main": {
"type": "user/single_integer/1"
}
},
"outputs": {
- "out": {
+ "out_main": {
"type": "user/single_integer/1"
}
},
diff --git a/beat/backend/python/test/prefix/algorithms/autonomous/loop_user/1.py b/beat/backend/python/test/prefix/algorithms/autonomous/loop_user/1.py
index 4507fcf..7bf894d 100644
--- a/beat/backend/python/test/prefix/algorithms/autonomous/loop_user/1.py
+++ b/beat/backend/python/test/prefix/algorithms/autonomous/loop_user/1.py
@@ -45,13 +45,13 @@ class Algorithm:
cnt = cnt - 1
is_valid, _ = loop_channel.validate({"value": np.full(10, cnt)})
- data_loader = data_loaders.loaderOf("in")
+ data_loader = data_loaders.loaderOf("in_main")
for i in range(data_loader.count()):
- view = data_loader.view("in", i)
+ view = data_loader.view("in_main", i)
(data, start, end) = view[view.count() - 1]
- value = data["in"].value
+ value = data["in_main"].value
new_value = value + cnt
- outputs["out"].write({"value": np.int32(new_value)}, end)
+ outputs["out_main"].write({"value": np.int32(new_value)}, end)
return True
diff --git a/beat/backend/python/test/prefix/algorithms/sequential/loop_user/1.json b/beat/backend/python/test/prefix/algorithms/sequential/loop_user/1.json
index cc01fad..d1ada21 100644
--- a/beat/backend/python/test/prefix/algorithms/sequential/loop_user/1.json
+++ b/beat/backend/python/test/prefix/algorithms/sequential/loop_user/1.json
@@ -7,12 +7,12 @@
"groups": [
{
"inputs": {
- "in": {
+ "in_main": {
"type": "user/single_integer/1"
}
},
"outputs": {
- "out": {
+ "out_main": {
"type": "user/single_integer/1"
}
},
diff --git a/beat/backend/python/test/prefix/algorithms/sequential/loop_user/1.py b/beat/backend/python/test/prefix/algorithms/sequential/loop_user/1.py
index 5fd5841..5767abd 100644
--- a/beat/backend/python/test/prefix/algorithms/sequential/loop_user/1.py
+++ b/beat/backend/python/test/prefix/algorithms/sequential/loop_user/1.py
@@ -45,8 +45,8 @@ class Algorithm:
cnt = cnt - 1
is_valid, _ = loop_channel.validate({"value": np.full(10, cnt)})
- value = inputs["in"].data.value
+ value = inputs["in_main"].data.value
new_value = value + cnt
- outputs["out"].write({"value": np.int32(new_value)})
+ outputs["out_main"].write({"value": np.int32(new_value)})
return True
diff --git a/beat/backend/python/test/test_loop_executor.py b/beat/backend/python/test/test_loop_executor.py
index 441f9aa..12dd447 100644
--- a/beat/backend/python/test/test_loop_executor.py
+++ b/beat/backend/python/test/test_loop_executor.py
@@ -73,14 +73,14 @@ CONFIGURATION = {
"algorithm": "",
"channel": "main",
"parameters": {},
- "inputs": {"in": {"path": "INPUT", "channel": "main"}},
- "outputs": {"out": {"path": "OUTPUT", "channel": "main"}},
+ "inputs": {"in_main": {"path": "INPUT", "channel": "main"}},
+ "outputs": {"out_main": {"path": "OUTPUT_MAIN", "channel": "main"}},
"loop": {
"algorithm": "",
"channel": "main",
"parameters": {"threshold": 1},
- "inputs": {"in": {"path": "INPUT", "channel": "main"}},
- "outputs": {"out": {"path": "LOOP_OUTPUT", "channel": "main"}},
+ "inputs": {"in_loop": {"path": "INPUT_LOOP", "channel": "main"}},
+ "outputs": {"out_loop": {"path": "LOOP_OUTPUT", "channel": "main"}},
},
}
@@ -105,6 +105,7 @@ class TestExecution(unittest.TestCase):
shutil.rmtree(self.working_dir)
if self.loop_executor:
+ self.loop_socket.send_string("don")
self.loop_executor.wait()
for handler in [self.message_handler, self.loop_message_handler]:
@@ -123,11 +124,10 @@ class TestExecution(unittest.TestCase):
self.zmq_context.destroy()
self.zmq_context = None
- def writeData(self, input_name, indices, start_value):
+ def writeData(self, config, input_name, indices, start_value):
filename = os.path.join(
- self.cache_root, CONFIGURATION["inputs"][input_name]["path"] + ".data"
+ self.cache_root, config["inputs"][input_name]["path"] + ".data"
)
-
dataformat = DataFormat(prefix, "user/single_integer/1")
self.assertTrue(dataformat.valid)
@@ -149,7 +149,11 @@ class TestExecution(unittest.TestCase):
del data_sink
def process(self, algorithm_name, loop_algorithm_name):
- self.writeData("in", [(0, 0), (1, 1), (2, 2), (3, 3)], 1000)
+
+ self.writeData(CONFIGURATION, "in_main", [(0, 0), (1, 1), (2, 2), (3, 3)], 1000)
+ self.writeData(
+ CONFIGURATION["loop"], "in_loop", [(0, 0), (1, 1), (2, 2), (3, 3)], 1000
+ )
# -------------------------------------------------------------------------
@@ -214,7 +218,8 @@ class TestExecution(unittest.TestCase):
self.assertTrue(
cached_file.setup(
os.path.join(
- self.cache_root, CONFIGURATION["outputs"]["out"]["path"] + ".data"
+ self.cache_root,
+ CONFIGURATION["outputs"]["out_main"]["path"] + ".data",
),
prefix,
)
@@ -230,7 +235,7 @@ class TestExecution(unittest.TestCase):
success = cached_file.setup(
os.path.join(
self.cache_root,
- CONFIGURATION["loop"]["outputs"]["out"]["path"] + ".data",
+ CONFIGURATION["loop"]["outputs"]["out_loop"]["path"] + ".data",
),
prefix,
)
--
GitLab