Merge pull request #2 from deepchem/master

Update

README.md

@@ -1,5 +1,14 @@
 # MoleculeNet Leaderboard
 
+## Physical Chemistry
+
+### Delaney (ESOL)
+
+| Rank | Model         | Featurization  | Test RMSE        | Validation RMSE  | Contact                           | References	                                                                             | Date           |
+| ---- | ------------- | -------------- | ---------------- | ---------------- | --------------------------------- | ---------------------------------------------------------------------------------------- | -------------- |
+| 1    | GCN           | GraphConv      | 0.8851 +- 0.0292 | 0.9405 +- 0.0310 | [Mufei Li](mufeili1996@gmail.com) | [Paper](https://arxiv.org/abs/1609.02907), [Code](./examples)                            | Jan 28th, 2020 |
+| 2    | Random Forest | 1024-bit ECFP4 | 1.7406 +- 0.0261 | 1.7932 +- 0.0153 | [Mufei Li](mufeili1996@gmail.com) | [Paper](https://www.stat.berkeley.edu/~breiman/randomforest2001.pdf), [Code](./examples) | Jan 28th, 2020 |
+
 ## Biophysics
 
 ### BACE Classification
@@ -24,3 +33,10 @@
 | ---- | ------------- | -------------- | ---------------- | ------------------ | --------------------------------- | ---------------------------------------------------------------------------------------- | -------------- |
 | 1    | Random Forest | 1024-bit ECFP4 | 0.9540 +- 0.0038 | 0.9062 +- 0.0079   | [Mufei Li](mufeili1996@gmail.com) | [Paper](https://www.stat.berkeley.edu/~breiman/randomforest2001.pdf), [Code](./examples) | Dec 30th, 2020 |
 | 2    | GCN           | GraphConv      | 0.9214 +- 0.0106 | 0.9445 +- 0.0049   | [Mufei Li](mufeili1996@gmail.com) | [Paper](https://arxiv.org/abs/1609.02907), [Code](./examples)                            | Dec 30th, 2020 |
+
+### ClinTox
+
+| Rank | Model         | Featurization  | Test ROC-AUC     | Validation ROC-AUC | Contact                           | References	                                                                           | Date           |
+| ---- | ------------- | -------------- | ---------------- | ------------------ | --------------------------------- | ---------------------------------------------------------------------------------------- | -------------- |
+| 1    | GCN           | GraphConv      | 0.9065 +- 0.0179 | 0.9880 +- 0.0073   | [Mufei Li](mufeili1996@gmail.com) | [Paper](https://arxiv.org/abs/1609.02907), [Code](./examples)                            | Jan 22nd, 2021 |
+| 2    | Random Forest | 1024-bit ECFP4 | 0.7829 +- 0.0235 | 0.8883 +- 0.0230   | [Mufei Li](mufeili1996@gmail.com) | [Paper](https://www.stat.berkeley.edu/~breiman/randomforest2001.pdf), [Code](./examples) | Jan 22nd, 2021 |

examples/README.md

@@ -18,6 +18,7 @@ The feasible arguments include:
         - `BACE_classification`
         - `BACE_regression`
         - `BBBP`
+        - `ClinTox`
 - **Hyperparameter Search (optional)**: `-hs`
     - Perform a hyperparameter search using Bayesian optimization. It determines the best 
       hyperparameters based on the validation metric averaged across 3 runs.
@@ -40,6 +41,7 @@ The feasible arguments include:
         - `BACE_classification`
         - `BACE_regression`
         - `BBBP`
+        - `ClinTox`
 - **Hyperparameter Search (optional)**: `-hs`
     - Perform a hyperparameter search using Bayesian optimization. It determines the best 
       hyperparameters based on the validation metric averaged across 3 runs.

examples/configures/GCN_GC/ClinTox.json

@@ -0,0 +1,8 @@
+{
+  "batchnorm": true,
+  "dropout": 0.04333497108612183,
+  "hidden_feats": 128,
+  "lr": 0.15302291932022413,
+  "num_gnn_layers": 2,
+  "residual": true
+}

examples/configures/GCN_GC/Delaney.json

@@ -0,0 +1,8 @@
+{
+  "batchnorm": false,
+  "dropout": 0.01913243832609146,
+  "hidden_feats": 64,
+  "lr": 0.16034207807172668,
+  "num_gnn_layers": 2,
+  "residual": true
+}

examples/configures/RF_ECFP/ClinTox.json

@@ -0,0 +1,6 @@
+{
+  "bootstrap": false,
+  "criterion": "entropy",
+  "min_samples_split": 16,
+  "n_estimators": 100
+}

examples/configures/RF_ECFP/Delaney.json

@@ -0,0 +1,6 @@
+{
+  "bootstrap": true,
+  "criterion": "mae",
+  "min_samples_split": 16,
+  "n_estimators": 30
+}

examples/fingerprint.py

@@ -28,9 +28,9 @@ def rf_model_builder(model_dir, hyperparams, mode):
 
 
 def load_model(args, tasks, hyperparams):
-  if args['dataset'] in ['BACE_classification', 'BBBP']:
+  if args['dataset'] in ['BACE_classification', 'BBBP', 'ClinTox']:
     mode = 'classification'
-  elif args['dataset'] in ['BACE_regression']:
+  elif args['dataset'] in ['BACE_regression', 'Delaney']:
     mode = 'regression'
   else:
     raise ValueError('Unexpected dataset: {}'.format(args['dataset']))
@@ -100,7 +100,7 @@ def init_hyper_search_space(args):
         'min_samples_split': hp.choice('min_samples_split', [2, 4, 8, 16, 32]),
         'bootstrap': hp.choice('bootstrap', [True, False]),
     }
-    if args['dataset'] in ['BACE_classification', 'BBBP']:
+    if args['dataset'] in ['BACE_classification', 'BBBP', 'ClinTox']:
       search_space['criterion'] = hp.choice('criterion', ["gini", "entropy"])
     else:
       search_space['criterion'] = hp.choice('criterion', ["mse", "mae"])
@@ -154,7 +154,7 @@ def objective(hyperparams):
   parser.add_argument(
       '-d',
       '--dataset',
-      choices=['BACE_classification', 'BACE_regression', 'BBBP'],
+      choices=['BACE_classification', 'BACE_regression', 'BBBP', 'ClinTox', 'Delaney'],
       help='Dataset to use')
   parser.add_argument(
       '-m',

examples/gnn.py

@@ -11,11 +11,11 @@
 
 
 def load_model(save_pth, args, tasks, hyperparams):
-  if args['dataset'] in ['BACE_classification', 'BBBP']:
+  if args['dataset'] in ['BACE_classification', 'BBBP', 'ClinTox']:
     mode = 'classification'
     # binary classification
     n_classes = 2
-  elif args['dataset'] in ['BACE_regression']:
+  elif args['dataset'] in ['BACE_regression', 'Delaney']:
     mode = 'regression'
     n_classes = None
   else:
@@ -177,7 +177,7 @@ def objective(hyperparams):
   parser.add_argument(
       '-d',
       '--dataset',
-      choices=['BACE_classification', 'BACE_regression', 'BBBP'],
+      choices=['BACE_classification', 'BACE_regression', 'BBBP', 'ClinTox', 'Delaney'],
       help='Dataset to use')
   parser.add_argument(
       '-m',

examples/utils.py

@@ -4,9 +4,9 @@
 
 
 def decide_metric(dataset):
-  if dataset in ['BACE_classification', 'BBBP']:
+  if dataset in ['BACE_classification', 'BBBP', 'ClinTox']:
     return 'roc_auc'
-  elif dataset == 'BACE_regression':
+  elif dataset in ['BACE_regression', 'Delaney']:
     return 'rmse'
   else:
     return ValueError('Unexpected dataset: {}'.format(dataset))
@@ -75,6 +75,14 @@ def load_dataset(args):
     from deepchem.molnet import load_bace_regression
     tasks, all_dataset, transformers = load_bace_regression(
         featurizer=featurizer, splitter=splitter, reload=False)
+  elif args['dataset'] == 'ClinTox':
+    from deepchem.molnet import load_clintox
+    tasks, all_dataset, transformers = load_clintox(
+        featurizer=featurizer, splitter=splitter, reload=False)
+  elif args['dataset'] == 'Delaney':
+    from deepchem.molnet import load_delaney
+    tasks, all_dataset, transformers = load_delaney(
+        featurizer=featurizer, splitter=splitter, reload=False)
   else:
     raise ValueError('Unexpected dataset: {}'.format(args['dataset']))