Use Ruff to sort imports (#3230)

* Update pyproject.tomls for import sorting

* Update files after running pre-commit

* Move ruff config to pyproject.toml

---------

Co-authored-by: Ashwin Srinath <[email protected]>

.github/actions/workflow-build/build-workflow.py

@@ -62,8 +62,8 @@
 import re
 import struct
 import sys
-import yaml
 
+import yaml
 
 matrix_yaml = None
 

.pre-commit-config.yaml

@@ -41,11 +41,8 @@ repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.8.3
     hooks:
-    - id: ruff
-      args: ["--fix", "--show-fixes"]
-      exclude: "^docs/tools/"
-    - id: ruff-format
-      exclude: "^docs/tools/"
+    - id: ruff  # linter
+    - id: ruff-format  # formatter
   - repo: https://github.com/codespell-project/codespell
     rev: v2.3.0
     hooks:

benchmarks/scripts/analyze.py

@@ -1,16 +1,17 @@
 #!/usr/bin/env python3
 
+import argparse
+import functools
+import itertools
+import json
+import math
 import os
 import re
-import json
+
 import cccl
-import math
-import argparse
-import itertools
-import functools
+import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
-import matplotlib.pyplot as plt
 from scipy.stats import mannwhitneyu
 from scipy.stats.mstats import hdquantiles
 
@@ -330,8 +331,8 @@ def coverage(args):
 def parallel_coordinates_plot(df, title):
     # Parallel coordinates plot adaptation of https://stackoverflow.com/a/69411450
     import matplotlib.cm as cm
-    from matplotlib.path import Path
     import matplotlib.patches as patches
+    from matplotlib.path import Path
 
     # Variables (the first variable must be categoric):
     my_vars = df.columns.tolist()

benchmarks/scripts/cccl/bench/__init__.py

@@ -1,6 +1,6 @@
-from .config import *  # noqa: F403
-from .storage import *  # noqa: F403
 from .bench import Bench  # noqa: F401
 from .cmake import CMake  # noqa: F401
+from .config import *  # noqa: F403
 from .score import *  # noqa: F403
 from .search import *  # noqa: F403
+from .storage import *  # noqa: F403

benchmarks/scripts/cccl/bench/bench.py

@@ -1,17 +1,18 @@
-import os
+import itertools
 import json
-import time
-import fpzip
+import os
 import signal
-import itertools
 import subprocess
+import time
+
+import fpzip
 import numpy as np
 
 from .cmake import CMake
 from .config import BasePoint, Config
-from .storage import Storage, get_bench_table_name
-from .score import compute_axes_ids, compute_weight_matrices, get_workload_weight
 from .logger import Logger
+from .score import compute_axes_ids, compute_weight_matrices, get_workload_weight
+from .storage import Storage, get_bench_table_name
 
 
 def first_val(my_dict):

benchmarks/scripts/cccl/bench/cmake.py

@@ -1,12 +1,12 @@
 import os
-import time
 import signal
 import subprocess
+import time
 
 from .build import Build
 from .config import Config
-from .storage import Storage
 from .logger import Logger
+from .storage import Storage
 
 
 def create_builds_table(conn):

benchmarks/scripts/cccl/bench/config.py

@@ -1,6 +1,6 @@
 import os
-import sys
 import random
+import sys
 
 
 def randomized_cartesian_product(list_of_lists):

benchmarks/scripts/cccl/bench/score.py

@@ -1,4 +1,5 @@
 import math
+
 import numpy as np
 
 

benchmarks/scripts/cccl/bench/search.py

@@ -1,11 +1,12 @@
-import re
 import argparse
+import re
+
 import numpy as np
 
-from .bench import Bench, BaseBench
+from .bench import BaseBench, Bench
+from .cmake import CMake
 from .config import Config
 from .storage import Storage
-from .cmake import CMake
 
 
 def list_benches(algnames):

benchmarks/scripts/cccl/bench/storage.py

@@ -1,10 +1,10 @@
 import os
-import fpzip
 import sqlite3
+
+import fpzip
 import numpy as np
 import pandas as pd
 
-
 db_name = "cccl_meta_bench.db"
 
 

benchmarks/scripts/compare.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 
+import argparse
 import os
+
 import cccl
-import argparse
 import numpy as np
 import pandas as pd
-
 from colorama import Fore
 
 

benchmarks/scripts/run.py

@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 
+import math
 import os
 import sys
-import math
+
 import cccl.bench
 
 

benchmarks/scripts/search.py

@@ -2,7 +2,6 @@
 
 import cccl.bench as bench
 
-
 # TODO:
 # - driver version
 # - host compiler + version

benchmarks/scripts/sol.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python3
 
+import argparse
 import os
+
 import cccl
-import argparse
+import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
 import seaborn as sns
-import matplotlib.pyplot as plt
 
 
 def is_finite(x):

benchmarks/scripts/verify.py

@@ -1,7 +1,8 @@
 #!/usr/bin/env python3
 
-import sys
 import argparse
+import sys
+
 import cccl.bench
 
 

libcudacxx/test/support/filesystem_dynamic_test_helper.py

@@ -1,6 +1,6 @@
-import sys
 import os
 import socket
+import sys
 
 # Ensure that this is being run on a specific platform
 assert (

libcudacxx/test/utils/libcudacxx/compiler.py

@@ -6,8 +6,9 @@
 #
 # ===----------------------------------------------------------------------===##
 
-import platform
 import os
+import platform
+
 import libcudacxx.util
 
 

libcudacxx/test/utils/libcudacxx/sym_check/util.py

@@ -8,11 +8,12 @@
 
 import ast
 import distutils.spawn
-import sys
 import re
-import libcudacxx.util
+import sys
 from pprint import pformat
 
+import libcudacxx.util
+
 
 def read_syms_from_list(slist):
     """

libcudacxx/test/utils/libcudacxx/test/config.py

@@ -6,24 +6,23 @@
 #
 # ===----------------------------------------------------------------------===##
 
+import ctypes
 import os
-import platform
 import pipes
+import platform
 import re
 import shlex
 import shutil
 import sys
-import ctypes
 
+import libcudacxx.util
 from libcudacxx.compiler import CXXCompiler
-from libcudacxx.test.target_info import make_target_info
 
 # The wildcard import is to support `eval(exec_str)` in
 # `Configuration.configure_executor()` below.
 from libcudacxx.test.executor import *  # noqa: F403
 from libcudacxx.test.executor import LocalExecutor, NoopExecutor
-
-import libcudacxx.util
+from libcudacxx.test.target_info import make_target_info
 
 
 def loadSiteConfig(lit_config, config, param_name, env_name):

libcudacxx/test/utils/libcudacxx/test/executor.py

@@ -6,8 +6,8 @@
 #
 # ===----------------------------------------------------------------------===##
 
-import platform
 import os
+import platform
 
 from libcudacxx.test import tracing
 from libcudacxx.util import executeCommand

libcudacxx/test/utils/libcudacxx/test/format.py

@@ -13,12 +13,13 @@
 
 import lit.Test  # pylint: disable=import-error
 import lit.TestRunner  # pylint: disable=import-error
-from lit.TestRunner import ParserKind, IntegratedTestKeywordParser
-# pylint: disable=import-error
+from lit.TestRunner import IntegratedTestKeywordParser, ParserKind
 
-from libcudacxx.test.executor import LocalExecutor as LocalExecutor
 import libcudacxx.util
 
+# pylint: disable=import-error
+from libcudacxx.test.executor import LocalExecutor as LocalExecutor
+
 
 class LibcxxTestFormat(object):
     """

libcudacxx/test/utils/libcudacxx/test/googlebenchmark.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+
 import os
 import subprocess
 import sys

libcudacxx/test/utils/libcudacxx/util.py

@@ -6,7 +6,6 @@
 #
 # ===----------------------------------------------------------------------===##
 
-from contextlib import contextmanager
 import errno
 import os
 import platform
@@ -15,6 +14,7 @@
 import sys
 import tempfile
 import threading
+from contextlib import contextmanager
 
 
 # FIXME: Most of these functions are cribbed from LIT

pyproject.toml

@@ -2,6 +2,12 @@
 
 [tool.ruff]
 target-version = "py310"
+fix = true
+show-fixes = true
+exclude = ["docs/tools"]
+
+[tool.ruff.lint]
+extend-select = ["I"]
 
 [tool.codespell]
 # To run codespell interactively and fix errors that pre-commit reports, try

python/cuda_cooperative/cuda/cooperative/experimental/__init__.py

@@ -2,8 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-from cuda.cooperative.experimental import block
-from cuda.cooperative.experimental import warp
+from cuda.cooperative.experimental import block, warp
 from cuda.cooperative.experimental._types import StatefulFunction
 
 __all__ = ["block", "warp", "StatefulFunction"]

python/cuda_cooperative/cuda/cooperative/experimental/_caching.py

@@ -2,10 +2,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+import hashlib
+import json
 import os
 import pickle
-import json
-import hashlib
 
 _ENABLE_CACHE = "CCCL_ENABLE_CACHE" in os.environ
 if _ENABLE_CACHE:

python/cuda_cooperative/cuda/cooperative/experimental/_common.py

@@ -2,8 +2,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-import tempfile
 import re
+import tempfile
 from collections import namedtuple
 
 version = namedtuple("version", ("major", "minor"))

python/cuda_cooperative/cuda/cooperative/experimental/_nvrtc.py

@@ -2,13 +2,14 @@
 #
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+import functools
+import importlib.resources as pkg_resources
 import os
 import shutil
+
 from cuda.bindings import nvrtc
 from cuda.cooperative.experimental._caching import disk_cache
 from cuda.cooperative.experimental._common import check_in, version
-import importlib.resources as pkg_resources
-import functools
 
 
 def CHECK_NVRTC(err, prog):