8000 Merge branch 'upstream-main' into liangan1/flex_attention · pytorch/pytorch@f6b827b · GitHub
[go: up one dir, main page]
Skip to content

Commit f6b827b

Browse files
hoshibarahoshibara
committed
Merge branch 'upstream-main' into liangan1/flex_attention
2 parents e4bc4b9 + 2ea8653 commit f6b827b

File tree

144 files changed

+3832
-1539
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+3832
-1539
lines changed
< 6851 div class="d-flex gap-2 flex-items-center">

‎.ci/docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ See `build.sh` for valid build environments (it's the giant switch).
3434
./build.sh pytorch-linux-bionic-py3.8-gcc9 -t myimage:latest
3535

3636
# Set flags (see build.sh) and build image
37-
sudo bash -c 'PROTOBUF=1 ./build.sh pytorch-linux-bionic-py3.8-gcc9 -t myimage:latest
37+
sudo bash -c 'TRITON=1 ./build.sh pytorch-linux-bionic-py3.8-gcc9 -t myimage:latest
3838
```

‎.ci/docker/build.sh

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ case "$image" in
104104
CUDNN_VERSION=9
105105
ANACONDA_PYTHON_VERSION=3.10
106106
GCC_VERSION=11
107-
PROTOBUF=yes
108107
VISION=yes
109108
KATEX=yes
110109
UCX_COMMIT=${_UCX_COMMIT}
@@ -117,7 +116,6 @@ case "$image" in
117116
CUDNN_VERSION=9
118117
ANACONDA_PYTHON_VERSION=3.10
119118
GCC_VERSION=9
120-
PROTOBUF=yes
121119
VISION=yes
122120
KATEX=yes
123121
UCX_COMMIT=${_UCX_COMMIT}
@@ -131,7 +129,6 @@ case "$image" in
131129
CUDNN_VERSION=9
132130
ANACONDA_PYTHON_VERSION=3.12
133131
GCC_VERSION=9
134-
PROTOBUF=yes
135132
VISION=yes
136133
KATEX=yes
137134
UCX_COMMIT=${_UCX_COMMIT}
@@ -145,7 +142,6 @@ case "$image" in
145142
CUDNN_VERSION=9
146143
ANACONDA_PYTHON_VERSION=3.13
147144
GCC_VERSION=9
148-
PROTOBUF=yes
149145
VISION=yes
150146
KATEX=yes
151147
UCX_COMMIT=${_UCX_COMMIT}
@@ -159,7 +155,6 @@ case "$image" in
159155
CUDNN_VERSION=9
160156
ANACONDA_PYTHON_VERSION=3.10
161157
GCC_VERSION=9
162-
PROTOBUF=yes
163158
VISION=yes
164159
KATEX=yes
165160
UCX_COMMIT=${_UCX_COMMIT}
@@ -172,7 +167,6 @@ case "$image" in
172167
CUDNN_VERSION=9
173168
ANACONDA_PYTHON_VERSION=3.10
174169
GCC_VERSION=9
175-
PROTOBUF=yes
176170
VISION=yes
177171
KATEX=yes
178172
UCX_COMMIT=${_UCX_COMMIT}
@@ -186,7 +180,6 @@ case "$image" in
186180
CUDNN_VERSION=9
187181
ANACONDA_PYTHON_VERSION=3.12
188182
GCC_VERSION=9
189-
PROTOBUF=yes
190183
VISION=yes
191184
KATEX=yes
192185
UCX_COMMIT=${_UCX_COMMIT}
@@ -200,7 +193,6 @@ case "$image" in
200193
CUDNN_VERSION=9
201194
ANACONDA_PYTHON_VERSION=3.13
202195
GCC_VERSION=9
203-
PROTOBUF=yes
204196
VISION=yes
205197
KATEX=yes
206198
UCX_COMMIT=${_UCX_COMMIT}
@@ -214,7 +206,6 @@ case "$image" in
214206
CUDNN_VERSION=9
215207
ANACONDA_PYTHON_VERSION=3.10
216208
GCC_VERSION=9
217-
PROTOBUF=yes
218209
VISION=yes
219210
KATEX=yes
220211
UCX_COMMIT=${_UCX_COMMIT}
@@ -225,39 +216,34 @@ case "$image" in
225216
pytorch-linux-focal-py3-clang10-onnx)
226217
ANACONDA_PYTHON_VERSION=3.9
227218
CLANG_VERSION=10
228-
PROTOBUF=yes
229219
VISION=yes
230220
CONDA_CMAKE=yes
231221
ONNX=yes
232222
;;
233223
pytorch-linux-focal-py3.9-clang10)
234224
ANACONDA_PYTHON_VERSION=3.9
235225
CLANG_VERSION=10
236-
PROTOBUF=yes
237226
VISION=yes
238227
CONDA_CMAKE=yes
239228
TRITON=yes
240229
;;
241230
pytorch-linux-focal-py3.11-clang10)
242231
ANACONDA_PYTHON_VERSION=3.11
243232
CLANG_VERSION=10
244-
PROTOBUF=yes
245233
VISION=yes
246234
CONDA_CMAKE=yes
247235
TRITON=yes
248236
;;
249237
pytorch-linux-focal-py3.9-gcc9)
250238
ANACONDA_PYTHON_VERSION=3.9
251239
GCC_VERSION=9
252-
PROTOBUF=yes
253240
VISION=yes
254241
CONDA_CMAKE=yes
255242
TRITON=yes
256243
;;
257244
pytorch-linux-focal-rocm-n-1-py3)
258245
ANACONDA_PYTHON_VERSION=3.10
259246
GCC_VERSION=11
260-
PROTOBUF=yes
261247
VISION=yes
262248
ROCM_VERSION=6.2.4
263249
NINJA_VERSION=1.9.0
@@ -271,7 +257,6 @@ case "$image" in
271257
pytorch-linux-focal-rocm-n-py3)
272258
ANACONDA_PYTHON_VERSION=3.10
273259
GCC_VERSION=11
274-
PROTOBUF=yes
275260
VISION=yes
276261
ROCM_VERSION=6.3
277262
NINJA_VERSION=1.9.0
@@ -285,7 +270,6 @@ case "$image" in
285270
pytorch-linux-jammy-xpu-2024.0-py3)
286271
ANACONDA_PYTHON_VERSION=3.9
287272
GCC_VERSION=11
288-
PROTOBUF=yes
289273
VISION=yes
290274
XPU_VERSION=0.5
291275
NINJA_VERSION=1.9.0
@@ -295,7 +279,6 @@ case "$image" in
295279
pytorch-linux-jammy-xpu-2025.0-py3)
296280
ANACONDA_PYTHON_VERSION=3.9
297281
GCC_VERSION=11
298-
PROTOBUF=yes
299282
VISION=yes
300283
XPU_VERSION=2025.0
301284
NINJA_VERSION=1.9.0
@@ -305,7 +288,6 @@ case "$image" in
305288
pytorch-linux-jammy-py3.9-gcc11-inductor-benchmarks)
306289
ANACONDA_PYTHON_VERSION=3.9
307290
GCC_VERSION=11
308-
PROTOBUF=yes
309291
VISION=yes
310292
KATEX=yes
311293
CONDA_CMAKE=yes
@@ -318,14 +300,12 @@ case "$image" in
318300
CUDA_VERSION=11.8
319301
CUDNN_VERSION=9
320302
CLANG_VERSION=12
321-
PROTOBUF=yes
322303
VISION=yes
323304
TRITON=yes
324305
;;
325306
pytorch-linux-jammy-py3-clang12-asan)
326307
ANACONDA_PYTHON_VERSION=3.9
327308
CLANG_VERSION=12
328-
PROTOBUF=yes
329309
VISION=yes
330310
CONDA_CMAKE=yes
331311
TRITON=yes
@@ -345,7 +325,6 @@ case "$image" in
345325
pytorch-linux-jammy-py3.9-gcc11)
346326
ANACONDA_PYTHON_VERSION=3.9
347327
GCC_VERSION=11
348-
PROTOBUF=yes
349328
VISION=yes
350329
KATEX=yes
351330
CONDA_CMAKE=yes
@@ -390,7 +369,6 @@ case "$image" in
390369
ANACONDA_PYTHON_VERSION=3.10
391370
GCC_VERSION=11
392371
ACL=yes
393-
PROTOBUF=yes
394372
VISION=yes
395373
CONDA_CMAKE=yes
396374
# snadampal: skipping llvm src build install because the current version
@@ -401,7 +379,6 @@ case "$image" in
401379
ANACONDA_PYTHON_VERSION=3.10
402380
GCC_VERSION=11
403381
ACL=yes
404-
PROTOBUF=yes
405382
VISION=yes
406383
CONDA_CMAKE=yes
407384
# snadampal: skipping llvm src build install because the current version
@@ -411,7 +388,6 @@ case "$image" in
411388
;;
412389
*)
413390
# Catch-all for builds that are not hardcoded.
414-
PROTOBUF=yes
415391
VISION=yes
416392
echo "image '$image' did not match an existing build configuration"
417393
if [[ "$image" == *py* ]]; then
@@ -473,7 +449,6 @@ docker build \
473449
${no_cache_flag} \
474450
${progress_flag} \
475451
--build-arg "BUILD_ENVIRONMENT=${image}" \
476-
--build-arg "PROTOBUF=${PROTOBUF:-}" \
477452
--build-arg "LLVMDEV=${LLVMDEV:-}" \
478453
--build-arg "VISION=${VISION:-}" \
479454
--build-arg "UBUNTU_VERSION=${UBUNTU_VERSION}" \

‎.ci/docker/centos-rocm/Dockerfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,6 @@ COPY ./common/install_conda.sh install_conda.sh
4848
COPY ./common/common_utils.sh common_utils.sh
4949
RUN bash ./install_conda.sh && rm install_conda.sh common_utils.sh /opt/conda/requirements-ci.txt
5050

51-
# (optional) Install protobuf for ONNX
52-
ARG PROTOBUF
53-
COPY ./common/install_protobuf.sh install_protobuf.sh
54-
RUN if [ -n "${PROTOBUF}" ]; then bash ./install_protobuf.sh; fi
55-
RUN rm install_protobuf.sh
56-
ENV INSTALLED_PROTOBUF ${PROTOBUF}
57-
5851
# (optional) Install vision packages like OpenCV
5952
ARG VISION
6053
COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./

‎.ci/docker/common/install_base.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,6 @@ install_centos() {
9999

100100
ccache_deps="asciidoc docbook-dtds docbook-style-xsl libxslt"
101101
numpy_deps="gcc-gfortran"
102-
# Note: protobuf-c-{compiler,devel} on CentOS are too old to be used
103-
# for Caffe2. That said, we still install them to make sure the build
104-
# system opts to build/use protoc and libprotobuf from third-party.
105102
yum install -y \
106103
$ccache_deps \
107104
$numpy_deps \

‎.ci/docker/common/install_protobuf.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎.ci/docker/ubuntu-cuda/Dockerfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ ARG CLANG_VERSION
4343
COPY ./common/install_clang.sh install_clang.sh
4444
RUN bash ./install_clang.sh && rm install_clang.sh
4545

46-
# (optional) Install protobuf for ONNX
47-
ARG PROTOBUF
48-
COPY ./common/install_protobuf.sh install_protobuf.sh
49-
RUN if [ -n "${PROTOBUF}" ]; then bash ./install_protobuf.sh; fi
50-
RUN rm install_protobuf.sh
51-
ENV INSTALLED_PROTOBUF ${PROTOBUF}
52-
5346
# (optional) Install vision packages like OpenCV
5447
ARG VISION
5548
COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./

‎.ci/docker/ubuntu-rocm/Dockerfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ ARG CLANG_VERSION
4343
COPY ./common/install_clang.sh install_clang.sh
4444
RUN bash ./install_clang.sh && rm install_clang.sh
4545

46-
# (optional) Install protobuf for ONNX
47-
ARG PROTOBUF
48-
COPY ./common/install_protobuf.sh install_protobuf.sh
49-
RUN if [ -n "${PROTOBUF}" ]; then bash ./install_protobuf.sh; fi
50-
RUN rm install_protobuf.sh
51-
ENV INSTALLED_PROTOBUF ${PROTOBUF}
52-
5346
# (optional) Install vision packages like OpenCV
5447
ARG VISION
5548
COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./

‎.ci/docker/ubuntu/Dockerfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,6 @@ ADD ./common/install_ucc.sh install_ucc.sh
7474
RUN if [ -n "${UCX_COMMIT}" ] && [ -n "${UCC_COMMIT}" ]; then bash ./install_ucc.sh; fi
7575
RUN rm install_ucc.sh
7676

77-
# (optional) Install protobuf for ONNX
78-
ARG PROTOBUF
79-
COPY ./common/install_protobuf.sh install_protobuf.sh
80-
RUN if [ -n "${PROTOBUF}" ]; then bash ./install_protobuf.sh; fi
81-
RUN rm install_protobuf.sh
82-
ENV INSTALLED_PROTOBUF ${PROTOBUF}
83-
8477
# (optional) Install vision packages like OpenCV
8578
ARG VISION
8679
COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./

‎.github/ci_commit_pins/audio.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
bccaa454a54c3c648697cc2f46a4fb0500b1f01b
1+
70e34b183b4615e2ece27e9b312cf3195647d3cf

‎aten/src/ATen/Context.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ void Context::setAllowFP16ReductionCPU(bool b) {
694694
#else
695695
if (true)
696696
#endif
697-
throw std::runtime_error("Float16 arithmetic is not supported by the CPU!");
697+
TORCH_CHECK(false, "Float16 arithmetic is not supported by the CPU!");
698698
}
699699
allow_fp16_reduction_cpu = b;
700700
}

0 commit comments

Comments
 (0)
0