resolve conflict

nnaakkaaii · Jun 20, 2024 · 584e4ee · 584e4ee
2 parents e551b01 + 30024c6
commit 584e4ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/hrdae/conf/experiment/model/network/hrdae3d.yaml b/hrdae/conf/experiment/model/network/hrdae3d.yaml
@@ -16,14 +16,9 @@ conv_params:
     stride: [2]
     padding: [1]
     output_padding: [1]
-  - kernel_size: [3]
-    stride: [2]
-    padding: [1]
-    output_padding: [1]
 aggregation_method: concat
 activation: sigmoid  # tanh if pred_diff = true
 debug_show_dim: false
 defaults:
   - /config/experiment/model/network/hrdae3d@_here_
-  - motion_encoder: rnn1d
-#   - motion_encoder: rnn2d
+  - motion_encoder: rnn2d
diff --git a/hrdae/conf/experiment/model/network/motion_encoder/rnn2d.yaml b/hrdae/conf/experiment/model/network/motion_encoder/rnn2d.yaml
@@ -19,7 +19,7 @@ conv_params:
     padding: [1]
     output_padding: [1]
   - kernel_size: [3]
-    stride: []
+    stride: [1]
     padding: [1]
   - kernel_size: [3]
     stride: [2]