From 16bd3133bd72f6dd344ec2fa0b7acdc036149456 Mon Sep 17 00:00:00 2001 From: Jeff Daily Date: Sat, 26 Apr 2025 00:57:36 +0000 Subject: [PATCH 1/5] update hipify_torch submodule for version 2 --- external/hipify_torch | 2 +- fbgemm_gpu/include/fbgemm_gpu/utils/cuda_prelude.cuh | 10 ++-------- .../include/fbgemm_gpu/utils/kernel_launcher.cuh | 9 --------- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/external/hipify_torch b/external/hipify_torch index 420084499c..dcbe35f11a 160000 --- a/external/hipify_torch +++ b/external/hipify_torch @@ -1 +1 @@ -Subproject commit 420084499c7c1e1c2d801922f40df202eac5f3a0 +Subproject commit dcbe35f11ab4505a60e8fea0fdf200dd4eb6388c diff --git a/fbgemm_gpu/include/fbgemm_gpu/utils/cuda_prelude.cuh b/fbgemm_gpu/include/fbgemm_gpu/utils/cuda_prelude.cuh index 9b33c895c6..0d18af2f2a 100644 --- a/fbgemm_gpu/include/fbgemm_gpu/utils/cuda_prelude.cuh +++ b/fbgemm_gpu/include/fbgemm_gpu/utils/cuda_prelude.cuh @@ -14,9 +14,9 @@ #ifdef __HIP_PLATFORM_AMD__ #include +#include #include - -#include // @manual +#include #else #include #endif @@ -25,15 +25,9 @@ namespace { inline int get_device_sm_cnt_() { -#ifdef __HIP_PLATFORM_AMD__ - hipDeviceProp_t deviceProp; - hipGetDeviceProperties(&deviceProp, c10::hip::current_device()); - return deviceProp.multiProcessorCount; -#else cudaDeviceProp* deviceProp = at::cuda::getDeviceProperties(c10::cuda::current_device()); return deviceProp->multiProcessorCount; -#endif } } // namespace diff --git a/fbgemm_gpu/include/fbgemm_gpu/utils/kernel_launcher.cuh b/fbgemm_gpu/include/fbgemm_gpu/utils/kernel_launcher.cuh index 6a69702edd..27498b33b2 100644 --- a/fbgemm_gpu/include/fbgemm_gpu/utils/kernel_launcher.cuh +++ b/fbgemm_gpu/include/fbgemm_gpu/utils/kernel_launcher.cuh @@ -229,16 +229,7 @@ struct KernelLauncher { // transformation. auto& launch_registry = -#ifdef __HIPCC__ - // CUDAKernelLaunchRegistry has only been recently added to Torch - // HIPify mappings, so wrap this with USE_ROCM until the mappings land - // in PyTorch OSS. - // - // TODO: Remove when CUDAKernelLaunchRegistry lands in the nightlies - c10::hip::HIPKernelLaunchRegistry::get_singleton_ref(); -#else c10::cuda::CUDAKernelLaunchRegistry::get_singleton_ref(); -#endif // If barrier isolation is enabled, synchronize the stream first before // launching the kernel. This has roughly the same effect as setting From c7148a0afb6bea65c8575b4bfcef8d90fcb00a1e Mon Sep 17 00:00:00 2001 From: Jeff Daily Date: Fri, 2 May 2025 23:37:14 +0000 Subject: [PATCH 2/5] update hipify_torch commit --- external/hipify_torch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/hipify_torch b/external/hipify_torch index dcbe35f11a..d2fab2dbb5 160000 --- a/external/hipify_torch +++ b/external/hipify_torch @@ -1 +1 @@ -Subproject commit dcbe35f11ab4505a60e8fea0fdf200dd4eb6388c +Subproject commit d2fab2dbb5114f997cb2e559f5a9bfa39f574e3a From 54875b5215002df823cc03c5cd9696987a8e12ca Mon Sep 17 00:00:00 2001 From: Jeff Daily Date: Mon, 5 May 2025 22:11:24 +0000 Subject: [PATCH 3/5] update hipify_torch submodule --- external/hipify_torch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/hipify_torch b/external/hipify_torch index d2fab2dbb5..e4372e791a 160000 --- a/external/hipify_torch +++ b/external/hipify_torch @@ -1 +1 @@ -Subproject commit d2fab2dbb5114f997cb2e559f5a9bfa39f574e3a +Subproject commit e4372e791a72c1b5c4c2b4a0f21a605fb5a4910d From ed9506766281f2359ed37f2e45387926febfe652 Mon Sep 17 00:00:00 2001 From: Jeff Daily Date: Tue, 6 May 2025 15:52:31 +0000 Subject: [PATCH 4/5] update submodule --- external/hipify_torch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/hipify_torch b/external/hipify_torch index e4372e791a..5463c1eda5 160000 --- a/external/hipify_torch +++ b/external/hipify_torch @@ -1 +1 @@ -Subproject commit e4372e791a72c1b5c4c2b4a0f21a605fb5a4910d +Subproject commit 5463c1eda526f1a61d77892844de8772cb912e42 From 57b27f098bbd767561f043c11657f32c2b505ef0 Mon Sep 17 00:00:00 2001 From: Jeff Daily Date: Tue, 6 May 2025 21:17:20 +0000 Subject: [PATCH 5/5] update submodule --- external/hipify_torch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/hipify_torch b/external/hipify_torch index 5463c1eda5..a4337c69fe 160000 --- a/external/hipify_torch +++ b/external/hipify_torch @@ -1 +1 @@ -Subproject commit 5463c1eda526f1a61d77892844de8772cb912e42 +Subproject commit a4337c69fe0e2552a7b7b0669178926beeed828c