ROCm · bmedishe · Oct 12, 2023 · Oct 12, 2023 · Oct 17, 2023 · Oct 17, 2023
diff --git a/.github/workflows/pretest-rocm-test.sh b/.github/workflows/pretest-rocm-test.sh
@@ -3,11 +3,12 @@
 set -uex
 
 apt-get -y update
-DEBIAN_FRONTEND=noninteractive apt-get -y install python3.9-dev python3-pip
+DEBIAN_FRONTEND=noninteractive apt-get -y install python3.9-dev python3-pip git
 
 hipconfig
 
 python3.9 -m pip install -U pip wheel
+pip install git+https://github.com/ROCmSoftwarePlatform/hipify_torch.git
 
 export ROCM_HOME="/opt/rocm"
 export HCC_AMDGPU_TARGET="gfx900"

diff --git a/.github/workflows/pretest.yml b/.github/workflows/pretest.yml
@@ -32,6 +32,10 @@ jobs:
       run: |
         pip install pre-commit
 
+    - name: Install hipify-torch
+      run: |
+        pip install git+https://github.com/ROCmSoftwarePlatform/hipify_torch.git
+
     - name: Check
       run: |
         pre-commit run -a --show-diff-on-failure
@@ -77,6 +81,7 @@ jobs:
 
     - name: Build
       run: |
+        pip install git+https://github.com/ROCmSoftwarePlatform/hipify_torch.git
         pip install -U pip wheel
         READTHEDOCS=True pip install -v -e .
         ccache --max-size 0.5Gi --cleanup --show-stats

diff --git a/cupy_backends/cuda/_softlink.pyx b/cupy_backends/cuda/_softlink.pyx
@@ -5,6 +5,16 @@ from libc.stdint cimport intptr_t
 cimport cython
 
 
+def get_hipfuncname(cudafuncname):
+    import hipify_torch
+    from hipify_torch import cuda_to_hip_mappings
+    cuda_to_hip_map_list = cuda_to_hip_mappings.CUDA_TO_HIP_MAPPINGS
+    for cuda_to_hip_map in cuda_to_hip_map_list:
+        if cudafuncname in cuda_to_hip_map:
+            return cuda_to_hip_map[cudafuncname][0]
+    return cudafuncname
+
+
 cdef class SoftLink:
     def __init__(self, object libname, str prefix, *, bint mandatory=False):
         self.error = None
@@ -31,7 +41,12 @@ cdef class SoftLink:
         """
         if self._cdll is None:
             return <func_ptr>_fail_unsupported
-        cdef str funcname = f'{self.prefix}{name}'
+        cudafuncname = f'{self.prefix}{name}'
+        IF CUPY_HIP_VERSION != 0:
+            hipfuncname = get_hipfuncname(cudafuncname)
+            cdef str funcname = f'{hipfuncname}'
+        ELSE:
+            cdef str funcname = f'{cudafuncname}'
         cdef object func = getattr(self._cdll, funcname, None)
         if func is None:
             return <func_ptr>_fail_not_found

diff --git a/cupy_backends/cuda/libs/_cnvrtc.pxi b/cupy_backends/cuda/libs/_cnvrtc.pxi
@@ -132,12 +132,6 @@ cdef SoftLink _get_softlink():
                 libname = 'nvrtc64_120_0.dll'
     elif CUPY_HIP_VERSION != 0:
         runtime_version = runtime.runtimeGetVersion()
-        prefix = 'hiprtc'
-        if runtime_version < 5_00_00000:
-            # ROCm 4.x
-            libname = 'libamdhip64.so.4'
-        elif runtime_version < 6_00_00000:
-            # ROCm 5.x
-            libname = 'libamdhip64.so.5'
+        libname = 'libamdhip64.so'
 
     return SoftLink(libname, prefix, mandatory=True)