From 3af1f1647d7609dcee650f5aca4f12edfc1adcfd Mon Sep 17 00:00:00 2001 From: Kenichi Maehashi Date: Tue, 10 Sep 2024 04:56:14 +0000 Subject: [PATCH] fix prepare_cuda_opt_library assumes `--source cupy` --- dist.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dist.py b/dist.py index 2ededa4c..6eee7a2f 100755 --- a/dist.py +++ b/dist.py @@ -55,7 +55,7 @@ def run_command_output(*cmd, **kwargs): return subprocess.check_output(cmd, **kwargs) -def prepare_cuda_opt_library(library, cuda_version, prefix): +def prepare_cuda_opt_library(library, cuda_version, prefix, *, workdir): """Extracts the library to the prefix, and returns preloading metadata.""" target_system = platform.system() @@ -69,7 +69,8 @@ def prepare_cuda_opt_library(library, cuda_version, prefix): '--prefix', prefix, ] records = json.loads( - run_command_output(*command, '--action', 'dump').decode('utf-8')) + run_command_output( + *command, '--action', 'dump', cwd=workdir).decode('utf-8')) for record in records: if record['cuda'] == cuda_version: metadata = { @@ -81,7 +82,7 @@ def prepare_cuda_opt_library(library, cuda_version, prefix): raise RuntimeError('Combination not supported by install_library tool') log('Extracting the library to {}'.format(prefix)) - run_command(*command, '--action', 'install') + run_command(*command, '--action', 'install', cwd=workdir) return metadata @@ -412,7 +413,7 @@ def build_linux( for p in preloads: wheel_metadata[p] = prepare_cuda_opt_library( - p, cuda_version, optlib_workdir) + p, cuda_version, optlib_workdir, workdir=workdir) log('Writing wheel metadata') with open('{}/_wheel.json'.format(workdir), 'w') as f: json.dump(wheel_metadata, f) @@ -562,7 +563,7 @@ def build_windows( os.mkdir(optlib_workdir) for p in preloads: wheel_metadata[p] = prepare_cuda_opt_library( - p, cuda_version, optlib_workdir) + p, cuda_version, optlib_workdir, workdir=workdir) # Create a wheel metadata file for preload. log('Writing wheel metadata')