Merge pull request #129 from NREL/gb/sup3rcc_configs

Gb/sup3rcc configs

sup3r/cli.py

@@ -479,18 +479,18 @@ def batch(ctx, dry_run, cancel, delete, monitor_background, verbose):
  config below, four sup3r pipelines will be created where arg1 and arg2 are
  set to [0, "a"], [0, "b"], [1, "a"], [1, "b"] in config_fwp.json::
 
- {
- "pipeline_config": "./config_pipeline.json",
- "sets": [
- {
- "args": {
- "arg1": [0, 1],
- "arg2": ["a", "b"],
- },
- "files": ["./config_fwp.json"],
- "set_tag": "set1"
- }
- }
+  {
+  "pipeline_config": "./config_pipeline.json",
+  "sets": [
+  {
+  "args": {
+  "arg1": [0, 1],
+  "arg2": ["a", "b"],
+  },
+  "files": ["./config_fwp.json"],
+  "set_tag": "set1"
+  }
+  }
 
  Note that you can use multiple "sets" to isolate parameter permutations.
  """

sup3r/configs/sup3rcc/README.rst

@@ -0,0 +1,26 @@
+**************************************************************************
+Spatiotemporal Super Resolving GAN configs for Climate Change Applications
+**************************************************************************
+
+This directory saves example configs for spatiotemporal super resolving GAN
+models for wind, solar, and temperature climate change data. All generator
+model configs should start with "gen_*" and should have two "_4x" tags (4 for
+example) that represents the spatial and temporal enhancements that the
+generator is designed for respectively and one "_3f" tag that represents the
+number of output features.
+
+For example "gen_2x_24x_2f.json" is a model that would enhance a 4km daily
+spatiotemporal field to 2km hourly with 2 output features.
+
+Unique model designs are utilized for each unique variable set. For example,
+when doing spatial super resolution of wind fields, a custom model with
+mid-network topography injection via a "Sup3rConcat" layer is used. For wind
+temporal super resolution, a 24x enhancement is used to go from daily to
+hourly, but for solar an 8x enhancement is used to go from 3 days to 24 hours
+of the middle day. Also, note that the "_trh_" model tag stands for temperature
+and relative humidity.
+
+These configs are only examples and are not guaranteed to be the models used in
+producing actual production datasets. For the final model architectures, see
+the global file attributes associated with sup3r output h5 files which should
+contain all model meta data.

sup3r/configs/solar_cc/gen_1x_8x_1f.json → sup3r/configs/sup3rcc/gen_solar_1x_8x_1f.json

@@ -15,25 +15,20 @@
  ]
  },
 
- {"class": "SkipConnection", "name": "big_skip"},
-
  {"n": 16, "repeat": [
- {"class": "SkipConnection", "name": "small_skip"},
  {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
  {"class": "Conv3D", "filters": 64, "kernel_size": 3, "strides": 1},
  {"class": "Cropping3D", "cropping": 2},
  {"alpha": 0.2, "class": "LeakyReLU"},
  {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
  {"class": "Conv3D", "filters": 64, "kernel_size": 3, "strides": 1},
- {"class": "Cropping3D", "cropping": 2},
- {"class": "SkipConnection", "name": "small_skip"}
+ {"class": "Cropping3D", "cropping": 2}
  ]
  },
 
  {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
  {"class": "Conv3D", "filters": 64, "kernel_size": 3, "strides": 1},
  {"class": "Cropping3D", "cropping": 2},
- {"class": "SkipConnection", "name": "big_skip"},
 
  {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
  {"class": "Conv3D", "filters": 1, "kernel_size": 3, "strides": 1},

sup3r/configs/sup3rcc/gen_solar_5x_1x_1f.json

@@ -0,0 +1,38 @@
+{
+ "hidden_layers": [
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv2D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping2D", "cropping": 2},
+ {"alpha": 0.2, "class": "LeakyReLU"},
+
+ {"class": "SkipConnection", "name": "big_skip"},
+
+ {"n": 16, "repeat": [
+ {"class": "SkipConnection", "name": "small_skip"},
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv2D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping2D", "cropping": 2},
+ {"alpha": 0.2, "class": "LeakyReLU"},
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv2D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping2D", "cropping": 2},
+ {"class": "SkipConnection", "name": "small_skip"}
+ ]
+ },
+
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv2D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping2D", "cropping": 2},
+ {"class": "SkipConnection", "name": "big_skip"},
+
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv2D", "filters": 1600, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping2D", "cropping": 2},
+ {"class": "SpatialExpansion", "spatial_mult": 5},
+ {"alpha": 0.2, "class": "LeakyReLU"},
+
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv2D", "filters": 1, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping2D", "cropping": 2}
+ ]
+}

sup3r/configs/solar_cc/gen_1x_24x_1f.json → sup3r/configs/sup3rcc/gen_trh_1x_24x_2f.json

@@ -15,28 +15,23 @@
  ]
  },
 
- {"class": "SkipConnection", "name": "big_skip"},
-
  {"n": 16, "repeat": [
- {"class": "SkipConnection", "name": "small_skip"},
  {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
  {"class": "Conv3D", "filters": 64, "kernel_size": 3, "strides": 1},
  {"class": "Cropping3D", "cropping": 2},
  {"alpha": 0.2, "class": "LeakyReLU"},
  {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
  {"class": "Conv3D", "filters": 64, "kernel_size": 3, "strides": 1},
- {"class": "Cropping3D", "cropping": 2},
- {"class": "SkipConnection", "name": "small_skip"}
+ {"class": "Cropping3D", "cropping": 2}
  ]
  },
 
  {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
  {"class": "Conv3D", "filters": 64, "kernel_size": 3, "strides": 1},
  {"class": "Cropping3D", "cropping": 2},
- {"class": "SkipConnection", "name": "big_skip"},
 
  {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
- {"class": "Conv3D", "filters": 1, "kernel_size": 3, "strides": 1},
+ {"class": "Conv3D", "filters": 2, "kernel_size": 3, "strides": 1},
  {"class": "Cropping3D", "cropping": 2}
  ]
 }

sup3r/configs/sup3rcc/gen_wind_1x_24x_6f.json

@@ -0,0 +1,37 @@
+{
+ "hidden_layers": [
+ {"class": "FlexiblePadding", "paddings": [[0,0], [2,2], [2,2], [2,2], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv3D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping3D", "cropping": 1},
+ {"alpha": 0.2, "class": "LeakyReLU"},
+ {"class": "SpatioTemporalExpansion", "temporal_mult": 3, "temporal_method": "nearest"},
+
+ {"n": 3, "repeat": [
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv3D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping3D", "cropping": 2},
+ {"alpha": 0.2, "class": "LeakyReLU"},
+ {"class": "SpatioTemporalExpansion", "temporal_mult": 2, "temporal_method": "nearest"}
+ ]
+ },
+
+ {"n": 16, "repeat": [
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv3D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping3D", "cropping": 2},
+ {"alpha": 0.2, "class": "LeakyReLU"},
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv3D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping3D", "cropping": 2}
+ ]
+ },
+
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv3D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping3D", "cropping": 2},
+
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv3D", "filters": 6, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping3D", "cropping": 2}
+ ]
+}

sup3r/configs/sup3rcc/gen_wind_5x_1x_6f.json

@@ -0,0 +1,60 @@
+{
+ "hidden_layers": [
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv2D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping2D", "cropping": 2},
+ {"alpha": 0.2, "class": "LeakyReLU"},
+
+ {"class": "SkipConnection", "name": "big_skip_1"},
+
+ {"n": 8, "repeat": [
+ {"class": "SkipConnection", "name": "small_skip_1"},
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv2D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping2D", "cropping": 2},
+ {"alpha": 0.2, "class": "LeakyReLU"},
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv2D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping2D", "cropping": 2},
+ {"class": "SkipConnection", "name": "small_skip_1"}
+ ]
+ },
+
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv2D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping2D", "cropping": 2},
+ {"class": "SkipConnection", "name": "big_skip_1"},
+
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv2D", "filters": 1600, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping2D", "cropping": 2},
+ {"class": "SpatialExpansion", "spatial_mult": 5},
+ {"alpha": 0.2, "class": "LeakyReLU"},
+
+ {"class": "Sup3rConcat"},
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv2D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping2D", "cropping": 2},
+ {"alpha": 0.2, "class": "LeakyReLU"},
+
+ {"class": "SkipConnection", "name": "big_skip_2"},
+
+ {"n": 8, "repeat": [
+ {"class": "SkipConnection", "name": "small_skip_2"},
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv2D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping2D", "cropping": 2},
+ {"alpha": 0.2, "class": "LeakyReLU"},
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv2D", "filters": 64, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping2D", "cropping": 2},
+ {"class": "SkipConnection", "name": "small_skip_2"}
+ ]
+ },
+ {"class": "SkipConnection", "name": "big_skip_2"},
+
+ {"class": "FlexiblePadding", "paddings": [[0,0], [3,3], [3,3], [0,0]], "mode": "REFLECT"},
+ {"class": "Conv2D", "filters": 6, "kernel_size": 3, "strides": 1},
+ {"class": "Cropping2D", "cropping": 2}
+ ]
+}

sup3r/version.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """SUP3R Version"""
 
-__version__ = '0.0.5'
+__version__ = '0.0.6'

tests/test_multi_step.py

@@ -179,7 +179,7 @@ def test_solar_multistep():
 
  features_in_3 = ['clearsky_ratio', 'U_200m', 'V_200m']
  features_out_3 = ['clearsky_ratio']
- fp_gen = os.path.join(CONFIG_DIR, 'solar_cc/gen_1x_8x_1f.json')
+ fp_gen = os.path.join(CONFIG_DIR, 'sup3rcc/gen_solar_1x_8x_1f.json')
  fp_disc = os.path.join(CONFIG_DIR, 'spatiotemporal/disc.json')
  model3 = Sup3rGan(fp_gen, fp_disc)
  _ = model3.generate(np.ones((4, 10, 10, 3, len(features_in_3))))