Merge pull request #75 from deephealthproject/update_to_ecvl_1.0.3

Update to ECVL 1.0.3

Jenkinsfile

@@ -7,7 +7,7 @@ pipeline {
                     agent {
                         docker {
                             label 'docker'
-                            image 'dhealth/dev-pyecvl-base-cpu:5aa2785-ae5a59b'
+                            image 'dhealth/dev-pyecvl-base-cpu:f15a911-ae5a59b'
                         }
                     }
                     stages {

docs/source/installation.rst

@@ -212,6 +212,8 @@ EDDL version corresponding to each PyEDDL version):
 +----------------+--------------+----------------+--------------+
 |                |              | 1.3.0          | 1.1b         |
 +----------------+--------------+----------------+--------------+
+| 1.3.0          | 1.0.3        | 1.3.0          | 1.1b         |
++----------------+--------------+----------------+--------------+
 
 Thus, for instance, to install PyECVL 0.6.0::
 

pyecvl/support_eddl.py

@@ -298,6 +298,16 @@ def Push(self, sample, image, label):
         """
         return _ecvl.ProducersConsumerQueue.Push(self, sample, image, label)
 
+    def FreeLockedOnPush(self):
+        """\
+        Free threads locked on a push operation.
+
+        To be used in ``Stop`` when the data loading process needs to be
+        stopped before all the elements (batches) of the queue have been
+        consumed.
+        """
+        return _ecvl.ProducersConsumerQueue.FreeLockedOnPush(self)
+
     def Pop(self):
         """\
         Pop a sample.

pyecvl/version.py

@@ -18,4 +18,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-VERSION = "1.2.0"
+VERSION = "1.3.0"

src/func_binder.hpp

@@ -488,6 +488,7 @@ using timedelta = std::chrono::duration<int64_t, std::nano>;
    // Cast to ecvl::Image crashes with a segfault for empty images
    q.Push(sample, image, label);
   });
+  cl.def("FreeLockedOnPush", &ecvl::ProducersConsumerQueue::FreeLockedOnPush);
   cl.def("Pop", [](ecvl::ProducersConsumerQueue& q) -> pybind11::tuple {
     ecvl::Sample sample;
     Tensor* image;

tests/test_eddl.py

@@ -139,6 +139,7 @@ def test_ProducersConsumerQueue(ecvl):
     assert q.IsFull()
     q.SetSize(8)
     assert not q.IsFull()
+    q.FreeLockedOnPush()
     q.Clear()
     assert q.IsEmpty()