Merge branch 'master' into python3.8

# Conflicts:
#	models/part_net.py
#	models/rgb_part_net.py

1 files changed, 2 insertions, 10 deletions

diff --git a/config.py b/config.py
index 424bf5b..88ad371 100644
--- a/config.py
+++ b/config.py
@@ -49,22 +49,14 @@ config: Configuration = {
             # Auto-encoder feature channels coefficient
             'ae_feature_channels': 64,
             # Appearance, canonical and pose feature dimensions
-            'f_a_c_p_dims': (128, 128, 64),
+            'f_a_c_p_dims': (192, 192, 96),
             # Use 1x1 convolution in dimensionality reduction
             'hpm_use_1x1conv': False,
             # HPM pyramid scales, of which sum is number of parts
             'hpm_scales': (1, 2, 4),
             # Global pooling method
             'hpm_use_avg_pool': True,
-            'hpm_use_max_pool': False,
-            # FConv feature channels coefficient
-            'fpfe_feature_channels': 32,
-            # FConv blocks kernel sizes
-            'fpfe_kernel_sizes': ((5, 3), (3, 3), (3, 3)),
-            # FConv blocks paddings
-            'fpfe_paddings': ((2, 1), (1, 1), (1, 1)),
-            # FConv blocks halving
-            'fpfe_halving': (0, 2, 3),
+            'hpm_use_max_pool': True,
             # Attention squeeze ratio
             'tfa_squeeze_ratio': 4,
             # Number of parts after Part Net