ROCm 6.0 prep changes (#4537)

* ROCm 6.0 prep changes * PR feedback * Try updating apex
microsoft · Oct 20, 2023 · e238351 · e238351
1 parent 488f7e2
commit e238351
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 16 deletions.
diff --git a/.github/workflows/amd-mi200.yml b/.github/workflows/amd-mi200.yml
@@ -45,6 +45,7 @@ jobs:
         run: |
           git clone https://github.com/ROCmSoftwarePlatform/apex.git
           cd apex
+          git checkout torch_2.1_higher
           CURRENT_VER=$(git rev-parse HEAD)
           INSTALLED_VER=$(cat /blob/amd-apex/.venv_installed_version)
           if [[ "$CURRENT_VER" != "$INSTALLED_VER" ]]; then

diff --git a/op_builder/cpu_adagrad.py b/op_builder/cpu_adagrad.py
@@ -39,9 +39,5 @@ def include_paths(self):
         elif not self.is_rocm_pytorch():
             CUDA_INCLUDE = [os.path.join(torch.utils.cpp_extension.CUDA_HOME, "include")]
         else:
-            CUDA_INCLUDE = [
-                os.path.join(torch.utils.cpp_extension.ROCM_HOME, "include"),
-                os.path.join(torch.utils.cpp_extension.ROCM_HOME, "include", "rocrand"),
-                os.path.join(torch.utils.cpp_extension.ROCM_HOME, "include", "hiprand"),
-            ]
+            CUDA_INCLUDE = []
         return ['csrc/includes'] + CUDA_INCLUDE
diff --git a/op_builder/cpu_adam.py b/op_builder/cpu_adam.py
@@ -40,9 +40,5 @@ def include_paths(self):
         elif not self.is_rocm_pytorch():
             CUDA_INCLUDE = [os.path.join(torch.utils.cpp_extension.CUDA_HOME, "include")]
         else:
-            CUDA_INCLUDE = [
-                os.path.join(torch.utils.cpp_extension.ROCM_HOME, "include"),
-                os.path.join(torch.utils.cpp_extension.ROCM_HOME, "include", "rocrand"),
-                os.path.join(torch.utils.cpp_extension.ROCM_HOME, "include", "hiprand"),
-            ]
+            CUDA_INCLUDE = []
         return ['csrc/includes'] + CUDA_INCLUDE
diff --git a/op_builder/random_ltd.py b/op_builder/random_ltd.py
@@ -31,7 +31,4 @@ def sources(self):
 
     def include_paths(self):
         includes = ['csrc/includes']
-        if self.is_rocm_pytorch():
-            from torch.utils.cpp_extension import ROCM_HOME
-            includes += ['{}/hiprand/include'.format(ROCM_HOME), '{}/rocrand/include'.format(ROCM_HOME)]
         return includes
diff --git a/op_builder/transformer.py b/op_builder/transformer.py
@@ -33,7 +33,4 @@ def sources(self):
 
     def include_paths(self):
         includes = ['csrc/includes']
-        if self.is_rocm_pytorch():
-            from torch.utils.cpp_extension import ROCM_HOME
-            includes += ['{}/hiprand/include'.format(ROCM_HOME), '{}/rocrand/include'.format(ROCM_HOME)]
         return includes