Commit 961fae7a authored by Nathan Frey's avatar Nathan Frey
Browse files

Bugfixes

parent aaab81d7
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ from typing import List, Tuple, Dict, Optional, Union, Any, Type
logger = logging.getLogger(__name__)

DEFAULT_DIR = deepchem.utils.get_data_dir()
MPFORME_URL = 'http://deepchem.io.s3-website-us-west-1.amazonaws.com/datasets/mp_formation_energy.tar.gz'
MPFORME_URL = 'https://deepchemdata.s3-us-west-1.amazonaws.com/datasets/mp_formation_energy.tar.gz'

# dict of accepted featurizers for this dataset
# modify the returned dicts for your dataset
@@ -163,11 +163,11 @@ def load_mp_formation_energy(

  # Load .tar.gz file
  if featurizer.__class__.__name__ in supported_featurizers:
    dataset_file = os.path.join(data_dir, 'mp_formation_energy.tar.gz')
    deepchem.utils.untargz_file(dataset_file, dest_dir=data_dir)
    dataset_file = os.path.join(data_dir, 'mp_formation_energy.json')

    if not os.path.exists(dataset_file):
      targz_file = os.path.join(data_dir, 'mp_formation_energy.tar.gz')
      if not os.path.exists(targz_file):
        deepchem.utils.download_url(url=MPFORME_URL, dest_dir=data_dir)
      deepchem.utils.untargz_file(
          os.path.join(data_dir, 'mp_formation_energy.tar.gz'), data_dir)
+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ from typing import List, Tuple, Dict, Optional, Union, Any, Type
logger = logging.getLogger(__name__)

DEFAULT_DIR = deepchem.utils.get_data_dir()
MPMETAL_URL = 'http://deepchem.io.s3-website-us-west-1.amazonaws.com/datasets/mp_is_metal.tar.gz'
MPMETAL_URL = 'https://deepchemdata.s3-us-west-1.amazonaws.com/datasets/mp_is_metal.tar.gz'

# dict of accepted featurizers for this dataset
# modify the returned dicts for your dataset
@@ -163,11 +163,11 @@ def load_mp_metallicity(

  # Load .tar.gz file
  if featurizer.__class__.__name__ in supported_featurizers:
    dataset_file = os.path.join(data_dir, 'mp_is_metal.tar.gz')
    deepchem.utils.untargz_file(dataset_file, dest_dir=data_dir)
    dataset_file = os.path.join(data_dir, 'mp_is_metal.json')

    if not os.path.exists(dataset_file):
      targz_file = os.path.join(data_dir, 'mp_is_metal.tar.gz')
      if not os.path.exists(targz_file):
        deepchem.utils.download_url(url=MPMETAL_URL, dest_dir=data_dir)
      deepchem.utils.untargz_file(
          os.path.join(data_dir, 'mp_is_metal.tar.gz'), data_dir)