Skip to content

Commit 67128aa

Browse files
committed
Merge branch 'upgrade_bazel_version' of https://github.com/NVIDIA/TRTorch into upgrade_bazel_version
2 parents f60a815 + 66c08d2 commit 67128aa

File tree

1 file changed

+10
-21
lines changed

1 file changed

+10
-21
lines changed

.circleci/config.yml

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ version: 2.1
44

55
commands:
66
install-bazel:
7-
description: "Install bazel"
7+
description: "Install bazelisk"
88
parameters:
99
platform:
1010
type: string
11-
default: "x86_64"
11+
default: "amd64"
1212
version:
1313
type: string
14-
default: "6.2.1"
14+
default: "v1.17.0"
1515
steps:
1616
- run:
17-
name: Install bazel
17+
name: Install bazelisk
1818
command: |
19-
sudo wget -q https://github.com/bazelbuild/bazel/releases/download/<< parameters.version >>/bazel-<< parameters.version >>-linux-<< parameters.platform >> -O /usr/bin/bazel
19+
sudo wget -q https://github.com/bazelbuild/bazelisk/releases/download/<< parameters.version >>/bazelisk-linux-<< parameters.platform >> -O /usr/bin/bazel
2020
sudo chmod a+x /usr/bin/bazel
2121
2222
install-cmake:
@@ -207,12 +207,9 @@ commands:
207207
trt-version-long:
208208
type: string
209209
default: "8.6.1.6-1"
210-
bazel-version:
211-
type: string
212-
default: "6.2.1"
213210
bazel-platform:
214211
type: string
215-
default: "x86_64"
212+
default: "amd64"
216213
steps:
217214
- install-cudnn:
218215
os: << parameters.os >>
@@ -229,7 +226,6 @@ commands:
229226
sudo apt-get install libnvinfer8=<< parameters.trt-version-long >>+<< parameters.cuda-string-version >> libnvinfer-plugin8=<< parameters.trt-version-long>>+<< parameters.cuda-string-version >> libnvinfer-dev=<< parameters.trt-version-long >>+<< parameters.cuda-string-version >> libnvinfer-plugin-dev=<< parameters.trt-version-long>>+<< parameters.cuda-string-version >> libnvinfer-headers-dev=<< parameters.trt-version-long>>+<< parameters.cuda-string-version >> libnvinfer-headers-plugin-dev=<< parameters.trt-version-long>>+<< parameters.cuda-string-version >>
230227
- install-bazel:
231228
platform: << parameters.bazel-platform >>
232-
version: << parameters.bazel-version >>
233229

234230
setup-py-version:
235231
description: "Set python version"
@@ -830,8 +826,7 @@ jobs:
830826
platform: "x86_64"
831827
cudnn-version: << pipeline.parameters.cudnn-version >>
832828
trt-version-short: << pipeline.parameters.trt-version-short >>
833-
bazel-version: << pipeline.parameters.bazel-version >>
834-
bazel-platform: "x86_64"
829+
bazel-platform: "amd64"
835830
- install-torch-from-index:
836831
torch-build: << parameters.torch-build >>
837832
torchvision-build: << parameters.torchvision-build >>
@@ -893,8 +888,7 @@ jobs:
893888
platform: "x86_64"
894889
cudnn-version: << parameters.cudnn-version >>
895890
trt-version-short: << parameters.trt-version-short >>
896-
bazel-version: << pipeline.parameters.bazel-version >>
897-
bazel-platform: "x86_64"
891+
bazel-platform: "amd64"
898892
- create-py-env:
899893
trt-version-long: << parameters.trt-version-long >>
900894
- install-torch-from-index:
@@ -1128,8 +1122,7 @@ jobs:
11281122
platform: "x86_64"
11291123
cudnn-version: << pipeline.parameters.cudnn-version >>
11301124
trt-version-short: << pipeline.parameters.trt-version-short >>
1131-
bazel-version: << pipeline.parameters.bazel-version >>
1132-
bazel-platform: "x86_64"
1125+
bazel-platform: "amd64"
11331126
- install-torch-from-index:
11341127
torch-build: << parameters.torch-build >>
11351128
torch-build-index: << parameters.torch-build-index >>
@@ -1200,7 +1193,6 @@ jobs:
12001193
architecture: "arm64"
12011194
cudnn-version: << pipeline.parameters.cudnn-jetson-version >>
12021195
trt-version-short: << pipeline.parameters.trt-jetson-version-short >>
1203-
bazel-version: << pipeline.parameters.bazel-version >>
12041196
bazel-platform: "arm64"
12051197
- run:
12061198
name: Set python version
@@ -1263,7 +1255,7 @@ jobs:
12631255
platform: "x86_64"
12641256
cudnn-version: << parameters.cudnn-version >>
12651257
trt-version-short: << parameters.trt-version-short >>
1266-
bazel-platform: "x86_64"
1258+
bazel-platform: "amd64"
12671259
- install-cmake:
12681260
version: 3.24.1
12691261
- install-torch-from-index:
@@ -1342,9 +1334,6 @@ jobs:
13421334
command: echo -e "Packaging stage not enabled"
13431335

13441336
parameters:
1345-
bazel-version:
1346-
type: string
1347-
default: "6.2.1"
13481337
python-version:
13491338
type: string
13501339
default: "3.9.4"

0 commit comments

Comments
 (0)