Skip to content

Add DPADDLE_WITH_CUDA for GCC #35448

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

Merged
merged 2 commits into from
Sep 7, 2021
Merged

Add DPADDLE_WITH_CUDA for GCC #35448

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3beefe
Add DPADDLE_WITH_CUDA for GCC
Aurelius84 Sep 3, 2021
09db77b
polish code
Aurelius84 Sep 6, 2021
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
10 changes: 10 additions & 0 deletions python/paddle/utils/cpp_extension/cpp_extension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,8 @@ def __init__(self, *args, **kwargs):
super(BuildExtension, self).__init__(*args, **kwargs)
self.no_python_abi_suffix = kwargs.get("no_python_abi_suffix", True)
self.output_dir = kwargs.get("output_dir", None)
# whether containing cuda source file in Extensions
self.contain_cuda_file = False

def initialize_options(self):
super(BuildExtension, self).initialize_options()
Expand Down Expand Up @@ -432,6 +434,9 @@ def unix_custom_single_compiler(obj, src, ext, cc_args, extra_postargs,
# shared library have same ABI suffix with core_(no)avx.so.
# See https://stackoverflow.com/questions/34571583/understanding-gcc-5s-glibcxx-use-cxx11-abi-or-the-new-abi
add_compile_flag(['-D_GLIBCXX_USE_CXX11_ABI=1'], cflags)
# Append this macor only when jointly compiling .cc with .cu
if not is_cuda_file(src) and self.contain_cuda_file:
cflags.append('-DPADDLE_WITH_CUDA')

add_std_without_repeat(
cflags, self.compiler.compiler_type, use_std14=True)
Expand Down Expand Up @@ -506,6 +511,9 @@ def win_custom_spawn(cmd):
elif isinstance(self.cflags, list):
cflags = MSVC_COMPILE_FLAGS + self.cflags
cmd += cflags
# Append this macor only when jointly compiling .cc with .cu
if not is_cuda_file(src) and self.contain_cuda_file:
cmd.append('-DPADDLE_WITH_CUDA')

return original_spawn(cmd)

Expand Down Expand Up @@ -633,6 +641,8 @@ def _record_op_info(self):

for i, extension in enumerate(self.extensions):
sources = [os.path.abspath(s) for s in extension.sources]
if not self.contain_cuda_file:
self.contain_cuda_file = any([is_cuda_file(s) for s in sources])
op_names = parse_op_name_from(sources)

for op_name in op_names:
Expand Down