Simplify GPU check

This change removes `thinc.util.has_cupy` from the GPU presence check.
Currently `gpu_is_available` already implies `has_cupy`.  We also want
to show this warning in the future when a machine has a non-CuPy GPU.
This commit is contained in:
Daniël de Kok 2022-05-25 14:06:45 +02:00
parent f6a4b80c0b
commit 7c6a97559d

View File

@ -12,7 +12,7 @@ from click.parser import split_arg_string
from typer.main import get_command from typer.main import get_command
from contextlib import contextmanager from contextlib import contextmanager
from thinc.api import Config, ConfigValidationError, require_gpu from thinc.api import Config, ConfigValidationError, require_gpu
from thinc.util import has_cupy, gpu_is_available from thinc.util import gpu_is_available
from configparser import InterpolationError from configparser import InterpolationError
import os import os
@ -554,5 +554,5 @@ def setup_gpu(use_gpu: int, silent=None) -> None:
require_gpu(use_gpu) require_gpu(use_gpu)
else: else:
local_msg.info("Using CPU") local_msg.info("Using CPU")
if has_cupy and gpu_is_available(): if gpu_is_available():
local_msg.info("To switch to GPU 0, use the option: --gpu-id 0") local_msg.info("To switch to GPU 0, use the option: --gpu-id 0")