Merge pull request #391 from corochann/fix_example_test

support more models in example
chainer · Sep 11, 2019 · de85501 · de85501
2 parents 2a45d68 + 266f08f
commit de85501
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/examples/molnet/predict_molnet.py b/examples/molnet/predict_molnet.py
@@ -34,7 +34,8 @@
 def parse_arguments():
     # Lists of supported preprocessing methods/models.
     method_list = ['nfp', 'ggnn', 'schnet', 'weavenet', 'rsgcn', 'relgcn',
-                   'gin', 'nfp_gwm', 'ggnn_gwm', 'rsgcn_gwm', 'gin_gwm']
+                   'relgat', 'gin', 'gnnfilm',
+                   'nfp_gwm', 'ggnn_gwm', 'rsgcn_gwm', 'gin_gwm']
 #    scale_list = ['standardize', 'none']
     dataset_names = list(molnet_default_config.keys())
 

diff --git a/examples/molnet/train_molnet.py b/examples/molnet/train_molnet.py
@@ -28,7 +28,7 @@
 def parse_arguments():
     # Lists of supported preprocessing methods/models and datasets.
     method_list = ['nfp', 'ggnn', 'schnet', 'weavenet', 'rsgcn', 'relgcn',
-                   'relgat', 'gin',
+                   'relgat', 'gin', 'gnnfilm',
                    'nfp_gwm', 'ggnn_gwm', 'rsgcn_gwm', 'gin_gwm']
     dataset_names = list(molnet_default_config.keys())
     scale_list = ['standardize', 'none']

diff --git a/examples/qm9/predict_qm9.py b/examples/qm9/predict_qm9.py
@@ -30,7 +30,8 @@
 def parse_arguments():
     # Lists of supported preprocessing methods/models.
     method_list = ['nfp', 'ggnn', 'schnet', 'weavenet', 'rsgcn', 'relgcn',
-                   'relgat']
+                   'relgat', 'gin', 'gnnfilm',
+                   'nfp_gwm', 'ggnn_gwm', 'rsgcn_gwm', 'gin_gwm']
     label_names = ['A', 'B', 'C', 'mu', 'alpha', 'homo', 'lumo', 'gap', 'r2',
                    'zpve', 'U0', 'U', 'H', 'G', 'Cv']
     scale_list = ['standardize', 'none']

diff --git a/examples/qm9/test_qm9.sh b/examples/qm9/test_qm9.sh
@@ -3,7 +3,7 @@
 set -e
 
 # List of available graph convolution methods.
-methods=(nfp ggnn schnet weavenet rsgcn relgcn relgat)
+methods=(nfp ggnn schnet weavenet rsgcn relgcn relgat gin gnnfilm nfp_gwm ggnn_gwm rsgcn_gwm gin_gwm)
 
 # device identifier; set it to -1 to train on the CPU (default).
 device=${1:--1}

diff --git a/examples/qm9/train_qm9.py b/examples/qm9/train_qm9.py
@@ -27,7 +27,8 @@ def rmse(x0, x1):
 def parse_arguments():
     # Lists of supported preprocessing methods/models.
     method_list = ['nfp', 'ggnn', 'schnet', 'weavenet', 'rsgcn', 'relgcn',
-                   'relgat', 'gnnfilm']
+                   'relgat', 'gin', 'gnnfilm',
+                   'nfp_gwm', 'ggnn_gwm', 'rsgcn_gwm', 'gin_gwm']
     label_names = ['A', 'B', 'C', 'mu', 'alpha', 'homo', 'lumo', 'gap', 'r2',
                    'zpve', 'U0', 'U', 'H', 'G', 'Cv']
     scale_list = ['standardize', 'none']

diff --git a/examples/tox21/test_tox21.sh b/examples/tox21/test_tox21.sh
@@ -8,7 +8,7 @@ device=${1:--1}
 # Preprocessor parse result must contain both pos/neg samples
 tox21_num_data=100
 
-for method in nfp ggnn schnet weavenet rsgcn relgcn relgat
+for method in nfp ggnn
 do
     if [ ! -f "input" ]; then
         rm -rf input