@@ -189,6 +189,7 @@ cc_library(
189189 "%{ rocm_root} /lib/libamd_comgr.so*",
190190 "%{ rocm_root} /lib/librccl*.so*",
191191 "%{ rocm_root} /lib/libhipsparse*.so*",
192+ "%{ rocm_root} /lib/libhipsolver*.so*",
192193 ]),
193194 hdrs = glob(["%{ rocm_root} /include/hip/**"]),
194195 include_prefix = "rocm",
@@ -198,6 +199,8 @@ cc_library(
198199 strip_include_prefix = "%{ rocm_root} ",
199200 visibility = ["//visibility:public"],
200201 deps = [
202+ ":hipfft",
203+ ":rocfft",
201204 ":rocm_config",
202205 ":system_libs",
203206 ],
@@ -249,10 +252,7 @@ cc_library(
249252 ],
250253 linkstatic = 1,
251254 visibility = ["//visibility:public"],
252- deps = [
253- ":hipsolver",
254- ":rocm_config",
255- ],
255+ deps = [":rocm_config"],
256256)
257257
258258cc_library(
@@ -433,19 +433,22 @@ hipsolver_libs = glob([
433433
434434cc_library(
435435 name = "hipsolver",
436- hdrs = glob(["%{ rocm_root} /include/hipsolver/**"]),
437- data = select({
436+ srcs = select({
438437 " :build_hermetic" : hipsolver_libs,
439438 " :multiple_rocm_paths" : hipsolver_libs,
440439 " //conditions:default" : [],
441440 } ),
441+ hdrs = glob(["%{ rocm_root} /include/hipsolver/**"]),
442442 include_prefix = "rocm",
443443 includes = [
444444 "%{ rocm_root} /include/",
445445 ],
446446 strip_include_prefix = "%{ rocm_root} ",
447447 visibility = ["//visibility:public"],
448- deps = [":rocm_config"],
448+ deps = [
449+ ":rocm_config",
450+ ":rocm_rpath",
451+ ],
449452)
450453
451454hipblas_libs = glob(["%{ rocm_root} /lib/libhipblas.so*"])
@@ -466,7 +469,6 @@ cc_library(
466469 visibility = ["//visibility:public"],
467470 deps = [
468471 ":hipblas-common",
469- ":hipsolver",
470472 ":rocm_config",
471473 ":rocm_rpath",
472474 ],
@@ -517,10 +519,12 @@ cc_library(
517519 includes = [
518520 "%{ rocm_root} /include/",
519521 ],
520- linkopts = ["-Wl,-rpath,external/local_config_rocm/rocm/%{ rocm_root} /lib"],
521522 strip_include_prefix = "%{ rocm_root} ",
522523 visibility = ["//visibility:public"],
523- deps = [":rocm_config"],
524+ deps = [
525+ ":rocm_config",
526+ ":rocm_rpath",
527+ ],
524528)
525529
526530cc_library(
0 commit comments