Skip to content

Commit 66ae707

Browse files
wenchenvincentjithunnair-amd
wenchenvincent
and
jithunnair-amd
committed
Sync updates from hipify_torch. (#1168)
Co-authored-by: Jithun Nair <[email protected]>
1 parent b544845 commit 66ae707

File tree

2 files changed

+82
-5
lines changed

2 files changed

+82
-5
lines changed

‎torch/utils/hipify/constants.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,4 @@
6060
API_CAFFE2 = 1338
6161
API_C10 = 1339
6262
API_PYT_EXT = 1340
63+
API_ROCMSMI = 1341

‎torch/utils/hipify/cuda_to_hip_mappings.py

Lines changed: 81 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from .constants import (API_BLAS, API_C10, API_CAFFE2, API_DRIVER, API_FFT,
77
API_PYTORCH, API_PYT_EXT, API_RAND, API_ROCTX, API_RTC, API_RUNTIME,
8-
API_SPARSE, API_SOLVER, CONV_CACHE, CONV_CONTEXT, CONV_D3D9,
8+
API_SPARSE, API_SOLVER, API_ROCMSMI, CONV_CACHE, CONV_CONTEXT, CONV_D3D9,
99
CONV_D3D10, CONV_D3D11, CONV_DEF, CONV_DEVICE,
1010
CONV_DEVICE_FUNC, CONV_EGL, CONV_ERROR, CONV_EVENT,
1111
CONV_EXEC, CONV_GL, CONV_GRAPHICS, CONV_INCLUDE,
@@ -79,6 +79,7 @@
7979
[
8080
("CUresult", ("hipError_t", CONV_TYPE, API_DRIVER)),
8181
("cudaError_t", ("hipError_t", CONV_TYPE, API_RUNTIME)),
82+
("cudaError", ("hipError_t", CONV_TYPE, API_RUNTIME)),
8283
(
8384
"CUDA_ARRAY3D_DESCRIPTOR",
8485
("HIP_ARRAY3D_DESCRIPTOR", CONV_TYPE, API_DRIVER, HIP_UNSUPPORTED),
@@ -128,6 +129,9 @@
128129
("CUdevice", ("hipDevice_t", CONV_TYPE, API_DRIVER)),
129130
("CUdevice_attribute_enum", ("hipDeviceAttribute_t", CONV_TYPE, API_DRIVER)),
130131
("CUdevice_attribute", ("hipDeviceAttribute_t", CONV_TYPE, API_DRIVER)),
132+
("CUpointer_attribute", ("hipPointer_attribute", CONV_TYPE, API_DRIVER)),
133+
("CU_POINTER_ATTRIBUTE_DEVICE_ORDINAL", ("HIP_POINTER_ATTRIBUTE_DEVICE_ORDINAL", CONV_TYPE, API_DRIVER)),
134+
("CU_POINTER_ATTRIBUTE_BUFFER_ID", ("HIP_POINTER_ATTRIBUTE_BUFFER_ID", CONV_TYPE, API_DRIVER)),
131135
("CUdeviceptr", ("hipDeviceptr_t", CONV_TYPE, API_DRIVER)),
132136
("CUarray_st", ("hipArray", CONV_TYPE, API_DRIVER)),
133137
("CUarray", ("hipArray *", CONV_TYPE, API_DRIVER)),
@@ -317,7 +321,7 @@
317321
),
318322
("cudaArrayCubemap", ("hipArrayCubemap", CONV_MEM, API_RUNTIME)),
319323
("cudaArrayTextureGather", ("hipArrayTextureGather", CONV_MEM, API_RUNTIME)),
320-
("cudaMemoryAdvise", ("hipMemAdvise", CONV_TYPE, API_RUNTIME, HIP_UNSUPPORTED)),
324+
("cudaMemoryAdvise", ("hipMemoryAdvise", CONV_TYPE, API_RUNTIME, HIP_UNSUPPORTED)),
321325
(
322326
"cudaMemRangeAttribute",
323327
("hipMemRangeAttribute", CONV_TYPE, API_RUNTIME, HIP_UNSUPPORTED),
@@ -563,6 +567,7 @@
563567
("curandStateXORWOW_t", ("hiprandStateXORWOW_t", CONV_TYPE, API_RAND)),
564568
("curandState_t", ("hiprandState_t", CONV_TYPE, API_RAND)),
565569
("curandState", ("hiprandState_t", CONV_TYPE, API_RAND)),
570+
("CUuuid", ("hipUUID", CONV_TYPE, API_RUNTIME)),
566571
]
567572
)
568573

@@ -583,6 +588,7 @@
583588
("hip/hip_runtime.h", CONV_INCLUDE_CUDA_MAIN_H, API_RUNTIME),
584589
),
585590
("cuda_runtime_api.h", ("hip/hip_runtime_api.h", CONV_INCLUDE, API_RUNTIME)),
591+
("cuda_profiler_api.h", ("hip/hip_runtime_api.h", CONV_INCLUDE, API_RUNTIME)),
586592
(
587593
"channel_descriptor.h",
588594
("hip/channel_descriptor.h", CONV_INCLUDE, API_RUNTIME),
@@ -629,11 +635,14 @@
629635
("cub/util_allocator.cuh", ("hipcub/hipcub.hpp", CONV_INCLUDE, API_BLAS)),
630636
("cub/block/block_reduce.cuh", ("hipcub/hipcub.hpp", CONV_INCLUDE, API_BLAS)),
631637
("cub/cub.cuh", ("hipcub/hipcub.hpp", CONV_INCLUDE, API_BLAS)),
638+
("cub/device/device_run_length_encode.cuh", ("hipcub/hipcub.hpp", CONV_INCLUDE, API_BLAS)),
632639
("cub/block/block_load.cuh", ("hipcub/hipcub.hpp", CONV_INCLUDE, API_BLAS)),
633640
("cub/device/device_radix_sort.cuh", ("hipcub/hipcub.hpp", CONV_INCLUDE, API_BLAS)),
634641
("cub/device/device_reduce.cuh", ("hipcub/hipcub.hpp", CONV_INCLUDE, API_BLAS)),
635642
("cub/device/device_scan.cuh", ("hipcub/hipcub.hpp", CONV_INCLUDE, API_BLAS)),
643+
("cub/device/device_select.cuh", ("hipcub/hipcub.hpp", CONV_INCLUDE, API_BLAS)),
636644
("nvToolsExt.h", ("roctracer/roctx.h", CONV_INCLUDE, API_ROCTX)),
645+
("nvml.h", ("rocm_smi/rocm_smi.h", CONV_INCLUDE, API_ROCMSMI)),
637646
("tensorpipe/tensorpipe_cuda.h", ("tensorpipe/tensorpipe_hip.h", CONV_INCLUDE, API_PYT_EXT)),
638647
]
639648
)
@@ -1352,7 +1361,7 @@
13521361
("CU_LAUNCH_PARAM_END", ("HIP_LAUNCH_PARAM_END", CONV_TYPE, API_DRIVER)),
13531362
(
13541363
"CU_IPC_HANDLE_SIZE",
1355-
("HIP_LAUNCH_PARAM_END", CONV_TYPE, API_DRIVER, HIP_UNSUPPORTED),
1364+
("HIP_IPC_HANDLE_SIZE", CONV_TYPE, API_DRIVER, HIP_UNSUPPORTED),
13561365
),
13571366
(
13581367
"CU_MEMHOSTALLOC_DEVICEMAP",
@@ -2760,21 +2769,24 @@
27602769
),
27612770
(
27622771
"cuGetErrorName",
2763-
("hipGetErrorName___", CONV_ERROR, API_DRIVER, HIP_UNSUPPORTED),
2772+
("hipGetErrorName", CONV_ERROR, API_DRIVER, HIP_UNSUPPORTED),
27642773
),
27652774
(
27662775
"cuGetErrorString",
2767-
("hipGetErrorString___", CONV_ERROR, API_DRIVER, HIP_UNSUPPORTED),
2776+
("hipGetErrorString", CONV_ERROR, API_DRIVER, HIP_UNSUPPORTED),
27682777
),
27692778
("cuInit", ("hipInit", CONV_INIT, API_DRIVER)),
27702779
("cuDriverGetVersion", ("hipDriverGetVersion", CONV_VERSION, API_DRIVER)),
2780+
("cuCtxCreate", ("hipCtxCreate", CONV_CONTEXT, API_DRIVER)),
27712781
("cuCtxCreate_v2", ("hipCtxCreate", CONV_CONTEXT, API_DRIVER)),
2782+
("cuCtxDestroy", ("hipCtxDestroy", CONV_CONTEXT, API_DRIVER)),
27722783
("cuCtxDestroy_v2", ("hipCtxDestroy", CONV_CONTEXT, API_DRIVER)),
27732784
("cuCtxGetApiVersion", ("hipCtxGetApiVersion", CONV_CONTEXT, API_DRIVER)),
27742785
("cuCtxGetCacheConfig", ("hipCtxGetCacheConfig", CONV_CONTEXT, API_DRIVER)),
27752786
("cuCtxGetCurrent", ("hipCtxGetCurrent", CONV_CONTEXT, API_DRIVER)),
27762787
("cuCtxGetDevice", ("hipCtxGetDevice", CONV_CONTEXT, API_DRIVER)),
27772788
("cuCtxGetFlags", ("hipCtxGetFlags", CONV_CONTEXT, API_DRIVER)),
2789+
("cuDeviceGetUuid", ("hipDeviceGetUuid", CONV_CONTEXT, API_DRIVER)),
27782790
(
27792791
"cuCtxGetLimit",
27802792
("hipCtxGetLimit", CONV_CONTEXT, API_DRIVER, HIP_UNSUPPORTED),
@@ -2896,6 +2908,7 @@
28962908
("CU_EVENT_DISABLE_TIMING", ("hipEventDisableTiming", CONV_EVENT, API_DRIVER)),
28972909
("CU_EVENT_INTERPROCESS", ("hipEventInterprocess", CONV_EVENT, API_DRIVER)),
28982910
("cuEventCreate", ("hipEventCreate", CONV_EVENT, API_DRIVER)),
2911+
("cuEventDestroy", ("hipEventDestroy", CONV_EVENT, API_DRIVER)),
28992912
("cuEventDestroy_v2", ("hipEventDestroy", CONV_EVENT, API_DRIVER)),
29002913
("cuEventElapsedTime", ("hipEventElapsedTime", CONV_EVENT, API_DRIVER)),
29012914
("cuEventQuery", ("hipEventQuery", CONV_EVENT, API_DRIVER)),
@@ -2979,6 +2992,7 @@
29792992
"cuStreamCreateWithPriority",
29802993
("hipStreamCreateWithPriority", CONV_STREAM, API_DRIVER, HIP_UNSUPPORTED),
29812994
),
2995+
("cuStreamDestroy", ("hipStreamDestroy", CONV_STREAM, API_DRIVER)),
29822996
("cuStreamDestroy_v2", ("hipStreamDestroy", CONV_STREAM, API_DRIVER)),
29832997
("cuStreamGetFlags", ("hipStreamGetFlags", CONV_STREAM, API_DRIVER)),
29842998
(
@@ -3089,6 +3103,7 @@
30893103
("hipMemcpyPeerAsync__", CONV_MEM, API_DRIVER, HIP_UNSUPPORTED),
30903104
),
30913105
("cuMemcpyPeer", ("hipMemcpyPeer__", CONV_MEM, API_DRIVER, HIP_UNSUPPORTED)),
3106+
("cuMemFree", ("hipFree", CONV_MEM, API_DRIVER)),
30923107
("cuMemFree_v2", ("hipFree", CONV_MEM, API_DRIVER)),
30933108
("cuMemFreeHost", ("hipHostFree", CONV_MEM, API_DRIVER)),
30943109
(
@@ -3163,6 +3178,10 @@
31633178
"cuPointerGetAttribute",
31643179
("hipPointerGetAttribute", CONV_MEM, API_DRIVER, HIP_UNSUPPORTED),
31653180
),
3181+
(
3182+
"cuMemGetAddressRange_v2",
3183+
("hipMemGetAddressRange", CONV_MEM, API_DRIVER),
3184+
),
31663185
(
31673186
"cuPointerGetAttributes",
31683187
("hipPointerGetAttributes", CONV_MEM, API_DRIVER, HIP_UNSUPPORTED),
@@ -4921,6 +4940,22 @@
49214940
"cudaDeviceGetCacheConfig",
49224941
("hipDeviceGetCacheConfig", CONV_CACHE, API_RUNTIME),
49234942
),
4943+
(
4944+
"cudaFuncAttributes",
4945+
("hipFuncAttributes", CONV_TYPE, API_RUNTIME),
4946+
),
4947+
(
4948+
"cudaFuncAttributeMaxDynamicSharedMemorySize",
4949+
("hipFuncAttributeMaxDynamicSharedMemorySize", CONV_TYPE, API_RUNTIME),
4950+
),
4951+
(
4952+
"cudaFuncAttributePreferredSharedMemoryCarveout",
4953+
("hipFuncAttributePreferredSharedMemoryCarveout", CONV_TYPE, API_RUNTIME),
4954+
),
4955+
(
4956+
"cudaFuncSetAttribute",
4957+
("hipFuncSetAttribute", CONV_EXEC, API_RUNTIME),
4958+
),
49244959
("cudaFuncSetCacheConfig", ("hipFuncSetCacheConfig", CONV_CACHE, API_RUNTIME)),
49254960
(
49264961
"cudaFuncCachePreferNone",
@@ -4960,6 +4995,10 @@
49604995
("hipConfigureCall", CONV_EXEC, API_RUNTIME, HIP_UNSUPPORTED),
49614996
),
49624997
("cudaLaunch", ("hipLaunch", CONV_EXEC, API_RUNTIME, HIP_UNSUPPORTED)),
4998+
(
4999+
"cudaLaunchCooperativeKernel",
5000+
("hipLaunchCooperativeKernel", CONV_EXEC, API_RUNTIME),
5001+
),
49635002
(
49645003
"cudaSetupArgument",
49655004
("hipSetupArgument", CONV_EXEC, API_RUNTIME, HIP_UNSUPPORTED),
@@ -6520,6 +6559,22 @@
65206559
"cublasZgetriBatched",
65216560
("hipblasZgetriBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED),
65226561
),
6562+
(
6563+
"cublasSgetriBatched",
6564+
("rocblas_sgetri_batched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED),
6565+
),
6566+
(
6567+
"cublasDgetriBatched",
6568+
("rocblas_dgetri_batched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED),
6569+
),
6570+
(
6571+
"cublasCgetriBatched",
6572+
("rocblas_cgetri_batched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED),
6573+
),
6574+
(
6575+
"cublasZgetriBatched",
6576+
("rocblas_zgetri_batched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED),
6577+
),
65236578
(
65246579
"cublasSgetrsBatched",
65256580
("hipblasSgetrsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED),
@@ -7762,6 +7817,10 @@
77627817
("nvrtcGetPTX", ("hiprtcGetCode", CONV_JIT, API_RTC)),
77637818
("nvrtcGetPTXSize", ("hiprtcGetCodeSize", CONV_JIT, API_RTC)),
77647819
("thrust::cuda", ("thrust::hip", CONV_MATH_FUNC, API_BLAS)),
7820+
(
7821+
"cudaCpuDeviceId",
7822+
("hipCpuDeviceId", CONV_TYPE, API_RUNTIME, HIP_UNSUPPORTED),
7823+
),
77657824
# The caffe2 directory does a string match; pytorch does a word-boundary match.
77667825
# Patterns such as 'cub::' will not match for pytorch.
77677826
# We list all current uses of cub symbols for this reason.
@@ -7793,6 +7852,15 @@
77937852
("nvtxRangePop", ("roctxRangePop", CONV_OTHER, API_ROCTX)),
77947853
("nvtxRangeStartA", ("roctxRangeStartA", CONV_OTHER, API_ROCTX)),
77957854
("nvtxRangeEnd", ("roctxRangeStop", CONV_OTHER, API_ROCTX)),
7855+
("nvmlReturn_t", ("rsmi_status_t", CONV_OTHER, API_ROCMSMI)),
7856+
("NVML_SUCCESS", ("RSMI_STATUS_SUCCESS", CONV_OTHER, API_ROCMSMI)),
7857+
("NVML_P2P_CAPS_INDEX_READ", ("RSMI_STATUS_SUCCESS", CONV_OTHER, API_ROCMSMI)),
7858+
("NVML_P2P_STATUS_OK", ("RSMI_STATUS_SUCCESS", CONV_OTHER, API_ROCMSMI)),
7859+
("NVML_ERROR_INSUFFICIENT_SIZE", ("RSMI_STATUS_INSUFFICIENT_SIZE", CONV_OTHER, API_ROCMSMI)),
7860+
("nvmlDevice_t", ("uint32_t", CONV_OTHER, API_ROCMSMI)),
7861+
("nvmlGpuP2PStatus_t", ("bool", CONV_OTHER, API_ROCMSMI)),
7862+
("nvmlProcessInfo_t", ("rsmi_process_info_t", CONV_OTHER, API_ROCMSMI)),
7863+
("nvmlGpuP2PCapsIndex_t", ("uint32_t", CONV_OTHER, API_ROCMSMI)),
77967864
]
77977865
)
77987866

@@ -7964,7 +8032,11 @@
79648032
("CUSPARSE_MM_ALG_DEFAULT", ("HIPSPARSE_MM_ALG_DEFAULT", CONV_NUMERIC_LITERAL, API_SPARSE)),
79658033
("CUSPARSE_SPMM_COO_ALG1", ("HIPSPARSE_SPMM_COO_ALG1", CONV_NUMERIC_LITERAL, API_SPARSE)),
79668034
("CUSPARSE_SPMM_COO_ALG2", ("HIPSPARSE_SPMM_COO_ALG2", CONV_NUMERIC_LITERAL, API_SPARSE)),
8035+
("CUSPARSE_COOMM_ALG1", ("HIPSPARSE_COOMM_ALG1", CONV_NUMERIC_LITERAL, API_SPARSE)),
8036+
("CUSPARSE_COOMM_ALG2", ("HIPSPARSE_COOMM_ALG2", CONV_NUMERIC_LITERAL, API_SPARSE)),
8037+
("CUSPARSE_COOMM_ALG3", ("HIPSPARSE_COOMM_ALG3", CONV_NUMERIC_LITERAL, API_SPARSE)),
79678038
("CUSPARSE_COOMV_ALG", ("HIPSPARSE_COOMV_ALG", CONV_NUMERIC_LITERAL, API_SPARSE)),
8039+
("CUSPARSE_CSRMM_ALG1", ("HIPSPARSE_CSRMM_ALG1", CONV_NUMERIC_LITERAL, API_SPARSE)),
79688040
("CUSPARSE_SPMM_CSR_ALG1", ("HIPSPARSE_CSRMM_ALG1", CONV_NUMERIC_LITERAL, API_SPARSE)),
79698041
("CUSPARSE_SPGEMM_DEFAULT", ("HIPSPARSE_SPGEMM_DEFAULT", CONV_NUMERIC_LITERAL, API_SPARSE)),
79708042
("CUSPARSE_SDDMM_ALG_DEFAULT", ("HIPSPARSE_SDDMM_ALG_DEFAULT", CONV_NUMERIC_LITERAL, API_SPARSE)),
@@ -8342,6 +8414,10 @@
83428414
"setCurrentCUDAStream",
83438415
("setCurrentHIPStreamMasqueradingAsCUDA", API_PYTORCH),
83448416
),
8417+
(
8418+
"ATen/cudnn/Handle.h",
8419+
("ATen/miopen/Handle.h", API_PYTORCH),
8420+
),
83458421
# TODO: Undo this special-case; see the header for motivation behind this
83468422
# hack. It's VERY important this is only applied to PyTorch HIPify.
83478423
(

0 commit comments

Comments
 (0)