Skip to content

Commit 43f2352

Browse files
committed
update bazelrc
1 parent 2159e9c commit 43f2352

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

.bazelrc

+4-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ build:windows --cxxopt="/GS-" --cxxopt="/std:c++17" --cxxopt="/permissive-"
3030
build:windows --cxxopt="/wd4244" --cxxopt="/wd4267" --cxxopt="/wd4819"
3131
build:windows --features=windows_export_all_symbols
3232

33-
build:python --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"
34-
build:python --linkopt="-D_GLIBCXX_USE_CXX11_ABI=0"
35-
build:python --define=abi=pre_cxx11_abi
33+
build --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=1"
34+
build --linkopt="-D_GLIBCXX_USE_CXX11_ABI=1"
35+
build --define=abi=cxx11_abi
36+
3637
build:python --define=target_lang=python
3738

3839
build:pre_cxx11_abi --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"

setup.py

+17-7
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,12 @@ def load_dep_info():
181181
sys.exit("Could not find bazel in PATH")
182182

183183

184-
def build_libtorchtrt_pre_cxx11_abi(
185-
develop=True, use_dist_dir=True, pre_cxx11_abi=True, rt_only=False
184+
def build_libtorchtrt_cxx11_abi(
185+
develop=True,
186+
use_dist_dir=True,
187+
pre_cxx11_abi=False,
188+
rt_only=False,
189+
target_python=True,
186190
):
187191
cmd = [BAZEL_EXE, "build"]
188192
if rt_only:
@@ -196,9 +200,15 @@ def build_libtorchtrt_pre_cxx11_abi(
196200
cmd.append("--compilation_mode=opt")
197201
if use_dist_dir:
198202
cmd.append("--distdir=third_party/dist_dir/x86_64-linux-gnu")
199-
if pre_cxx11_abi:
203+
204+
if target_python:
200205
cmd.append("--config=python")
206+
207+
if pre_cxx11_abi:
208+
cmd.append("--config=pre_cxx11_abi")
209+
print("using PRE CXX11 ABI build")
201210
else:
211+
cmd.append("--config=cxx11_abi")
202212
print("using CXX11 ABI build")
203213

204214
if IS_WINDOWS:
@@ -293,7 +303,7 @@ def run(self):
293303

294304
if not PY_ONLY:
295305
global PRE_CXX11_ABI
296-
build_libtorchtrt_pre_cxx11_abi(
306+
build_libtorchtrt_cxx11_abi(
297307
develop=True, pre_cxx11_abi=PRE_CXX11_ABI, rt_only=NO_TS
298308
)
299309
copy_libtorchtrt(rt_only=NO_TS)
@@ -317,7 +327,7 @@ def run(self):
317327

318328
if not PY_ONLY:
319329
global PRE_CXX11_ABI
320-
build_libtorchtrt_pre_cxx11_abi(
330+
build_libtorchtrt_cxx11_abi(
321331
develop=False, pre_cxx11_abi=PRE_CXX11_ABI, rt_only=NO_TS
322332
)
323333
copy_libtorchtrt(rt_only=NO_TS)
@@ -340,7 +350,7 @@ def finalize_options(self):
340350
def run(self):
341351
if not PY_ONLY:
342352
global PRE_CXX11_ABI
343-
build_libtorchtrt_pre_cxx11_abi(
353+
build_libtorchtrt_cxx11_abi(
344354
develop=False, pre_cxx11_abi=PRE_CXX11_ABI, rt_only=NO_TS
345355
)
346356
copy_libtorchtrt(rt_only=NO_TS)
@@ -366,7 +376,7 @@ def run(self):
366376
editable_wheel.run(self)
367377
else:
368378
global PRE_CXX11_ABI
369-
build_libtorchtrt_pre_cxx11_abi(
379+
build_libtorchtrt_cxx11_abi(
370380
develop=True, pre_cxx11_abi=PRE_CXX11_ABI, rt_only=NO_TS
371381
)
372382
gen_version_file()

0 commit comments

Comments
 (0)