Skip to content

Commit 9aecfba

Browse files
committed
Adding no deps flag
1 parent 1751a7b commit 9aecfba

File tree

6 files changed

+38
-41
lines changed

6 files changed

+38
-41
lines changed

.circleci/config.yml

+18-18
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ commands:
232232
parameters:
233233
python-version:
234234
type: string
235-
default: "3.9.4"
235+
default: "3.10.9"
236236
steps:
237237
- run:
238238
name: Set python version
@@ -295,8 +295,8 @@ commands:
295295
command: |
296296
export CUDA_HOME=/usr/local/cuda-<< parameters.cuda-version >>/
297297
mv toolchains/ci_workspaces/WORKSPACE.<< parameters.platform >> WORKSPACE
298-
python3 -m pip install pip==21.3.1
299-
python3 -m pip wheel --verbose --pre . --extra-index-url << parameters.torch-build-index >> -w dist
298+
python3 -m pip install pip==22.0.2
299+
python3 -m pip wheel --no-deps --verbose --pre . --extra-index-url << parameters.torch-build-index >> -w dist
300300
python3 -m pip install dist/torch_tensorrt*
301301
mkdir -p /tmp/dist/builds
302302
cp dist/torch_tensorrt* /tmp/dist/builds
@@ -317,8 +317,8 @@ commands:
317317
command: |
318318
export CUDA_HOME=/usr/local/cuda-<< parameters.cuda-version >>/
319319
mv toolchains/ci_workspaces/WORKSPACE.<< parameters.platform >> WORKSPACE
320-
python3 -m pip install pip==21.3.1
321-
python3 -m pip wheel --verbose --pre . --extra-index-url << parameters.torch-build-index >> --config-setting="--build-option=--legacy" -w dist
320+
python3 -m pip install pip==22.0.2
321+
python3 -m pip wheel --no-deps --verbose --pre . --extra-index-url << parameters.torch-build-index >> --config-setting="--build-option=--legacy" -w dist
322322
python3 -m pip install dist/torch_tensorrt*
323323
mkdir -p /tmp/dist/builds
324324
cp dist/torch_tensorrt* /tmp/dist/builds
@@ -348,8 +348,8 @@ commands:
348348
name: Build torch-tensorrt python release package
349349
command: |
350350
export CUDA_HOME=/usr/local/cuda-<< parameters.cuda-version >>/
351-
python3 -m pip install pip==21.3.1
352-
python3 -m pip wheel --verbose --pre . --extra-index-url << parameters.torch-build-index >> --config-setting="--build-option=--release" --config-setting="--build-option=--use-cxx11-abi" -w dist
351+
python3 -m pip install pip==22.0.2
352+
python3 -m pip wheel --no-deps --verbose --pre . --extra-index-url << parameters.torch-build-index >> --config-setting="--build-option=--release" --config-setting="--build-option=--use-cxx11-abi" -w dist
353353
python3 -m pip install dist/torch_tensorrt*
354354
mkdir -p /tmp/dist/builds
355355
cp dist/torch_tensorrt* /tmp/dist/builds
@@ -360,8 +360,8 @@ commands:
360360
name: Build torch-tensorrt python package
361361
command: |
362362
export CUDA_HOME=/usr/local/cuda-<< parameters.cuda-version >>/
363-
python3 -m pip install pip==21.3.1
364-
python3 -m pip wheel --verbose --pre . --extra-index-url << parameters.torch-build-index >> --config-setting="--build-option=--use-cxx11-abi" -w dist
363+
python3 -m pip install pip==22.0.2
364+
python3 -m pip wheel --no-deps --verbose --pre . --extra-index-url << parameters.torch-build-index >> --config-setting="--build-option=--use-cxx11-abi" -w dist
365365
python3 -m pip install dist/torch_tensorrt*
366366
mkdir -p /tmp/dist/builds
367367
cp dist/torch_tensorrt* /tmp/dist/builds
@@ -383,8 +383,8 @@ commands:
383383
command: |
384384
export CUDA_HOME=/usr/local/cuda-<< parameters.cuda-version >>/
385385
mv toolchains/ci_workspaces/WORKSPACE.<< parameters.platform >> WORKSPACE
386-
python3 -m pip install pip==21.3.1
387-
python3 -m pip wheel --verbose --pre . --extra-index-url << parameters.torch-build-index >> --config-setting="--build-option=--fx-only" -w dist
386+
python3 -m pip install pip==22.0.2
387+
python3 -m pip wheel --no-deps --verbose --pre . --extra-index-url << parameters.torch-build-index >> --config-setting="--build-option=--fx-only" -w dist
388388
python3 -m pip install dist/torch_tensorrt*
389389
mkdir -p /tmp/dist/builds
390390
cp dist/torch_tensorrt* /tmp/dist/builds
@@ -425,14 +425,14 @@ commands:
425425
- run:
426426
name: Build torch-tensorrt release build for NGC
427427
command: |
428-
docker exec ngc_build_container bash -c "cd /workspace/ && python3 -m pip wheel --verbose --pre . --config-setting="--build-option=--release" --config-setting="--build-option=--use-cxx11-abi" -w dist"
428+
docker exec ngc_build_container bash -c "cd /workspace/ && python3 -m pip wheel --no-deps --verbose --pre . --config-setting="--build-option=--release" --config-setting="--build-option=--use-cxx11-abi" -w dist"
429429
- unless:
430430
condition: << parameters.release >>
431431
steps:
432432
- run:
433433
name: Build torch-tensorrt debug build for NGC
434434
command: |
435-
docker exec ngc_build_container bash -c "cd /workspace/py && python3 -m pip wheel --verbose --pre . --config-setting="--build-option=--use-cxx11-abi" -w dist"
435+
docker exec ngc_build_container bash -c "cd /workspace/py && python3 -m pip wheel --no-deps --verbose --pre . --config-setting="--build-option=--use-cxx11-abi" -w dist"
436436
- run:
437437
name: Collect builds
438438
command: |
@@ -453,7 +453,7 @@ commands:
453453
export PATH=$PATH:/usr/local/cuda-11.8/bin
454454
~/cmake/bin/cmake -S. -Bbuild \
455455
-DCMAKE_MODULE_PATH=cmake/Module \
456-
-DTorch_DIR=/opt/circleci/.pyenv/versions/3.9.4/lib/python3.9/site-packages/torch/share/cmake/Torch \
456+
-DTorch_DIR=/opt/circleci/.pyenv/versions/3.10.9/lib/python3.10/site-packages/torch/share/cmake/Torch \
457457
-DTensorRT_ROOT=/usr \
458458
-DCMAKE_BUILD_TYPE=Debug
459459
cmake --build build -- -j12
@@ -502,7 +502,7 @@ commands:
502502
name: Run core / C++ tests
503503
no_output_timeout: 15m
504504
environment:
505-
LD_LIBRARY_PATH: "/opt/circleci/.pyenv/versions/3.9.4/lib/python3.9/site-packages/torch_tensorrt.libs:/home/circleci/project/bazel-project/external/libtorch_pre_cxx11_abi/lib/:/home/circleci/project/bazel-project/external/tensorrt/lib/:/usr/local/cuda-11.8/lib64/:$LD_LIBRARY_PATH"
505+
LD_LIBRARY_PATH: "/opt/circleci/.pyenv/versions/3.10.9/lib/python3.10/site-packages/torch_tensorrt.libs:/home/circleci/project/bazel-project/external/libtorch_pre_cxx11_abi/lib/:/home/circleci/project/bazel-project/external/tensorrt/lib/:/usr/local/cuda-11.8/lib64/:$LD_LIBRARY_PATH"
506506
command: |
507507
set -e
508508
mv toolchains/ci_workspaces/WORKSPACE.<< parameters.platform >> WORKSPACE
@@ -531,7 +531,7 @@ commands:
531531
name: Run L0 torch-tensorrt python tests
532532
environment:
533533
USE_HOST_DEPS: "1"
534-
PYT_PATH: "/opt/circleci/.pyenv/versions/3.9.4/lib/python3.9/site-packages/"
534+
PYT_PATH: "/opt/circleci/.pyenv/versions/3.10.9/lib/python3.10/site-packages/"
535535
LD_LIBRARY_PATH: "/usr/lib/x86_64-linux-gnu/:/usr/local/cuda-11.8/lib64/:$LD_LIBRARY_PATH"
536536
command: |
537537
set -e
@@ -1155,7 +1155,7 @@ jobs:
11551155
TRT_VERSION=$(python3 -c "from versions import __tensorrt_version__;print(__tensorrt_version__)")
11561156
CUDNN_VERSION=$(python3 -c "from versions import __cudnn_version__;print(__cudnn_version__)")
11571157
TORCH_VERSION=$(python3 -c "from torch import __version__;print(__version__.split('+')[0])")
1158-
python3 -m pip install pip==21.3.1
1158+
python3 -m pip install pip==22.0.2
11591159
python3 -m pip install -r ~/project/py/requirements.txt
11601160
TORCH_VERSION=$(python3 -c "from torch import __version__;print(__version__.split('+')[0])")
11611161
mkdir -p ~/project/py/dist/
@@ -1351,7 +1351,7 @@ jobs:
13511351
parameters:
13521352
python-version:
13531353
type: string
1354-
default: "3.9.4"
1354+
default: "3.10.9"
13551355

13561356
cuda-version:
13571357
type: string

pyproject.toml

+12-15
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.dev20230605+cu118",
@@ -81,8 +80,6 @@ include-package-data = true
8180
torch_tensorrt = [
8281
"BUILD",
8382
"WORKSPACE",
84-
]
85-
"torch_tensorrt.include" = [
8683
"include/torch_tensorrt/*.h",
8784
"include/torch_tensorrt/core/*.h",
8885
"include/torch_tensorrt/core/conversion/*.h",
@@ -103,12 +100,12 @@ torch_tensorrt = [
103100
"include/torch_tensorrt/core/runtime/*.h",
104101
"include/torch_tensorrt/core/util/*.h",
105102
"include/torch_tensorrt/core/util/logging/*.h",
103+
"bin/*",
104+
"lib/*"
106105
]
107-
"torch_tensorrt.lib" = ["*"]
108-
"torch_tensorrt.bin" = ["*"]
109106

110107
[tool.setuptools.exclude-package-data]
111-
torch_tensorrt = ["csrc/"]
108+
torch_tensorrt = ["csrc/*"]
112109

113110
[tool.setuptools.packages.find]
114111
where = ["py"]

toolchains/ci_workspaces/WORKSPACE.sbsa

+3-3
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

+3-3
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

+1-1
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

+1-1
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

0 commit comments

Comments
 (0)