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

Set default flags nvcc and do not set default compile flags for ROCM EP #19124

Merged
merged 5 commits into from
Jan 14, 2024
Merged

Set default flags nvcc and do not set default compile flags for ROCM EP #19124

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f9369e1
update
snnn Jan 12, 2024
0894b9d
update
snnn Jan 12, 2024
be8787e
update
snnn Jan 13, 2024
ac94265
update
snnn Jan 13, 2024
09caf6b
update
snnn Jan 13, 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
20 changes: 18 additions & 2 deletions tools/ci_build/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1474,15 +1474,18 @@ def generate_build_tree(
cflags = None
cxxflags = None
ldflags = None
cudaflags = []
for config in configs:
# Setup default values for cflags/cxxflags/ldflags.
# The values set here are purely for security and compliance purposes. ONNX Runtime should work fine without these flags.
if (
"CFLAGS" not in os.environ
and "CXXFLAGS" not in os.environ
and (not args.use_cuda or "CUDAFLAGS" not in os.environ)
and not args.ios
and not args.android
and not args.build_wasm
and not args.use_rocm
and not (is_linux() and platform.machine() != "aarch64" and platform.machine() != "x86_64")
):
if is_windows():
Expand Down Expand Up @@ -1515,9 +1518,19 @@ def generate_build_tree(
cxxflags = cflags.copy()
if not args.disable_exceptions:
cxxflags += ["/EHsc"]
if args.use_cuda:
# On Windows, nvcc passes /EHsc to the host compiler by default.
cuda_compile_flags_str = ""
for compile_flag in cflags:
if compile_flag.startswith("/D"):
cudaflags.append(compile_flag)
else:
cuda_compile_flags_str = cuda_compile_flags_str + " " + compile_flag
if len(cuda_compile_flags_str) != 0:
cudaflags.append('-Xcompiler="%s"' % cuda_compile_flags_str)
elif is_linux() or is_macOS():
if is_linux():
ldflags = ["-Wl,-Bsymbolic-functions", "-Wl,-z,relro", "-Wl,-z,now"]
ldflags = ["-Wl,-Bsymbolic-functions", "-Wl,-z,relro", "-Wl,-z,now", "-Wl,-z,noexecstack"]
else:
ldflags = []
if config == "Release":
Expand Down Expand Up @@ -1560,7 +1573,8 @@ def generate_build_tree(
# The following flags needs GCC 8 and newer
cflags += ["-fstack-clash-protection", "-fcf-protection"]
cxxflags = cflags.copy()

if args.use_cuda:
cudaflags = cflags.copy()
config_build_dir = get_config_build_dir(build_dir, config)
os.makedirs(config_build_dir, exist_ok=True)
if args.use_tvm:
Expand All @@ -1580,6 +1594,8 @@ def generate_build_tree(
"-DCMAKE_C_FLAGS=%s" % (" ".join(cflags)),
"-DCMAKE_CXX_FLAGS=%s" % (" ".join(cxxflags)),
]
if cudaflags is not None and len(cudaflags) != 0:
temp_cmake_args += ["-DCMAKE_CUDA_FLAGS_INIT=%s" % (" ".join(cudaflags))]
if ldflags is not None and len(ldflags) != 0:
temp_cmake_args += [
"-DCMAKE_EXE_LINKER_FLAGS_INIT=%s" % (" ".join(ldflags)),
Expand Down
Loading