diff --git a/runtimes/cuda/BUILD.bazel b/runtimes/cuda/BUILD.bazel index 0913c058..5236843d 100644 --- a/runtimes/cuda/BUILD.bazel +++ b/runtimes/cuda/BUILD.bazel @@ -12,10 +12,16 @@ cc_library( ) cc_library( - name = "libpjrt_cuda", - hdrs = ["libpjrt_cuda.h"], + name = "zmlxcuda", defines = ["ZML_RUNTIME_CUDA"], - deps = ["@libpjrt_cuda"], +) + +cc_library( + name = "libcuda_headers", + hdrs = ["cuda.h"], + deps = [ + "@libpjrt_cuda//:libcuda_headers", + ], ) zig_library( @@ -27,7 +33,9 @@ zig_library( "//pjrt", ] + select({ "//runtimes:cuda.enabled": [ - ":libpjrt_cuda", + "@libpjrt_cuda", + ":libcuda_headers", + ":zmlxcuda", "//async", "//stdx", "@rules_zig//zig/runfiles", diff --git a/runtimes/cuda/cuda.bzl b/runtimes/cuda/cuda.bzl index 2d27705f..dca9718b 100644 --- a/runtimes/cuda/cuda.bzl +++ b/runtimes/cuda/cuda.bzl @@ -23,17 +23,11 @@ _UBUNTU_PACKAGES = { CUDA_PACKAGES = { "cuda_cudart": "\n".join([ - # Driver API only packages.cc_library( - name = "cuda", + name = "cuda_headers", hdrs = ["include/cuda.h"], includes = ["include"], ), - #TODO: Remove me as soon we use the Driver API in tracer.zig - packages.filegroup( - name = "so_files", - srcs = ["lib/libcudart.so.12"], - ), ]), "cuda_cupti": packages.filegroup( name = "so_files", diff --git a/runtimes/cuda/libpjrt_cuda.h b/runtimes/cuda/cuda.h similarity index 100% rename from runtimes/cuda/libpjrt_cuda.h rename to runtimes/cuda/cuda.h diff --git a/runtimes/cuda/libpjrt_cuda.BUILD.bazel b/runtimes/cuda/libpjrt_cuda.BUILD.bazel index d49d1357..10afa712 100644 --- a/runtimes/cuda/libpjrt_cuda.BUILD.bazel +++ b/runtimes/cuda/libpjrt_cuda.BUILD.bazel @@ -1,5 +1,4 @@ load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory") -load("@zml//bazel:cc_import.bzl", "cc_import") load("@zml//bazel:patchelf.bzl", "patchelf") cc_shared_library( @@ -32,7 +31,6 @@ copy_to_directory( "@cuda_nvtx//:so_files", "@cuda_nvcc//:so_files", "@cuda_nvrtc//:so_files", - "@cuda_cudart//:so_files", "@cudnn//:so_files", "@libcublas//:so_files", "@libcufft//:so_files", @@ -53,10 +51,9 @@ copy_to_directory( ) cc_library( - name = "libpjrt_cuda", - data = [":sandbox"], + name = "libcuda_headers", deps = [ - "@cuda_cudart//:cuda", + "@cuda_cudart//:cuda_headers", ], linkopts = [ # Defer function call resolution until the function is called @@ -70,3 +67,9 @@ cc_library( ], visibility = ["@zml//runtimes/cuda:__subpackages__"], ) + +cc_library( + name = "libpjrt_cuda", + data = [":sandbox"], + visibility = ["@zml//runtimes/cuda:__subpackages__"], +) diff --git a/runtimes/neuron/BUILD.bazel b/runtimes/neuron/BUILD.bazel index b65d7a38..89885855 100644 --- a/runtimes/neuron/BUILD.bazel +++ b/runtimes/neuron/BUILD.bazel @@ -107,11 +107,15 @@ cc_library( ) cc_library( - name = "libpjrt_neuron", - hdrs = ["libpjrt_neuron.h"], + name = "zmlxneuron", defines = ["ZML_RUNTIME_NEURON"], +) + +cc_library( + name = "libnrt_headers", + hdrs = ["nrt.h"], deps = [ - "@libpjrt_neuron", + "@libpjrt_neuron//:libnrt_headers", ], ) @@ -130,7 +134,9 @@ zig_library( "//pjrt", ] + select({ "//runtimes:neuron.enabled": [ - ":libpjrt_neuron", + "@libpjrt_neuron", + ":zmlxneuron", + ":libnrt_headers", ":libneuronxla_pyenv", ":libpython", "//async", diff --git a/runtimes/neuron/libpjrt_neuron.BUILD.bazel b/runtimes/neuron/libpjrt_neuron.BUILD.bazel index 5df16d6b..e6905ecf 100644 --- a/runtimes/neuron/libpjrt_neuron.BUILD.bazel +++ b/runtimes/neuron/libpjrt_neuron.BUILD.bazel @@ -77,8 +77,7 @@ copy_to_directory( ) cc_library( - name = "libpjrt_neuron", - data = [":sandbox"], + name = "libnrt_headers", deps = [ "@aws-neuronx-runtime-lib//:libnrt_headers", ], @@ -94,3 +93,9 @@ cc_library( ], visibility = ["@zml//runtimes/neuron:__subpackages__"], ) + +cc_library( + name = "libpjrt_neuron", + data = [":sandbox"], + visibility = ["@zml//runtimes/neuron:__subpackages__"], +) diff --git a/runtimes/neuron/libpjrt_neuron.h b/runtimes/neuron/nrt.h similarity index 100% rename from runtimes/neuron/libpjrt_neuron.h rename to runtimes/neuron/nrt.h diff --git a/runtimes/rocm/BUILD.bazel b/runtimes/rocm/BUILD.bazel index bab048b1..d134a94b 100644 --- a/runtimes/rocm/BUILD.bazel +++ b/runtimes/rocm/BUILD.bazel @@ -26,9 +26,8 @@ cc_library( ) cc_library( - name = "libpjrt_rocm", + name = "zmlxrocm", defines = ["ZML_RUNTIME_ROCM"], - deps = ["@libpjrt_rocm"], ) zig_library( @@ -40,7 +39,8 @@ zig_library( "//pjrt", ] + select({ "//runtimes:rocm.enabled": [ - ":libpjrt_rocm", + "@libpjrt_rocm", + ":zmlxrocm", "//async", "//stdx", "@rules_zig//zig/runfiles",