Skip to content

Commit 7284ef4

Browse files
narendasannarendasan
committed
chore: update CI for new build path
Signed-off-by: Naren Dasan <[email protected]> Signed-off-by: Naren Dasan <[email protected]> Adding no deps flag
1 parent 82b5c79 commit 7284ef4

File tree

8 files changed

+170
-100
lines changed

8 files changed

+170
-100
lines changed

‎.circleci/config.yml‎

Lines changed: 109 additions & 64 deletions
Large diffs are not rendered by default.

‎py/ci/build_whl.sh‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,6 @@ patch_wheel() {
1818
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$1/torch/lib:$1/tensorrt/:${CUDA_HOME}/lib64:${CUDA_HOME}/lib64/stubs $2/bin/python -m auditwheel repair $(cat ${PROJECT_DIR}/py/ci/soname_excludes.params) --plat manylinux_2_34_x86_64 dist/torch_tensorrt-*-$3-linux_x86_64.whl
1919
}
2020

21-
py37() {
22-
cd /workspace/project
23-
PY_BUILD_CODE=cp37-cp37m
24-
PY_VERSION=3.7
25-
PY_NAME=python${PY_VERSION}
26-
PY_DIR=/opt/python/${PY_BUILD_CODE}
27-
PY_PKG_DIR=${PY_DIR}/lib/${PY_NAME}/site-packages/
28-
build_wheel ${PY_DIR}
29-
patch_wheel ${PY_PKG_DIR} ${PY_DIR} ${PY_BUILD_CODE}
30-
}
31-
3221
py38() {
3322
cd /workspace/project
3423
PY_BUILD_CODE=cp38-cp38
@@ -92,8 +81,10 @@ libtorchtrt() {
9281
PY_NAME=python${PY_VERSION}
9382
PY_DIR=/opt/python/${PY_BUILD_CODE}
9483
PY_PKG_DIR=${PY_DIR}/lib/${PY_NAME}/site-packages/
95-
build_wheel ${PY_DIR}
96-
patch_wheel ${PY_PKG_DIR} ${PY_DIR} ${PY_BUILD_CODE}
84+
${PY_DIR}/bin/python -m pip install --upgrade pip
85+
${PY_DIR}/bin/python -m pip install -r py/requirements.txt
86+
${PY_DIR}/bin/python -m pip install setuptools wheel auditwheel
87+
bazel build //:libtorchtrt --platforms //toolchains:ci_rhel_x86_64_linux -c opt --noshow_progress
9788
CUDA_VERSION=$(cd ${PROJECT_DIR}/py && ${PY_DIR}/bin/python3 -c "import versions; versions.cuda_version()")
9889
TORCHTRT_VERSION=$(cd ${PROJECT_DIR}/py && ${PY_DIR}/bin/python3 -c "import versions; versions.torch_tensorrt_version()")
9990
TRT_VERSION=$(cd ${PROJECT_DIR}/py && ${PY_DIR}/bin/python3 -c "import versions; versions.tensorrt_version()")
@@ -110,8 +101,10 @@ libtorchtrt_pre_cxx11_abi() {
110101
PY_NAME=python${PY_VERSION}
111102
PY_DIR=/opt/python/${PY_BUILD_CODE}
112103
PY_PKG_DIR=${PY_DIR}/lib/${PY_NAME}/site-packages/
113-
build_wheel ${PY_DIR}
114-
patch_wheel ${PY_PKG_DIR} ${PY_DIR} ${PY_BUILD_CODE}
104+
${PY_DIR}/bin/python -m pip install --upgrade pip
105+
${PY_DIR}/bin/python -m pip install -r py/requirements.txt
106+
${PY_DIR}/bin/python -m pip install setuptools wheel auditwheel
107+
bazel build //:libtorchtrt --config pre_cxx11_abi --platforms //toolchains:ci_rhel_x86_64_linux -c opt --noshow_progress
115108
CUDA_VERSION=$(cd ${PROJECT_DIR}/py && ${PY_DIR}/bin/python3 -c "import versions; versions.cuda_version()")
116109
TORCHTRT_VERSION=$(cd ${PROJECT_DIR}/py && ${PY_DIR}/bin/python3 -c "import versions; versions.torch_tensorrt_version()")
117110
TRT_VERSION=$(cd ${PROJECT_DIR}/py && ${PY_DIR}/bin/python3 -c "import versions; versions.tensorrt_version()")

‎pyproject.toml‎

Lines changed: 44 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
[build-system]
22
requires = [
3-
"setuptools",
4-
"packaging",
5-
"wheel",
6-
"numpy",
7-
"ninja",
8-
"pyyaml",
9-
"setuptools",
10-
"cffi",
11-
"typing_extensions",
12-
"future",
3+
"setuptools==68.0.0",
4+
"packaging>=23.1",
5+
"wheel>=0.40.0",
6+
"numpy>=1.25.0",
7+
"ninja>=1.11.0",
8+
"pyyaml>=6.0",
9+
"cffi>=1.15.1",
10+
"typing_extensions>=4.7.0",
11+
"future>=0.18.3",
1312
"tensorrt>=8.6,<8.7",
1413
#"torch >=2.0.0,<2.1.0",
1514
"torch==2.1.0.dev20230619+cu121",
@@ -43,10 +42,11 @@ readme = {file = "py/README.md", content-type = "text/markdown"}
4342
requires-python = ">=3.8"
4443
keywords = ["pytorch", "torch", "tensorrt", "trt", "ai", "artificial intelligence", "ml", "machine learning", "dl", "deep learning", "compiler", "dynamo", "torchscript", "inference"]
4544
dependencies = [
46-
"torch>=2.0.0,<2.1.0",
45+
#"torch>=2.0.0,<2.1.0",
46+
"torch==2.1.0.dev20230619+cu121",
4747
"tensorrt>=8.6,<8.7",
4848
"packaging>=23",
49-
"numpy>=1.24,<1.25",
49+
"numpy>=1.25.0",
5050
]
5151
dynamic = ["version"]
5252

@@ -75,6 +75,38 @@ no_implicit_optional = true
7575

7676
[tool.setuptools]
7777
package-dir = {"" = "py"}
78+
include-package-data = true
79+
80+
[tool.setuptools.package-data]
81+
torch_tensorrt = [
82+
"BUILD",
83+
"WORKSPACE",
84+
"include/torch_tensorrt/*.h",
85+
"include/torch_tensorrt/core/*.h",
86+
"include/torch_tensorrt/core/conversion/*.h",
87+
"include/torch_tensorrt/core/conversion/conversionctx/*.h",
88+
"include/torch_tensorrt/core/conversion/converters/*.h",
89+
"include/torch_tensorrt/core/conversion/evaluators/*.h",
90+
"include/torch_tensorrt/core/conversion/tensorcontainer/*.h",
91+
"include/torch_tensorrt/core/conversion/var/*.h",
92+
"include/torch_tensorrt/core/ir/*.h",
93+
"include/torch_tensorrt/core/lowering/*.h",
94+
"include/torch_tensorrt/core/lowering/passes/*.h",
95+
"include/torch_tensorrt/core/partitioning/*.h",
96+
"include/torch_tensorrt/core/partitioning/segmentedblock/*.h",
97+
"include/torch_tensorrt/core/partitioning/partitioninginfo/*.h",
98+
"include/torch_tensorrt/core/partitioning/partitioningctx/*.h",
99+
"include/torch_tensorrt/core/plugins/*.h",
100+
"include/torch_tensorrt/core/plugins/impl/*.h",
101+
"include/torch_tensorrt/core/runtime/*.h",
102+
"include/torch_tensorrt/core/util/*.h",
103+
"include/torch_tensorrt/core/util/logging/*.h",
104+
"bin/*",
105+
"lib/*"
106+
]
107+
108+
[tool.setuptools.exclude-package-data]
109+
torch_tensorrt = ["csrc/*"]
78110

79111
[tool.setuptools.packages.find]
80112
where = ["py"]

‎toolchains/ci_workspaces/WORKSPACE.sbsa‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ http_archive(
3636
# External dependency for torch_tensorrt if you already have precompiled binaries.
3737
local_repository(
3838
name = "torch_tensorrt",
39-
path = "/opt/circleci/.pyenv/versions/3.8.10/lib/python3.8/site-packages/torch_tensorrt"
39+
path = "/opt/circleci/.pyenv/versions/3.10.9/lib/python3.10/site-packages/torch_tensorrt"
4040
)
4141

4242
# CUDA should be installed on the system locally
@@ -64,13 +64,13 @@ new_local_repository(
6464

6565
new_local_repository(
6666
name = "libtorch",
67-
path = "/opt/circleci/.pyenv/versions/3.8.10/lib/python3.8/site-packages/torch",
67+
path = "/opt/circleci/.pyenv/versions/3.10.9/lib/python3.10/site-packages/torch",
6868
build_file = "third_party/libtorch/BUILD"
6969
)
7070

7171
new_local_repository(
7272
name = "libtorch_pre_cxx11_abi",
73-
path = "/opt/circleci/.pyenv/versions/3.8.10/lib/python3.8/site-packages/torch",
73+
path = "/opt/circleci/.pyenv/versions/3.10.9/lib/python3.10/site-packages/torch",
7474
build_file = "third_party/libtorch/BUILD"
7575
)
7676

‎toolchains/ci_workspaces/WORKSPACE.x86_64‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ http_archive(
3636
# External dependency for torch_tensorrt if you already have precompiled binaries.
3737
local_repository(
3838
name = "torch_tensorrt",
39-
path = "/opt/circleci/.pyenv/versions/3.9.4/lib/python3.9/site-packages/torch_tensorrt"
39+
path = "/opt/circleci/.pyenv/versions/3.10.9/lib/python3.10/site-packages/torch_tensorrt"
4040
)
4141

4242
# CUDA should be installed on the system locally
@@ -65,13 +65,13 @@ new_local_repository(
6565

6666
new_local_repository(
6767
name = "libtorch",
68-
path = "/opt/circleci/.pyenv/versions/3.9.4/lib/python3.9/site-packages/torch",
68+
path = "/opt/circleci/.pyenv/versions/3.10.9/lib/python3.10/site-packages/torch",
6969
build_file = "third_party/libtorch/BUILD"
7070
)
7171

7272
new_local_repository(
7373
name = "libtorch_pre_cxx11_abi",
74-
path = "/opt/circleci/.pyenv/versions/3.9.4/lib/python3.9/site-packages/torch",
74+
path = "/opt/circleci/.pyenv/versions/3.10.9/lib/python3.10/site-packages/torch",
7575
build_file = "third_party/libtorch/BUILD"
7676
)
7777

‎toolchains/ci_workspaces/WORKSPACE.x86_64.release.rhel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ http_archive(
3636
# External dependency for torch_tensorrt if you already have precompiled binaries.
3737
local_repository(
3838
name = "torch_tensorrt",
39-
path = "/opt/circleci/.pyenv/versions/3.9.4/lib/python3.9/site-packages/torch_tensorrt"
39+
path = "/opt/circleci/.pyenv/versions/3.10.9/lib/python3.10/site-packages/torch_tensorrt"
4040
)
4141

4242
# CUDA should be installed on the system locally

‎toolchains/ci_workspaces/WORKSPACE.x86_64.release.ubuntu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ http_archive(
3636
# External dependency for torch_tensorrt if you already have precompiled binaries.
3737
local_repository(
3838
name = "torch_tensorrt",
39-
path = "/opt/circleci/.pyenv/versions/3.9.4/lib/python3.9/site-packages/torch_tensorrt"
39+
path = "/opt/circleci/.pyenv/versions/3.10.9/lib/python3.10/site-packages/torch_tensorrt"
4040
)
4141

4242
# CUDA should be installed on the system locally

‎versions.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
__version__: "1.5.0.dev0"
2-
__cuda_version__: "11.8"
2+
__cuda_version__: "12.1"
33
__cudnn_version__: "8.8"
44
__tensorrt_version__: "8.6"

0 commit comments

Comments
 (0)