still use same padding for tests so easy to work with small samples

NREL · Nov 20, 2024 · e8345d4 · e8345d4
1 parent 3146313
commit e8345d4
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 2 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -33,8 +33,12 @@ def pytest_configure(config):  # pylint: disable=unused-argument # noqa: ARG001
         CONFIG_DIR, 'spatiotemporal', 'gen_3x_4x_2f.json'
     )
     pytest.S_FP_GEN = os.path.join(CONFIG_DIR, 'spatial', 'gen_2x_2f.json')
-    pytest.ST_FP_DISC = os.path.join(CONFIG_DIR, 'spatiotemporal', 'disc.json')
-    pytest.S_FP_DISC = os.path.join(CONFIG_DIR, 'spatial', 'disc.json')
+
+    # Note that disc should not use "same" zeros padding but easier to use this
+    # for testing on small sample sizes.
+    pytest.ST_FP_DISC = os.path.join(TEST_DATA_DIR, 'config_disc_st_test.json')
+    pytest.S_FP_DISC = os.path.join(TEST_DATA_DIR, 'config_disc_s_test.json')
+
     pytest.FPS_GCM = [
         os.path.join(TEST_DATA_DIR, 'ua_test.nc'),
         os.path.join(TEST_DATA_DIR, 'va_test.nc'),

diff --git a/tests/data/config_disc_s_test.json b/tests/data/config_disc_s_test.json
@@ -0,0 +1,24 @@
+{
+  "hidden_layers": [
+    {"class": "Conv2D", "filters": 32, "kernel_size": 3, "padding": "same", "strides": 1},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Conv2D", "filters": 32, "kernel_size": 3, "padding": "same", "strides": 2},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Conv2D", "filters": 64, "kernel_size": 3, "padding": "same", "strides": 1},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Conv2D", "filters": 64, "kernel_size": 3, "padding": "same", "strides": 2},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Conv2D", "filters": 128, "kernel_size": 3, "padding": "same", "strides": 1},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Conv2D", "filters": 128, "kernel_size": 3, "padding": "same", "strides": 2},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Conv2D", "filters": 256, "kernel_size": 3, "padding": "same", "strides": 1},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Conv2D", "filters": 256, "kernel_size": 3, "padding": "same", "strides": 2},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Flatten"},
+    {"class": "Dense", "units": 1024},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Dense", "units": 1}
+  ]
+}
diff --git a/tests/data/config_disc_st_test.json b/tests/data/config_disc_st_test.json
@@ -0,0 +1,26 @@
+{
+  "hidden_layers": [
+    {"class": "Conv3D", "filters": 32, "kernel_size": 3, "padding": "same", "strides": 1},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Conv3D", "filters": 32, "kernel_size": 3, "padding": "same", "strides": 2},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Conv3D", "filters": 64, "kernel_size": 3, "padding": "same", "strides": 1},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Conv3D", "filters": 64, "kernel_size": 3, "padding": "same", "strides": 2},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Conv3D", "filters": 128, "kernel_size": 3, "padding": "same", "strides": 1},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Conv3D", "filters": 128, "kernel_size": 3, "padding": "same", "strides": 2},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Conv3D", "filters": 256, "kernel_size": 3, "padding": "same", "strides": 1},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Conv3D", "filters": 256, "kernel_size": 3, "padding": "same", "strides": 2},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Flatten"},
+    {"class": "Dense", "units": 2048},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Dense", "units": 1024},
+    {"alpha": 0.2, "class": "LeakyReLU"},
+    {"class": "Dense", "units": 1}
+  ]
+}