Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CPU Adam JIT compilation #5780

Merged
merged 8 commits into from
Jul 31, 2024
Merged

Fix CPU Adam JIT compilation #5780

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9207613
Fix CPU Adam JIT compilation
lekurile Jul 18, 2024
a543e3b
Remove prints
lekurile Jul 18, 2024
e0784c8
Fix formatting
lekurile Jul 18, 2024
6787e36
Merge branch 'master' into lekurile/fix_cpu_adam_jit
lekurile Jul 22, 2024
3cc77bd
Merge branch 'master' into lekurile/fix_cpu_adam_jit
lekurile Jul 23, 2024
404c4e4
Merge branch 'master' into lekurile/fix_cpu_adam_jit
loadams Jul 31, 2024
01f049f
Merge branch 'master' into lekurile/fix_cpu_adam_jit
loadams Jul 31, 2024
b5ca69c
Merge branch 'master' into lekurile/fix_cpu_adam_jit
loadams Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions op_builder/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,25 +772,32 @@ def libraries_args(self):

class TorchCPUOpBuilder(CUDAOpBuilder):

def get_cuda_lib64_path(self):
import torch
if not self.is_rocm_pytorch():
CUDA_LIB64 = os.path.join(torch.utils.cpp_extension.CUDA_HOME, "lib64")
if not os.path.exists(CUDA_LIB64):
CUDA_LIB64 = os.path.join(torch.utils.cpp_extension.CUDA_HOME, "lib")
else:
CUDA_LIB64 = os.path.join(torch.utils.cpp_extension.ROCM_HOME, "lib")
return CUDA_LIB64

def extra_ldflags(self):
if self.build_for_cpu:
return ['-fopenmp']

if not self.is_rocm_pytorch():
return ['-lcurand']
ld_flags = ['-lcurand']
if not self.build_for_cpu:
ld_flags.append(f'-L{self.get_cuda_lib64_path()}')
loadams marked this conversation as resolved.
Show resolved Hide resolved
return ld_flags

return []

def cxx_args(self):
import torch
args = []
if not self.build_for_cpu:
if not self.is_rocm_pytorch():
CUDA_LIB64 = os.path.join(torch.utils.cpp_extension.CUDA_HOME, "lib64")
if not os.path.exists(CUDA_LIB64):
CUDA_LIB64 = os.path.join(torch.utils.cpp_extension.CUDA_HOME, "lib")
else:
CUDA_LIB64 = os.path.join(torch.utils.cpp_extension.ROCM_HOME, "lib")
CUDA_LIB64 = self.get_cuda_lib64_path()

args += super().cxx_args()
args += [
Expand Down
Loading