From 82625a53b2523da3bf2f71d2497bc0196f5b373b Mon Sep 17 00:00:00 2001 From: Anatoly Myachev Date: Tue, 7 Jan 2025 18:52:02 +0100 Subject: [PATCH] [NFC] Remove dead code related to using of `subprocess.check_call` (#5537) According to https://docs.python.org/3.9/library/subprocess.html#subprocess.check_call: `If the return code was zero then return, otherwise raise CalledProcessError.` --------- Signed-off-by: Anatoly Myachev --- python/test/backend/test_device_backend.py | 36 +---------------- python/triton/runtime/build.py | 45 +--------------------- third_party/proton/test/test_viewer.py | 3 +- 3 files changed, 3 insertions(+), 81 deletions(-) diff --git a/python/test/backend/test_device_backend.py b/python/test/backend/test_device_backend.py index 8b0e4605ef6e..fdf53eae1ca7 100644 --- a/python/test/backend/test_device_backend.py +++ b/python/test/backend/test_device_backend.py @@ -8,13 +8,11 @@ import tempfile from pathlib import Path -import setuptools import torch import triton import triton.language as tl from triton.common.backend import (BaseBackend, compute_core_version_key, register_backend) -from triton.common.build import quiet from triton.compiler.make_launcher import make_so_cache_key from triton.runtime.cache import get_cache_manager from triton.runtime.driver import DriverBase @@ -43,39 +41,7 @@ def build_for_backend(name, src, srcdir): scheme = 'posix_prefix' py_include_dir = sysconfig.get_paths(scheme=scheme)["include"] - ret = subprocess.check_call([cc, src, f"-I{py_include_dir}", f"-I{srcdir}", "-shared", "-fPIC", "-o", so]) - if ret == 0: - return so - # fallback on setuptools - extra_compile_args = [] - library_dirs = [] - include_dirs = [srcdir] - libraries = [] - # extra arguments - extra_link_args = [] - # create extension module - ext = setuptools.Extension( - name=name, - language='c', - sources=[src], - include_dirs=include_dirs, - extra_compile_args=extra_compile_args + ['-O3'], - extra_link_args=extra_link_args, - library_dirs=library_dirs, - libraries=libraries, - ) - # build extension module - args = ['build_ext'] - args.append('--build-temp=' + srcdir) - args.append('--build-lib=' + srcdir) - args.append('-q') - args = dict( - name=name, - ext_modules=[ext], - script_args=args, - ) - with quiet(): - setuptools.setup(**args) + subprocess.check_call([cc, src, f"-I{py_include_dir}", f"-I{srcdir}", "-shared", "-fPIC", "-o", so]) return so diff --git a/python/triton/runtime/build.py b/python/triton/runtime/build.py index 20da2bc25790..1b76548d43a7 100644 --- a/python/triton/runtime/build.py +++ b/python/triton/runtime/build.py @@ -1,21 +1,7 @@ -import contextlib -import sys -import io import sysconfig import os import shutil import subprocess -import setuptools - - -@contextlib.contextmanager -def quiet(): - old_stdout, old_stderr = sys.stdout, sys.stderr - sys.stdout, sys.stderr = io.StringIO(), io.StringIO() - try: - yield - finally: - sys.stdout, sys.stderr = old_stdout, old_stderr def _build(name, src, srcdir, library_dirs, include_dirs, libraries): @@ -47,34 +33,5 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries): cc_cmd += [f'-l{lib}' for lib in libraries] cc_cmd += [f"-L{dir}" for dir in library_dirs] cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None] - ret = subprocess.check_call(cc_cmd) - if ret == 0: - return so - # fallback on setuptools - extra_compile_args = [] - # extra arguments - extra_link_args = [] - # create extension module - ext = setuptools.Extension( - name=name, - language='c', - sources=[src], - include_dirs=include_dirs, - extra_compile_args=extra_compile_args + ['-O3'], - extra_link_args=extra_link_args, - library_dirs=library_dirs, - libraries=libraries, - ) - # build extension module - args = ['build_ext'] - args.append('--build-temp=' + srcdir) - args.append('--build-lib=' + srcdir) - args.append('-q') - args = dict( - name=name, - ext_modules=[ext], - script_args=args, - ) - with quiet(): - setuptools.setup(**args) + subprocess.check_call(cc_cmd, stdout=subprocess.DEVNULL) return so diff --git a/third_party/proton/test/test_viewer.py b/third_party/proton/test/test_viewer.py index 13ea1d39b4f2..f4a4b5efe000 100644 --- a/third_party/proton/test/test_viewer.py +++ b/third_party/proton/test/test_viewer.py @@ -14,8 +14,7 @@ def test_help(): # Only check if the viewer can be invoked - ret = subprocess.check_call(["proton-viewer", "-h"], stdout=subprocess.DEVNULL) - assert ret == 0 + subprocess.check_call(["proton-viewer", "-h"], stdout=subprocess.DEVNULL) def test_sort():