feat: code adaptation package management for amd

WildBeast114514 · WildBeast114514 · commit 1c3640971789 · 2023-12-05T21:42:21.000+08:00
Change-Id: I905e094ca98162ce8e61ee744d6fa14ff870f56a
diff --git a/modules/audio/BUILD b/modules/audio/BUILD
@@ -33,11 +33,7 @@ apollo_cc_library(
         "@com_github_jbeder_yaml_cpp//:yaml-cpp",
         "@eigen",
         "@fftw3",
-    ] + if_cuda([
-        "@libtorch_gpu_cuda",
-    ]) + if_rocm([
-        "@libtorch_gpu_rocm",
-    ]),
+    ] + ["@libtorch_gpu"],
 )
 
 apollo_component(
diff --git a/modules/perception/common/inference/BUILD b/modules/perception/common/inference/BUILD
@@ -117,19 +117,18 @@ apollo_cc_library(
         "@com_google_absl//:absl",
         "@com_google_protobuf//:protobuf",
         "@opencv//:imgcodecs",
+        "@libtorch_gpu",
     ] + select({
         "@platforms//cpu:x86_64": ["@paddleinference-x86_64//:paddleinference_lib"],
         "@platforms//cpu:aarch64": ["@paddleinference-aarch64//:paddleinference_lib"],
     }) + if_cuda([
-        "@libtorch_gpu_cuda",
         "@local_config_cuda//cuda:cudart",
         "@local_config_cuda//cuda:cublas",
         "@local_config_cuda//cuda:cuda_headers",
         "@local_config_cuda//cuda:cudnn",
         "@local_config_cuda//cuda:cudnn_header",
         "@local_config_tensorrt//:tensorrt",
     ]) + if_rocm([
-        "@libtorch_gpu_rocm",
         "@local_config_rocm//rocm:hip",
         "@local_config_rocm//rocm:hipblas",
         "@local_config_rocm//rocm:rocm_headers",
diff --git a/modules/perception/lidar_detection/BUILD b/modules/perception/lidar_detection/BUILD
@@ -189,18 +189,17 @@ apollo_cc_library(
         "@com_google_googletest//:gtest",
         "@eigen",
         "@local_config_pcl//:pcl",
+        "@libtorch_gpu",
     ] + select({
         "@platforms//cpu:x86_64": ["@centerpoint_infer_op-x86_64//:centerpoint_infer_op"],
         "@platforms//cpu:aarch64": ["@centerpoint_infer_op-aarch64//:centerpoint_infer_op"],
     }) + select({
         "@platforms//cpu:x86_64": ["@paddleinference-x86_64//:paddleinference_lib"],
         "@platforms//cpu:aarch64": ["@paddleinference-aarch64//:paddleinference_lib"],
     }) + if_cuda([
-        "@libtorch_gpu_cuda",
         "@local_config_cuda//cuda:cudart",
         "@local_config_tensorrt//:tensorrt",
     ]) + if_rocm([
-        "@libtorch_gpu_rocm",
         "@local_config_rocm//rocm:hip",
         "@local_config_rocm//rocm:migraphx",
     ]),
diff --git a/modules/perception/radar4d_detection/BUILD b/modules/perception/radar4d_detection/BUILD
@@ -208,11 +208,8 @@ apollo_cc_library(
         "@local_config_cuda//cuda:cudart",
         "@local_config_pcl//:pcl",
         "@local_config_tensorrt//:tensorrt",
-    ] + if_cuda([
-        "@libtorch_gpu_cuda",
-    ]) + if_rocm([
-        "@libtorch_gpu_rocm",
-    ]),
+        "@libtorch_gpu",
+    ],
 )
 
 apollo_component(
diff --git a/modules/prediction/BUILD b/modules/prediction/BUILD
@@ -206,7 +206,7 @@ apollo_cc_library(
         "@opencv//:highgui",
         "@opencv//:imgcodecs",
     ] + if_gpu(
-        ["@libtorch_gpu_cuda"],
+        ["@libtorch_gpu"],
         ["@libtorch_cpu"],
     ),
 )
diff --git a/modules/prediction/evaluator/model_manager/model/semantic_lstm_pedestrian_torch_cpu/BUILD b/modules/prediction/evaluator/model_manager/model/semantic_lstm_pedestrian_torch_cpu/BUILD
@@ -22,7 +22,7 @@ apollo_plugin(
         "//modules/prediction:apollo_prediction",
         "//modules/prediction/proto:prediction_conf_cc_proto",
     ] + if_gpu(
-        ["@libtorch_gpu_cuda"],
+        ["@libtorch_gpu"],
         ["@libtorch_cpu"],
     ),
 )
diff --git a/modules/prediction/evaluator/model_manager/model/semantic_lstm_pedestrian_torch_gpu/BUILD b/modules/prediction/evaluator/model_manager/model/semantic_lstm_pedestrian_torch_gpu/BUILD
@@ -24,7 +24,7 @@ apollo_plugin(
         "//modules/prediction/proto:prediction_conf_cc_proto",
     ] + if_gpu(
         [
-            "@libtorch_gpu_cuda",
+            "@libtorch_gpu",
         ],
         ["@libtorch_cpu"],
     ),
diff --git a/modules/prediction/evaluator/model_manager/model/semantic_lstm_vehicle_torch_cpu/BUILD b/modules/prediction/evaluator/model_manager/model/semantic_lstm_vehicle_torch_cpu/BUILD
@@ -22,7 +22,7 @@ apollo_plugin(
         "//modules/prediction:apollo_prediction",
         "//modules/prediction/proto:prediction_conf_cc_proto",
     ] + if_gpu(
-        ["@libtorch_gpu_cuda"],
+        ["@libtorch_gpu"],
         ["@libtorch_cpu"],
     ),
 )
diff --git a/modules/prediction/evaluator/model_manager/model/semantic_lstm_vehicle_torch_gpu/BUILD b/modules/prediction/evaluator/model_manager/model/semantic_lstm_vehicle_torch_gpu/BUILD
@@ -22,7 +22,7 @@ apollo_plugin(
         "//modules/prediction:apollo_prediction",
         "//modules/prediction/proto:prediction_conf_cc_proto",
     ] + if_gpu(
-        ["@libtorch_gpu_cuda"],
+        ["@libtorch_gpu"],
         ["@libtorch_cpu"],
     ),
 )
diff --git a/third_party/BUILD b/third_party/BUILD
@@ -6,10 +6,10 @@ cc_library(
     name = "libtorch",
     deps = select({
         "//tools/platform:use_nvidia_gpu": [
-            "@libtorch_gpu_cuda",
+            "@libtorch_gpu",
         ],
         "//tools/platform:use_amd_gpu": [
-            "@libtorch_gpu_rocm",
+            "@libtorch_gpu",
         ],
         "//conditions:default": [
             "@libtorch_cpu",
diff --git a/third_party/gpus/cuda/build_defs.bzl.tpl b/third_party/gpus/cuda/build_defs.bzl.tpl
@@ -1,6 +1,9 @@
 # Macros for building CUDA code.
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
 
+def cuda_extra_copts():
+    return %{cuda_extra_copts}
+
 def if_cuda(if_true, if_false = []):
     """Shorthand for select()'ing on whether we're building with CUDA.
 
diff --git a/third_party/gpus/init.bzl b/third_party/gpus/init.bzl
@@ -1,4 +1,6 @@
 load("//third_party/gpus:cuda_configure.bzl", "cuda_configure")
+load("//third_party/gpus:rocm_configure.bzl", "rocm_configure")
   
 def init():
-    cuda_configure(name = "local_config_cuda")
+    cuda_configure(name = "local_config_cuda")
+    rocm_configure(name = "local_config_rocm")
diff --git a/third_party/libtorch/workspace.bzl b/third_party/libtorch/workspace.bzl
@@ -14,12 +14,15 @@ def repo_cpu():
 
 def repo_gpu():
     native.new_local_repository(
-        name = "libtorch_gpu_rocm",
-        build_file = clean_dep("//third_party/libtorch:libtorch_gpu_rocm.BUILD"),
-        path = "/usr/local/libtorch_gpu/include",
-    )
-    native.new_local_repository(
-        name = "libtorch_gpu_cuda",
-        build_file = clean_dep("//third_party/libtorch:libtorch_gpu_cuda.BUILD"),
+        name = "libtorch_gpu",
+        build_file = select({
+            "@local_config_rocm//rocm:using_hipcc": clean_dep("//third_party/libtorch:libtorch_gpu_rocm.BUILD"),
+            "//conditions:default": clean_dep("//third_party/libtorch:libtorch_gpu_cuda.BUILD"),
+        })
         path = "/usr/local/libtorch_gpu/include",
     )
+    # native.new_local_repository(
+    #     name = "libtorch_gpu_cuda",
+    #     build_file = 
+    #     path = "/usr/local/libtorch_gpu/include",
+    # )

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ apollo_cc_library(`
`206`	`206`	`"@opencv//:highgui",`
`207`	`207`	`"@opencv//:imgcodecs",`
`208`	`208`	`] + if_gpu(`
`209`		`- ["@libtorch_gpu_cuda"],`
	`209`	`+ ["@libtorch_gpu"],`
`210`	`210`	`["@libtorch_cpu"],`
`211`	`211`	`),`
`212`	`212`	`)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ apollo_plugin(`
`22`	`22`	`"//modules/prediction:apollo_prediction",`
`23`	`23`	`"//modules/prediction/proto:prediction_conf_cc_proto",`
`24`	`24`	`] + if_gpu(`
`25`		`- ["@libtorch_gpu_cuda"],`
	`25`	`+ ["@libtorch_gpu"],`
`26`	`26`	`["@libtorch_cpu"],`
`27`	`27`	`),`
`28`	`28`	`)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ apollo_plugin(`
`24`	`24`	`"//modules/prediction/proto:prediction_conf_cc_proto",`
`25`	`25`	`] + if_gpu(`
`26`	`26`	`[`
`27`		`- "@libtorch_gpu_cuda",`
	`27`	`+ "@libtorch_gpu",`
`28`	`28`	`],`
`29`	`29`	`["@libtorch_cpu"],`
`30`	`30`	`),`