Deprecate makedirs in favor of os.makedirs (pyg-team#8421)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -37,6 +37,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ### Deprecated
 
+- Deprecated `torch_geometric.data.makedirs` in favor of `os.makedirs` ([#8421](https://github.com/pyg-team/pytorch_geometric/pull/8421))
 - Deprecated `DataParallel` in favor of `DistributedDataParallel` ([#8250](https://github.com/pyg-team/pytorch_geometric/pull/8250))
 
 ### Fixed

test/transforms/test_to_superpixels.py

@@ -1,9 +1,9 @@
+import os
 import os.path as osp
 
 import torch
 
 from torch_geometric.data import download_url, extract_gz
-from torch_geometric.data.makedirs import makedirs
 from torch_geometric.loader import DataLoader
 from torch_geometric.testing import onlyOnline, withPackage
 from torch_geometric.transforms import ToSLIC
@@ -27,8 +27,8 @@ def test_to_superpixels(tmp_path):
     raw_folder = osp.join(tmp_path, 'MNIST', 'raw')
     processed_folder = osp.join(tmp_path, 'MNIST', 'processed')
 
-    makedirs(raw_folder)
-    makedirs(processed_folder)
+    os.makedirs(raw_folder, exist_ok=True)
+    os.makedirs(processed_folder, exist_ok=True)
     for resource in resources:
         path = download_url(resource, raw_folder)
         extract_gz(path, osp.join(tmp_path, raw_folder))

torch_geometric/data/dataset.py

@@ -1,4 +1,5 @@
 import copy
+import os
 import os.path as osp
 import re
 import sys
@@ -12,7 +13,6 @@
 from torch import Tensor
 
 from torch_geometric.data.data import BaseData
-from torch_geometric.data.makedirs import makedirs
 from torch_geometric.io import fs
 
 IndexType = Union[slice, Tensor, np.ndarray, Sequence]
@@ -210,7 +210,7 @@ def _download(self):
         if files_exist(self.raw_paths):  # pragma: no cover
             return
 
-        makedirs(self.raw_dir)
+        os.makedirs(self.raw_dir, exist_ok=True)
         self.download()
 
     @property
@@ -241,7 +241,7 @@ def _process(self):
         if self.log and 'pytest' not in sys.modules:
             print('Processing...', file=sys.stderr)
 
-        makedirs(self.processed_dir)
+        os.makedirs(self.processed_dir, exist_ok=True)
         self.process()
 
         path = osp.join(self.processed_dir, 'pre_transform.pt')

torch_geometric/data/download.py

@@ -1,3 +1,4 @@
+import os
 import os.path as osp
 import ssl
 import sys
@@ -6,7 +7,6 @@
 
 import fsspec
 
-from torch_geometric.data.makedirs import makedirs
 from torch_geometric.io import fs
 
 
@@ -41,7 +41,7 @@ def download_url(
     if log and 'pytest' not in sys.modules:
         print(f'Downloading {url}', file=sys.stderr)
 
-    makedirs(folder)
+    os.makedirs(folder, exist_ok=True)
 
     context = ssl._create_unverified_context()
     data = urllib.request.urlopen(url, context=context)

torch_geometric/data/makedirs.py

@@ -1,9 +1,16 @@
+from torch_geometric.deprecation import deprecated
 from torch_geometric.io import fs
 
 
+@deprecated("use 'os.makedirs(path, exist_ok=True)' instead")
 def makedirs(path: str):
     r"""Recursively creates a directory.
 
+    .. warning::
+
+        :meth:`makedirs` is deprecated and will be removed soon.
+        Please use :obj:`os.makedirs(path, exist_ok=True)` instead.
+
     Args:
         path (str): The path to create.
     """

torch_geometric/datasets/snap_dataset.py

@@ -12,7 +12,6 @@
     extract_gz,
     extract_tar,
 )
-from torch_geometric.data.makedirs import makedirs
 from torch_geometric.utils import coalesce
 
 
@@ -222,7 +221,7 @@ def _download(self):
         if osp.isdir(self.raw_dir) and len(os.listdir(self.raw_dir)) > 0:
             return
 
-        makedirs(self.raw_dir)
+        os.makedirs(self.raw_dir, exist_ok=True)
         self.download()
 
     def download(self):

torch_geometric/graphgym/config.py

@@ -9,7 +9,6 @@
 from typing import Any
 
 import torch_geometric.graphgym.register as register
-from torch_geometric.data.makedirs import makedirs
 
 try:  # Define global config object
     from yacs.config import CfgNode as CN
@@ -483,7 +482,7 @@ def dump_cfg(cfg):
     Args:
         cfg (CfgNode): Configuration node
     """
-    makedirs(cfg.out_dir)
+    os.makedirs(cfg.out_dir, exist_ok=True)
     cfg_file = os.path.join(cfg.out_dir, cfg.cfg_dest)
     with open(cfg_file, 'w') as f:
         cfg.dump(stream=f)

torch_geometric/graphgym/logger.py

@@ -1,12 +1,12 @@
 import logging
 import math
+import os
 import sys
 import time
 from typing import Any, Dict, Optional
 
 import torch
 
-from torch_geometric.data.makedirs import makedirs
 from torch_geometric.graphgym import register
 from torch_geometric.graphgym.config import cfg
 from torch_geometric.graphgym.imports import Callback, pl
@@ -18,7 +18,7 @@ def set_printing():
     """Set up printing options."""
     logging.root.handlers = []
     logging_cfg = {'level': logging.INFO, 'format': '%(message)s'}
-    makedirs(cfg.run_dir)
+    os.makedirs(cfg.run_dir, exist_ok=True)
     h_file = logging.FileHandler('{}/logging.log'.format(cfg.run_dir))
     h_stdout = logging.StreamHandler(sys.stdout)
     if cfg.print == 'file':
@@ -41,7 +41,7 @@ def __init__(self, name='train', task_type=None):
         self._time_total = 0  # won't be reset
 
         self.out_dir = '{}/{}'.format(cfg.run_dir, name)
-        makedirs(self.out_dir)
+        os.makedirs(self.out_dir, exist_ok=True)
         if cfg.tensorboard_each_run:
             from tensorboardX import SummaryWriter
             self.tb_writer = SummaryWriter(self.out_dir)

torch_geometric/graphgym/utils/io.py

@@ -69,10 +69,6 @@ def dict_list_to_tb(dict_list, writer):
         dict_to_tb(dict, writer, dict['epoch'])
 
 
-def makedirs(dir):
-    os.makedirs(dir, exist_ok=True)
-
-
 def makedirs_rm_exist(dir):
     """Make a directory, remove any existing data.
 

torch_geometric/nn/conv/utils/jit.py

@@ -1,16 +1,15 @@
+import os
 import os.path as osp
 import sys
 from getpass import getuser
 from importlib.util import module_from_spec, spec_from_file_location
 from tempfile import NamedTemporaryFile as TempFile
 from tempfile import gettempdir
 
-from torch_geometric.data.makedirs import makedirs
-
 
 def class_from_module_repr(cls_name, module_repr):
     path = osp.join(gettempdir(), f'{getuser()}_pyg')
-    makedirs(path)
+    os.makedirs(path, exist_ok=True)
     with TempFile(mode='w+', suffix='.py', delete=False, dir=path) as f:
         f.write(module_repr)
     spec = spec_from_file_location(cls_name, f.name)

torch_geometric/nn/models/dimenet.py

@@ -11,7 +11,6 @@
 from torch.nn import Embedding, Linear
 
 from torch_geometric.data import Dataset, download_url
-from torch_geometric.data.makedirs import makedirs
 from torch_geometric.nn import radius_graph
 from torch_geometric.nn.inits import glorot_orthogonal
 from torch_geometric.nn.resolver import activation_resolver
@@ -584,7 +583,7 @@ def from_qm9_pretrained(
         root = osp.expanduser(osp.normpath(root))
         path = osp.join(root, 'pretrained_dimenet', qm9_target_dict[target])
 
-        makedirs(path)
+        os.makedirs(path, exist_ok=True)
         url = f'{cls.url}/{qm9_target_dict[target]}'
 
         if not osp.exists(osp.join(path, 'checkpoint')):
@@ -856,7 +855,7 @@ def from_qm9_pretrained(
         root = osp.expanduser(osp.normpath(root))
         path = osp.join(root, 'pretrained_dimenet_pp', qm9_target_dict[target])
 
-        makedirs(path)
+        os.makedirs(path, exist_ok=True)
         url = f'{cls.url}/{qm9_target_dict[target]}'
 
         if not osp.exists(osp.join(path, 'checkpoint')):

torch_geometric/nn/models/schnet.py

@@ -11,7 +11,6 @@
 from torch.nn import Embedding, Linear, ModuleList, Sequential
 
 from torch_geometric.data import Dataset, download_url, extract_zip
-from torch_geometric.data.makedirs import makedirs
 from torch_geometric.nn import MessagePassing, SumAggregation, radius_graph
 from torch_geometric.nn.resolver import aggregation_resolver as aggr_resolver
 from torch_geometric.typing import OptTensor
@@ -189,7 +188,7 @@ def from_qm9_pretrained(
         units[5] = ase.units.Bohr**2
 
         root = osp.expanduser(osp.normpath(root))
-        makedirs(root)
+        os.makedirs(root, exist_ok=True)
         folder = 'trained_schnet_models'
         if not osp.exists(osp.join(root, folder)):
             path = download_url(SchNet.url, root)