Update iris example, fix small bugs

Author: deliahu

examples/iris/resources/aggregates.yaml

@@ -1,62 +1,44 @@
 - kind: aggregate
   name: sepal_length_mean
   aggregator: cortex.mean
-  inputs:
-    columns:
-      col: sepal_length
+  input: @sepal_length
 
 - kind: aggregate
   name: sepal_length_stddev
   aggregator: cortex.stddev
-  inputs:
-    columns:
-      col: sepal_length
+  input: @sepal_length
 
 - kind: aggregate
   name: sepal_width_mean
   aggregator: cortex.mean
-  inputs:
-    columns:
-      col: sepal_width
+  input: @sepal_width
 
 - kind: aggregate
   name: sepal_width_stddev
   aggregator: cortex.stddev
-  inputs:
-    columns:
-      col: sepal_width
+  input: @sepal_width
 
 - kind: aggregate
   name: petal_length_mean
   aggregator: cortex.mean
-  inputs:
-    columns:
-      col: petal_length
+  input: @petal_length
 
 - kind: aggregate
   name: petal_length_stddev
   aggregator: cortex.stddev
-  inputs:
-    columns:
-      col: petal_length
+  input: @petal_length
 
 - kind: aggregate
   name: petal_width_mean
   aggregator: cortex.mean
-  inputs:
-    columns:
-      col: petal_width
+  input: @petal_width
 
 - kind: aggregate
   name: petal_width_stddev
   aggregator: cortex.stddev
-  inputs:
-    columns:
-      col: petal_width
+  input: @petal_width
 
 - kind: aggregate
   name: class_index
   aggregator: cortex.index_string
-  inputs:
-    columns:
-      col: class
+  input: @class

examples/iris/resources/apis.yaml

@@ -1,5 +1,5 @@
 - kind: api
   name: iris-type
-  model_name: dnn
+  model: @dnn
   compute:
     replicas: 1

examples/iris/resources/models.yaml

@@ -1,12 +1,14 @@
 - kind: model
   name: dnn
-  type: classification
-  target_column: class_indexed
-  feature_columns:
-    - sepal_length_normalized
-    - sepal_width_normalized
-    - petal_length_normalized
-    - petal_width_normalized
+  estimator_path: implementations/models/dnn.py
+  target_column: @class_indexed
+  input:
+    cols:
+      - @sepal_length_normalized
+      - @sepal_width_normalized
+      - @petal_length_normalized
+      - @petal_width_normalized
+    num_classes: 3
   hparams:
     hidden_units: [4, 2]
   data_partition_ratio:
@@ -15,4 +17,3 @@
   training:
     batch_size: 10
     num_steps: 1000
-  aggregates: [class_index]

examples/iris/resources/raw_columns.yaml

@@ -3,7 +3,7 @@
   data:
     type: csv
     path: s3a://cortex-examples/iris.csv
-    schema: [sepal_length, sepal_width, petal_length, petal_width, class]
+    schema: [@sepal_length, @sepal_width, @petal_length, @petal_width, @class]
 
 
 - kind: environment
@@ -13,15 +13,15 @@
     path: s3a://cortex-examples/iris.parquet
     schema:
       - parquet_column_name: sepal_length
-        raw_column_name: sepal_length
+        raw_column: @sepal_length
       - parquet_column_name: sepal_width
-        raw_column_name: sepal_width
+        raw_column: @sepal_width
       - parquet_column_name: petal_length
-        raw_column_name: petal_length
+        raw_column: @petal_length
       - parquet_column_name: petal_width
-        raw_column_name: petal_width
+        raw_column: @petal_width
       - parquet_column_name: class
-        raw_column_name: class
+        raw_column: @class
 
 - kind: raw_column
   name: sepal_length

examples/iris/resources/transformed_columns.yaml

@@ -1,48 +1,38 @@
 - kind: transformed_column
   name: sepal_length_normalized
   transformer: cortex.normalize
-  inputs:
-    columns:
-      num: sepal_length
-    args:
-      mean: sepal_length_mean
-      stddev: sepal_length_stddev
+  input:
+    col: @sepal_length
+    mean: @sepal_length_mean
+    stddev: @sepal_length_stddev
 
 - kind: transformed_column
   name: sepal_width_normalized
   transformer: cortex.normalize
-  inputs:
-    columns:
-      num: sepal_width
-    args:
-      mean: sepal_width_mean
-      stddev: sepal_width_stddev
+  input:
+    col: @sepal_width
+    mean: @sepal_width_mean
+    stddev: @sepal_width_stddev
 
 - kind: transformed_column
   name: petal_length_normalized
   transformer: cortex.normalize
-  inputs:
-    columns:
-      num: petal_length
-    args:
-      mean: petal_length_mean
-      stddev: petal_length_stddev
+  input:
+    col: @petal_length
+    mean: @petal_length_mean
+    stddev: @petal_length_stddev
 
 - kind: transformed_column
   name: petal_width_normalized
   transformer: cortex.normalize
-  inputs:
-    columns:
-      num: petal_width
-    args:
-      mean: petal_width_mean
-      stddev: petal_width_stddev
+  input:
+    col: @petal_width
+    mean: @petal_width_mean
+    stddev: @petal_width_stddev
 
 - kind: transformed_column
   name: class_indexed
   transformer: cortex.index_string
-  inputs:
-    columns:
-      text: class
-    args:
-      indexes: class_index
+  input:
+    col: @class
+    indexes: @class_index

examples/poker/resources/raw_columns.yaml

@@ -2,71 +2,51 @@
   name: card_1_suit
   type: INT_COLUMN
   required: true
-  tags:
-    type: suit
 
 - kind: raw_column
   name: card_1_rank
   type: INT_COLUMN
   required: true
-  tags:
-    type: rank
 
 - kind: raw_column
   name: card_2_suit
   type: INT_COLUMN
   required: true
-  tags:
-    type: suit
 
 - kind: raw_column
   name: card_2_rank
   type: INT_COLUMN
   required: true
-  tags:
-    type: rank
 
 - kind: raw_column
   name: card_3_suit
   type: INT_COLUMN
   required: true
-  tags:
-    type: suit
 
 - kind: raw_column
   name: card_3_rank
   type: INT_COLUMN
   required: true
-  tags:
-    type: rank
 
 - kind: raw_column
   name: card_4_suit
   type: INT_COLUMN
   required: true
-  tags:
-    type: suit
 
 - kind: raw_column
   name: card_4_rank
   type: INT_COLUMN
   required: true
-  tags:
-    type: rank
 
 - kind: raw_column
   name: card_5_suit
   type: INT_COLUMN
   required: true
-  tags:
-    type: suit
 
 - kind: raw_column
   name: card_5_rank
   type: INT_COLUMN
   required: true
-  tags:
-    type: rank
 
 - kind: raw_column
   name: class