Update docs

bob/ip/binseg/modeling/driubn.py

@@ -74,7 +74,7 @@ def build_driu():
     -------
     :py:class:torch.nn.Module
     """
-    backbone = vgg16_bn(pretrained=False, return_features = [3, 8, 14, 22])
+    backbone = vgg16_bn(pretrained=False, return_features = [5, 12, 19, 29])
     driu_head = DRIU([64, 128, 256, 512])
 
     model = nn.Sequential(OrderedDict([("backbone", backbone), ("head", driu_head)]))

doc/configs.rst

@@ -175,6 +175,12 @@ DRIUSSL
 --------
 .. literalinclude:: ../bob/ip/binseg/configs/models/driussl.py
 
+.. _bob.ip.binseg.configs.models.driubnssl:
+
+DRIUBNSSL
+---------
+.. literalinclude:: ../bob/ip/binseg/configs/models/driubnssl.py
+
 
 .. _bob.ip.binseg.configs.models.m2unetssl:
 

doc/covdresults.rst

@@ -9,27 +9,29 @@ COVD- and COVD-SLL Results
 F1 Scores
 ===========
 
-+-------------------+---------------+---------+
-|                   | DRIU          | M2U-Net |
-+-------------------+---------------+---------+
-| COVD-DRIVE        | 0.7896        | 0.7906  |
-+-------------------+---------------+---------+
-| COVD-DRIVE SSL    | 0.7870        | 0.7938  |
-+-------------------+---------------+---------+
-| COVD-STARE        | 0.7979        | 0.8120  |
-+-------------------+---------------+---------+
-| COVD-STARE SSL    | 0.8062        | 0.8222  |
-+-------------------+---------------+---------+
-| COVD-CHASEDB1     | 0.7979        | 0.7898  |
-+-------------------+---------------+---------+
-| COVD-CHASEDB1 SSL | 0.7976        | 0.8000  |
-+-------------------+---------------+---------+
-| COVD-HRF          | 0.8013        | 0.8036  |
-+-------------------+---------------+---------+
-| COVD-HRF SSL      | 0.8002        | 0.7999  |
-+-------------------+---------------+---------+
-| COVD-IOSTAR       | 0.7934        | 0.7953  |
-+-------------------+---------------+---------+
-| COVD-IOSTAR SSL   | 0.7995        | 0.7868  |
-+-------------------+---------------+---------+
+F1 score together with standard deviation across test images.
+
++-------------------+--------+-----------------+---------+
+| F1 score          | DRIU   | DRIU BN         | M2U-Net |
++-------------------+--------+-----------------+---------+
+| COVD-DRIVE        | 0.7896 | 0.8000 (0.0182) | 0.7906  |
++-------------------+--------+-----------------+---------+
+| COVD-DRIVE SSL    | 0.7870 | 0.8020 (0.0179) | 0.7938  |
++-------------------+--------+-----------------+---------+
+| COVD-STARE        | 0.7979 | 0.8129 (0.0986) | 0.8120  |
++-------------------+--------+-----------------+---------+
+| COVD-STARE SSL    | 0.8062 | 0.8221 (0.0784) | 0.8222  |
++-------------------+--------+-----------------+---------+
+| COVD-CHASEDB1     | 0.7979 | 0.7923 (0.0240) | 0.7898  |
++-------------------+--------+-----------------+---------+
+| COVD-CHASEDB1 SSL | 0.7976 | 0.7992 (0.0235) | 0.8000  |
++-------------------+--------+-----------------+---------+
+| COVD-HRF          | 0.8013 | 0.8027 (0.0452) | 0.8036  |
++-------------------+--------+-----------------+---------+
+| COVD-HRF SSL      | 0.8002 |                 | 0.7999  |
++-------------------+--------+-----------------+---------+
+| COVD-IOSTAR       | 0.7934 | 0.7763 (0.0311) | 0.7953  |
++-------------------+--------+-----------------+---------+
+| COVD-IOSTAR SSL   | 0.7995 | 0.7904 (0.0215) | 0.7868  |
++-------------------+--------+-----------------+---------+
 

doc/evaluation.rst

@@ -31,14 +31,14 @@ Pretrained Models
 =================
 
 Due to storage limitations we only provide weights of a subset
-of all evaluated models, namely all DRIU and M2U-Net variants:
+of all evaluated models:
 
 
 
 +--------------------+--------------------+--------------------------------------------------------------------------------------------------------------------+
 |                    | DRIU               | M2UNet                                                                                                             |
 +--------------------+--------------------+--------------------------------------------------------------------------------------------------------------------+
-| DRIVE              | `DRIU_DRIVE.pth`_  |                                                                                                                    |
+| DRIVE              | `DRIU_DRIVE.pth`_  | `M2UNet_DRIVE.pth <m2unet_drive.pth_>`_                                                                            |
 +--------------------+--------------------+--------------------------------------------------------------------------------------------------------------------+
 | COVD-DRIVE         |                    | `M2UNet_COVD-DRIVE.pth <https://dl.dropboxusercontent.com/s/x5wb84uao8nlx44/M2UNet_COVD-DRIVE.pth>`_               |
 +--------------------+--------------------+--------------------------------------------------------------------------------------------------------------------+

doc/training.rst

@@ -63,7 +63,9 @@ Default Model configs
 =====================
 
 * DRIU
+* DRIUBN
 * DRIUSSL
+* DRIUBNSSL
 * DRIUOD
 * HED
 * M2UNet
@@ -205,7 +207,7 @@ COVD-:
     # model configs
     driu=DRIU
     m2u=M2UNet
-    b_driu=4
+    b_driu=2
     b_m2u=4
     # Train
     bob binseg train $driu $dataset -b $b_driu -d cuda -o $output"/"$driu -vv
@@ -218,7 +220,7 @@ COVD-:
     # model configs
     driu=DRIU
     m2u=M2UNet
-    b_driu=4
+    b_driu=2
     b_m2u=4
     # Train
     bob binseg train $driu $dataset -b $b_driu -d cuda -o $output"/"$driu -vv
@@ -288,7 +290,7 @@ COVD-SSL:
     # model configs
     driu=DRIUSSL
     m2u=M2UNetSSL
-    b_driu=1
+    b_driu=2
     b_m2u=2
     # Train
     bob binseg ssltrain $driu $dataset -b $b_driu -d cuda -o $output"/"$driu -vv