Commit 76049fb2 authored by Philip ABBET's avatar Philip ABBET

Last-minute fix for v1.5.1

- Fix the database view 'DifferentFrequencies' of 'integers_db/1' - Fix the path used by the CI to execute the tests - Fix the version of the docker images needed
parent f221afa7
Pipeline #13523 failed with stage
in 15 minutes 4 seconds
......@@ -13,7 +13,7 @@ build:
- git clean -ffdx
- ${PREFIX}/bin/python bootstrap-buildout.py
- ./bin/buildout
- ./bin/python ${PREFIX}/bin/coverage run --source=${CI_PROJECT_NAME} ${PREFIX}/bin/nosetests -sv ${CI_PROJECT_NAME}
- ./bin/python ${PREFIX}/bin/coverage run --source=${CI_PROJECT_NAME} ./bin/nosetests -sv ${CI_PROJECT_NAME}
- ./bin/python ${PREFIX}/bin/coverage report
- ./bin/python ${PREFIX}/bin/sphinx-apidoc --separate -d 2 --output=doc/api ${CI_PROJECT_NAMESPACE}
- ./bin/python ${PREFIX}/bin/sphinx-build doc sphinx
......
......@@ -192,6 +192,21 @@ class SubprocessExecutor(RemoteExecutor):
'\n * '.join(self.errors))
# Check that the needed scripts are here
bin_path = os.path.dirname(sys.argv[0])
missing_scripts = []
if (self.db_address is not None) and \
not os.path.exists(os.path.join(bin_path, 'databases_provider')):
missing_scripts.append('databases_provider')
if not os.path.exists(os.path.join(bin_path, 'execute')):
missing_scripts.append('execute')
if missing_scripts:
raise RuntimeError("Scripts not found at path '%s': %s" % (bin_path, ', '.join(missing_scripts)))
# Creates the message handler
algorithm_process = None
......@@ -202,9 +217,6 @@ class SubprocessExecutor(RemoteExecutor):
self.input_list, self.output_list, self.ip_address, kill_callback=_kill)
bin_path = os.path.dirname(sys.argv[0])
#----- (If necessary) Instantiate the subprocess that provide the databases
databases_process = None
......
......@@ -150,6 +150,9 @@ class DifferentFrequencies:
self.values_a = [(1, 0, 3), (2, 4, 7)]
self.values_b = [(10, 0, 0), (20, 1, 1), (30, 2, 2), (40, 3, 3),
(50, 4, 4), (60, 5, 5), (70, 6, 6), (80, 7, 7)]
self.next_index = 0
return True
......@@ -158,17 +161,8 @@ class DifferentFrequencies:
def next(self):
if self.outputs['b'].isConnected():
current_index = self.values_b[0][1]
if (len(self.values_a) > 0) and (self.values_a[0][1] != current_index):
self.outputs['a'].write({
'value': numpy.int32(self.values_a[0][0]),
},
end_data_index=self.values_a[0][2]
)
self.values_a = self.values_a[1:]
if self.outputs['b'].isConnected() and \
(self.outputs['b'].last_written_data_index < self.next_index):
self.outputs['b'].write({
'value': numpy.int32(self.values_b[0][0]),
......@@ -177,7 +171,10 @@ class DifferentFrequencies:
)
self.values_b = self.values_b[1:]
else:
if self.outputs['a'].isConnected() and \
(self.outputs['a'].last_written_data_index < self.next_index):
self.outputs['a'].write({
'value': numpy.int32(self.values_a[0][0]),
},
......@@ -186,4 +183,7 @@ class DifferentFrequencies:
self.values_a = self.values_a[1:]
self.next_index = 1 + min([ x.last_written_data_index for x in self.outputs
if x.isConnected() ])
return True
#! /bin/bash
ALGORITHMS_ROOT="beat/core/test/prefix/algorithms/user"
DOCKER_IMAGE="docker.idiap.ch/beat/beat.env.client:1.3.0"
DOCKER_IMAGE="docker.idiap.ch/beat/beat.env.client:1.3.0r0"
BEAT_CORE_PATH=$(dirname "$0")
......
......@@ -4,7 +4,7 @@ IMAGES=(
docker.idiap.ch/beat/beat.env.system.python:1.2.0r2
docker.idiap.ch/beat/beat.env.db.examples:1.3.0r2
docker.idiap.ch/beat/beat.env.cxx:1.1.0r0
docker.idiap.ch/beat/beat.env.client:1.3.0
docker.idiap.ch/beat/beat.env.client:1.3.0r0
)
......
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