Merge branch 'db-fixes' into 'master'

Small fixes the database tests so it flawlessly passes in [mac] builds

See merge request !93

bob/bio/face/database/meds.py

@@ -21,13 +21,6 @@ from sklearn.pipeline import make_pipeline
 import os
 
 
-cache_subdir = "datasets"
-filename = "meds.tar.gz"
-dataset_protocol_path = os.path.join(
-    os.path.expanduser("~"), "bob_data", cache_subdir, filename
-)
-
-
 class MEDSDatabase(CSVDatasetZTNorm):
     """
     The MEDS II database was developed by NIST to support and assists their biometrics evaluation program.
@@ -103,17 +96,14 @@ class MEDSDatabase(CSVDatasetZTNorm):
     def __init__(self, protocol):
 
         # Downloading model if not exists
-        urls = [
-            "https://www.idiap.ch/software/bob/databases/latest/meds.tar.gz",
-            "http://www.idiap.ch/software/bob/databases/latest/meds.tar.gz",
-        ]
-        get_file(filename, urls)
+        urls = MEDSDatabase.urls()
+        filename = get_file("meds.tar.gz", urls)
 
         self.annotation_type = "eyes-center"
         self.fixed_positions = None
 
         database = CSVDataset(
-            dataset_protocol_path,
+            filename,
             protocol,
             csv_to_sample_loader=make_pipeline(
                 CSVToSampleLoader(
@@ -128,3 +118,10 @@ class MEDSDatabase(CSVDatasetZTNorm):
         )
 
         super().__init__(database)
+
+    @staticmethod
+    def urls():
+        return [
+            "https://www.idiap.ch/software/bob/databases/latest/meds.tar.gz",
+            "http://www.idiap.ch/software/bob/databases/latest/meds.tar.gz",
+        ]

bob/bio/face/database/mobio.py

@@ -51,10 +51,7 @@ class MobioDatabase(CSVDatasetZTNorm):
     def __init__(self, protocol):
 
         # Downloading model if not exists
-        urls = [
-            "https://www.idiap.ch/software/bob/databases/latest/mobio.tar.gz",
-            "http://www.idiap.ch/software/bob/databases/latest/mobio.tar.gz",
-        ]
+        urls = MobioDatabase.urls()
         filename = get_file("mobio.tar.gz", urls)
 
         self.annotation_type = "eyes-center"
@@ -77,9 +74,6 @@ class MobioDatabase(CSVDatasetZTNorm):
 
         super().__init__(database)
 
-    # def zprobes(self, proportion=0.20):
-    #    return super().zprobes(proportion=proportion)
-
     @staticmethod
     def protocols():
         # TODO: Until we have (if we have) a function that dumps the protocols, let's use this one.
@@ -94,3 +88,10 @@ class MobioDatabase(CSVDatasetZTNorm):
             "mobile0-male",
             "mobile1-female",
         ]
+
+    @staticmethod
+    def urls():
+        return [
+            "https://www.idiap.ch/software/bob/databases/latest/mobio.tar.gz",
+            "http://www.idiap.ch/software/bob/databases/latest/mobio.tar.gz",
+        ]

bob/bio/face/database/morph.py

@@ -60,10 +60,7 @@ class MorphDatabase(CSVDatasetZTNorm):
     def __init__(self, protocol):
 
         # Downloading model if not exists
-        urls = [
-            "https://www.idiap.ch/software/bob/databases/latest/morph.tar.gz",
-            "http://www.idiap.ch/software/bob/databases/latest/morph.tar.gz",
-        ]
+        urls = MorphDatabase.urls()
         filename = get_file("morph.tar.gz", urls)
 
         self.annotation_type = "eyes-center"
@@ -85,3 +82,10 @@ class MorphDatabase(CSVDatasetZTNorm):
         )
 
         super().__init__(database)
+
+    @staticmethod
+    def urls():
+        return [
+            "https://www.idiap.ch/software/bob/databases/latest/morph.tar.gz",
+            "http://www.idiap.ch/software/bob/databases/latest/morph.tar.gz",
+        ]

bob/bio/face/database/multipie.py

@@ -23,10 +23,7 @@ class MultipieDatabase(CSVDataset):
     def __init__(self, protocol):
 
         # Downloading model if not exists
-        urls = [
-            "https://www.idiap.ch/software/bob/databases/latest/multipie.tar.gz",
-            "http://www.idiap.ch/software/bob/databases/latest/multipie.tar.gz",
-        ]
+        urls = MultipieDatabase.urls()
         filename = get_file("multipie.tar.gz", urls)
 
         self.annotation_type = ["eyes-center", "left-profile", "right-profile"]
@@ -72,3 +69,10 @@ class MultipieDatabase(CSVDataset):
             "P081",
             "P090",
         ]
+
+    @staticmethod
+    def urls():
+        return [
+            "https://www.idiap.ch/software/bob/databases/latest/multipie.tar.gz",
+            "http://www.idiap.ch/software/bob/databases/latest/multipie.tar.gz",
+        ]

bob/bio/face/test/test_databases.py

@@ -27,6 +27,7 @@ from bob.bio.base.test.test_database_implementations import (
     check_database_zt,
 )
 import bob.core
+from bob.extension.download import get_file
 
 logger = bob.core.log.setup("bob.bio.face")
 
@@ -159,6 +160,16 @@ def test_lfw():
 def test_mobio():
     from bob.bio.face.database import MobioDatabase
 
+    # Getting the absolute path
+    urls = MobioDatabase.urls()
+    filename = get_file("mobio.tar.gz", urls)
+
+    # Removing the file before the test
+    try:
+        os.remove(filename)
+    except:
+        pass
+
     protocols = MobioDatabase.protocols()
     for p in protocols:
         database = MobioDatabase(protocol=p)
@@ -188,6 +199,16 @@ def test_mobio():
 def test_multipie():
     from bob.bio.face.database import MultipieDatabase
 
+    # Getting the absolute path
+    urls = MultipieDatabase.urls()
+    filename = get_file("multipie.tar.gz", urls)
+
+    # Removing the file before the test
+    try:
+        os.remove(filename)
+    except:
+        pass
+
     protocols = MultipieDatabase.protocols()
 
     for p in protocols:
@@ -324,17 +345,54 @@ def test_fargo():
 
 
 def test_meds():
+
     from bob.bio.face.database import MEDSDatabase
 
+    # Getting the absolute path
+    urls = MEDSDatabase.urls()
+    filename = get_file("meds.tar.gz", urls)
+
+    # Removing the file before the test
+    try:
+        os.remove(filename)
+    except:
+        pass
+
     database = MEDSDatabase("verification_fold1")
 
     assert len(database.background_model_samples()) == 234
     assert len(database.references()) == 111
     assert len(database.probes()) == 313
 
-    assert len(database.references(group="dev"))
     assert len(database.zprobes()) == 80
     assert len(database.treferences()) == 80
 
     assert len(database.references(group="eval")) == 112
     assert len(database.probes(group="eval")) == 309
+
+
+def test_morph():
+
+    from bob.bio.face.database import MorphDatabase
+
+    # Getting the absolute path
+    urls = MorphDatabase.urls()
+    filename = get_file("morph.tar.gz", urls)
+
+    # Removing the file before the test
+    try:
+        os.remove(filename)
+    except:
+        pass
+
+    database = MorphDatabase("verification_fold1")
+
+    assert len(database.background_model_samples()) == 226
+    assert len(database.references()) == 6738
+    assert len(database.probes()) == 6557
+
+    assert len(database.zprobes()) == 66
+    assert len(database.treferences()) == 69
+
+    assert len(database.references(group="eval")) == 6742
+    assert len(database.probes(group="eval")) == 6553