Commit 4018ef4c authored by Bharath Ramsundar's avatar Bharath Ramsundar
Browse files

Renamed DataFeaturizer to DataLoader

parent 3dd366c2

deepchem/datasets/bace_datasets.py

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ import tempfile, shutil 
from deepchem.utils.save import load_from_disk

from deepchem.splits import SpecifiedSplitter

from deepchem.featurizers import UserDefinedFeaturizer 

from deepchem.featurizers.featurize import DataFeaturizer

from deepchem.featurizers.featurize import DataLoader

from deepchem.datasets import Dataset

from deepchem.transformers import NormalizationTransformer

from deepchem.transformers import ClippingTransformer
@@ -69,7 +69,7 @@ def load_bace(mode="regression", transform=True, split="20-80"): 
  else:

    raise ValueError("Unknown mode %s" % mode)

  featurizer = UserDefinedFeaturizer(user_specified_features)

  loader = DataFeaturizer(tasks=bace_tasks,

  loader = DataLoader(tasks=bace_tasks,

                              smiles_field="mol",

                              id_field="CID",

                              featurizer=featurizer)

deepchem/datasets/muv_datasets.py

+5 −5
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ import numpy as np 
import shutil

from deepchem.utils.save import load_from_disk

from deepchem.datasets import Dataset

from deepchem.featurizers.featurize import DataFeaturizer

from deepchem.featurizers.featurize import DataLoader

from deepchem.featurizers.fingerprints import CircularFingerprint

from deepchem.transformers import BalancingTransformer
@@ -49,7 +49,7 @@ def load_muv(base_dir, reload=True): 
                          'MUV-737', 'MUV-858', 'MUV-713', 'MUV-733', 'MUV-652',

                          'MUV-466', 'MUV-832'])



  loader = DataFeaturizer(tasks=all_MUV_tasks,

  loader = DataLoader(tasks=all_MUV_tasks,

                      smiles_field="smiles",

                      featurizer=featurizer,

                      verbosity=verbosity)

deepchem/datasets/nci_datasets.py

+5 −5
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ import numpy as np 
import shutil

from deepchem.utils.save import load_sharded_csv

from deepchem.datasets import Dataset

from deepchem.featurizers.featurize import DataFeaturizer

from deepchem.featurizers.featurize import DataLoader

from deepchem.featurizers.fingerprints import CircularFingerprint

from deepchem.transformers import NormalizationTransformer
@@ -65,7 +65,7 @@ def load_nci(base_dir, reload=True, force_transform=False): 
                    'MDA-MB-231/ATCC', 'MDA-MB-468', 'HS 578T', 'BT-549',

                    'T-47D'])



  loader = DataFeaturizer(tasks=all_nci_tasks,

  loader = DataLoader(tasks=all_nci_tasks,

                      smiles_field="smiles",

                      featurizer=featurizer,

                      verbosity=verbosity)

deepchem/datasets/pcba_datasets.py

+5 −5
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ import numpy as np 
import shutil

from deepchem.utils.save import load_from_disk

from deepchem.datasets import Dataset

from deepchem.featurizers.featurize import DataFeaturizer

from deepchem.featurizers.featurize import DataLoader

from deepchem.featurizers.fingerprints import CircularFingerprint

from deepchem.transformers import BalancingTransformer
@@ -70,7 +70,7 @@ def load_pcba(base_dir, reload=True): 
      'PCBA-902','PCBA-903','PCBA-904','PCBA-912','PCBA-914','PCBA-915',

      'PCBA-924','PCBA-925','PCBA-926','PCBA-927','PCBA-938','PCBA-995']



  loader = DataFeaturizer(tasks=all_PCBA_tasks,

  loader = DataLoader(tasks=all_PCBA_tasks,

                      smiles_field="smiles",

                      featurizer=featurizer,

                      verbosity=verbosity)

deepchem/datasets/pdbbind_datasets.py

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ import shutil 
from rdkit import Chem

from deepchem.utils.save import load_from_disk

from deepchem.datasets import Dataset

from deepchem.featurizers.featurize import DataFeaturizer

from deepchem.featurizers.fingerprints import CircularFingerprint

from deepchem.transformers import BalancingTransformer

from deepchem.featurizers.nnscore import NNScoreComplexFeaturizer

CRA Git | Maintained and supported by SUSTech CRA and CCSE