Merge branch 'hotfix-0.6.1'

CHANGELOG.md

@@ -1,4 +1,12 @@
 # Change Log
+## [0.6.1](https://github.com/stellargraph/stellargraph/tree/v0.6.1) (1 Apr 2019)
+**Enhancements:**
+- separate treatment of `gcn` and `gat` models in `demos/ensembles/ensemble-node-classification-example.ipynb`
+
+**Fixed bugs:**
+- a bug in passing graph adjacency matrix to the optional `func_opt` function in `FullBatchNodeGenerator` class
+- a bug in `demos/node-classification/gcn/gcn-cora-example.py:144`: incorrect argument was used to pass
+the optional function to the generator for GCN 
 
 ## [0.6.0](https://github.com/stellargraph/stellargraph/tree/v0.6.0) (14 Mar 2019)
 

demos/ensembles/ensemble-node-classification-example.ipynb

@@ -470,7 +470,11 @@
     "if model_type == 'graphsage':\n",
     "    generator = GraphSAGENodeGenerator(G, batch_size, num_samples)\n",
     "    train_gen = generator.flow(train_data.index, train_targets, shuffle=True)\n",
-    "elif model_type == 'gcn' or model_type == 'gat':\n",
+    "elif model_type == 'gcn': \n",
+    "    from stellargraph.core.utils import GCN_Aadj_feats_op\n",
+    "    generator = FullBatchNodeGenerator(G, func_opt=GCN_Aadj_feats_op, filter='localpool')\n",
+    "    train_gen = generator.flow(train_data.index, train_targets)  # does not support shuffle\n",
+    "elif model_type == 'gat':\n",
     "    generator = FullBatchNodeGenerator(G)\n",
     "    train_gen = generator.flow(train_data.index, train_targets)  # does not support shuffle"
    ]

demos/node-classification/gcn/gcn-cora-example.py

@@ -141,7 +141,7 @@ def main(graph_loc, layer_sizes, activations, dropout, learning_rate):
         test_nodes, test_targets, train_size=300, test_size=None, random_state=523214
     )
 
-    generator = FullBatchNodeGenerator(G, func_A_feats=GCN_Aadj_feats_op, filter='localpool')
+    generator = FullBatchNodeGenerator(G, func_opt=GCN_Aadj_feats_op, filter='localpool')
 
     model = train(train_nodes, train_targets, val_nodes, val_targets, generator, dropout,
         layer_sizes, learning_rate, activations)

stellargraph/mapper/node_mappers.py

@@ -601,7 +601,7 @@ def __init__(self, G, name=None, func_opt=None, **kwargs):
         if func_opt is not None:
             if callable(func_opt):
                 self.features, self.Aadj = func_opt(
-                    features=self.features, Aadj=self.Aadj, **kwargs
+                    features=self.features, A=self.Aadj, **kwargs
                 )
             else:
                 raise ValueError("argument 'func_opt' must be a callable.")

stellargraph/version.py

@@ -1,2 +1,2 @@
 # Global version information
-__version__ = "0.6.0"
+__version__ = "0.6.1"