Unverified Commit 9c2e036b authored by Karl Leswing's avatar Karl Leswing Committed by GitHub
Browse files

Merge pull request #1032 from tarokiritani/simplify_logic_in_load_tox21

Simplify logic in the tox21 load function.
parents df466abe 8cf240c6
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -12,16 +12,15 @@ import deepchem
def load_tox21(featurizer='ECFP', split='index', reload=True, K=4):
  """Load Tox21 datasets. Does not do train/test split"""
  # Featurize Tox21 dataset
  data_dir = deepchem.utils.get_data_dir()
  if reload:
    save_dir = os.path.join(data_dir, "tox21/" + featurizer + "/" + split)

  tox21_tasks = [
      'NR-AR', 'NR-AR-LBD', 'NR-AhR', 'NR-Aromatase', 'NR-ER', 'NR-ER-LBD',
      'NR-PPAR-gamma', 'SR-ARE', 'SR-ATAD5', 'SR-HSE', 'SR-MMP', 'SR-p53'
  ]

  data_dir = deepchem.utils.get_data_dir()
  if reload:
    save_dir = os.path.join(data_dir, "tox21/" + featurizer + "/" + split)
    loaded, all_dataset, transformers = deepchem.utils.save.load_dataset_from_disk(
        save_dir)
    if loaded: