Skip to content

Commit 5837c6d

Browse files
sandeepgupta12sandeepgupta12
authored
Merge branch 'temp-nightly-1' into temp-ppc64le-wheel-branch-v7
2 parents 5929e1f + 90ef7a9 commit 5837c6d

File tree

3,602 files changed

+74656
-267865
lines changed

Some content is hidden

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

3,602 files changed

+74656
-267865
lines changed

‎.ci/aarch64_linux/aarch64_ci_build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ cd /
2020
# on the mounted pytorch repo
2121
git config --global --add safe.directory /pytorch
2222
pip install -r /pytorch/requirements.txt
23-
pip install auditwheel
23+
pip install auditwheel==6.2.0
2424
if [ "$DESIRED_CUDA" = "cpu" ]; then
2525
echo "BASE_CUDA_VERSION is not set. Building cpu wheel."
2626
#USE_PRIORITIZED_TEXT_FOR_LD for enable linker script optimization https://github.com/pytorch/pytorch/pull/121975/files

‎.ci/aarch64_linux/aarch64_wheel_ci_build.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def build_ArmComputeLibrary() -> None:
3939
"clone",
4040
"https://github.com/ARM-software/ComputeLibrary.git",
4141
"-b",
42-
"v24.09",
42+
"v25.02",
4343
"--depth",
4444
"1",
4545
"--shallow-submodules",
@@ -99,10 +99,14 @@ def update_wheel(wheel_path, desired_cuda) -> None:
9999
if "126" in desired_cuda:
100100
libs_to_copy += [
101101
"/usr/local/cuda/lib64/libnvrtc-builtins.so.12.6",
102+
"/usr/local/cuda/lib64/libcufile.so.0",
103+
"/usr/local/cuda/lib64/libcufile_rdma.so.1",
102104
]
103105
elif "128" in desired_cuda:
104106
libs_to_copy += [
105107
"/usr/local/cuda/lib64/libnvrtc-builtins.so.12.8",
108+
"/usr/local/cuda/lib64/libcufile.so.0",
109+
"/usr/local/cuda/lib64/libcufile_rdma.so.1",
106110
]
107111
else:
108112
libs_to_copy += [
@@ -204,7 +208,7 @@ def parse_arguments():
204208
else:
205209
build_vars += f"BUILD_TEST=0 PYTORCH_BUILD_VERSION={version}.dev{build_date} PYTORCH_BUILD_NUMBER=1 "
206210
elif branch.startswith(("v1.", "v2.")):
207-
build_vars += f"BUILD_TEST=0 PYTORCH_BUILD_VERSION={branch[1:branch.find('-')]} PYTORCH_BUILD_NUMBER=1 "
211+
build_vars += f"BUILD_TEST=0 PYTORCH_BUILD_VERSION={branch[1 : branch.find('-')]} PYTORCH_BUILD_NUMBER=1 "
208212

209213
if enable_mkldnn:
210214
build_ArmComputeLibrary()

‎.ci/aarch64_linux/build_aarch64_wheel.py‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@
1919

2020
# AMI images for us-east-1, change the following based on your ~/.aws/config
2121
os_amis = {
22-
"ubuntu18_04": "ami-078eece1d8119409f", # login_name: ubuntu
2322
"ubuntu20_04": "ami-052eac90edaa9d08f", # login_name: ubuntu
2423
"ubuntu22_04": "ami-0c6c29c5125214c77", # login_name: ubuntu
2524
"redhat8": "ami-0698b90665a2ddcf1", # login_name: ec2-user
2625
}
2726

28-
ubuntu18_04_ami = os_amis["ubuntu18_04"]
2927
ubuntu20_04_ami = os_amis["ubuntu20_04"]
3028

3129

@@ -329,7 +327,7 @@ def build_ArmComputeLibrary(host: RemoteHost, git_clone_flags: str = "") -> None
329327
]
330328
)
331329
host.run_cmd(
332-
f"git clone https://github.com/ARM-software/ComputeLibrary.git -b v24.09 {git_clone_flags}"
330+
f"git clone https://github.com/ARM-software/ComputeLibrary.git -b v25.02 {git_clone_flags}"
333331
)
334332

335333
host.run_cmd(f"cd ComputeLibrary && scons Werror=1 -j8 {acl_build_flags}")
@@ -659,18 +657,6 @@ def configure_system(
659657
"sudo apt-get install -y python3-dev python3-yaml python3-setuptools python3-wheel python3-pip"
660658
)
661659
host.run_cmd("pip3 install dataclasses typing-extensions")
662-
# Install and switch to gcc-8 on Ubuntu-18.04
663-
if not host.using_docker() and host.ami == ubuntu18_04_ami and compiler == "gcc-8":
664-
host.run_cmd("sudo apt-get install -y g++-8 gfortran-8")
665-
host.run_cmd(
666-
"sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 100"
667-
)
668-
host.run_cmd(
669-
"sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 100"
670-
)
671-
host.run_cmd(
672-
"sudo update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran-8 100"
673-
)
674660
if not use_conda:
675661
print("Installing Cython + numpy from PyPy")
676662
host.run_cmd("sudo pip3 install Cython")
@@ -761,7 +747,7 @@ def start_build(
761747
version = host.check_output("cat pytorch/version.txt").strip()[:-2]
762748
build_vars += f"BUILD_TEST=0 PYTORCH_BUILD_VERSION={version}.dev{build_date} PYTORCH_BUILD_NUMBER=1"
763749
if branch.startswith(("v1.", "v2.")):
764-
build_vars += f"BUILD_TEST=0 PYTORCH_BUILD_VERSION={branch[1:branch.find('-')]} PYTORCH_BUILD_NUMBER=1"
750+
build_vars += f"BUILD_TEST=0 PYTORCH_BUILD_VERSION={branch[1 : branch.find('-')]} PYTORCH_BUILD_NUMBER=1"
765751
if host.using_docker():
766752
build_vars += " CMAKE_SHARED_LINKER_FLAGS=-Wl,-z,max-page-size=0x10000"
767753
if enable_mkldnn:

‎.ci/docker/build.sh‎

Lines changed: 70 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
#!/bin/bash
2+
# The purpose of this script is to:
3+
# 1. Extract the set of parameters to be used for a docker build based on the provided image name.
4+
# 2. Run docker build with the parameters found in step 1.
5+
# 3. Run the built image and print out the expected and actual versions of packages installed.
26

37
set -ex
48

@@ -95,13 +99,12 @@ fi
9599
# configuration, so we hardcode everything here rather than do it
96100
# from scratch
97101
case "$image" in
98-
pytorch-linux-focal-cuda12.4-cudnn9-py3-gcc9)
99-
CUDA_VERSION=12.4.1
102+
pytorch-linux-focal-cuda12.6-cudnn9-py3-gcc11)
103+
CUDA_VERSION=12.6.3
100104
CUDNN_VERSION=9
101105
ANACONDA_PYTHON_VERSION=3.10
102-
GCC_VERSION=9
106+
GCC_VERSION=11
103107
PROTOBUF=yes
104-
DB=yes
105108
VISION=yes
106109
KATEX=yes
107110
UCX_COMMIT=${_UCX_COMMIT}
@@ -115,7 +118,6 @@ case "$image" in
115118
ANACONDA_PYTHON_VERSION=3.10
116119
GCC_VERSION=9
117120
PROTOBUF=yes
118-
DB=yes
119121
VISION=yes
120122
KATEX=yes
121123
UCX_COMMIT=${_UCX_COMMIT}
@@ -130,7 +132,6 @@ case "$image" in
130132
ANACONDA_PYTHON_VERSION=3.12
131133
GCC_VERSION=9
132134
PROTOBUF=yes
133-
DB=yes
134135
VISION=yes
135136
KATEX=yes
136137
UCX_COMMIT=${_UCX_COMMIT}
@@ -145,7 +146,61 @@ case "$image" in
145146
ANACONDA_PYTHON_VERSION=3.13
146147
GCC_VERSION=9
147148
PROTOBUF=yes
148-
DB=yes
149+
VISION=yes
150+
KATEX=yes
151+
UCX_COMMIT=${_UCX_COMMIT}
152+
UCC_COMMIT=${_UCC_COMMIT}
153+
CONDA_CMAKE=yes
154+
TRITON=yes
155+
INDUCTOR_BENCHMARKS=yes
156+
;;
157+
pytorch-linux-focal-cuda12.6-cudnn9-py3-gcc9)
158+
CUDA_VERSION=12.6.3
159+
CUDNN_VERSION=9
160+
ANACONDA_PYTHON_VERSION=3.10
161+
GCC_VERSION=9
162+
PROTOBUF=yes
163+
VISION=yes
164+
KATEX=yes
165+
UCX_COMMIT=${_UCX_COMMIT}
166+
UCC_COMMIT=${_UCC_COMMIT}
167+
CONDA_CMAKE=yes
168+
TRITON=yes
169+
;;
170+
pytorch-linux-focal-cuda12.6-cudnn9-py3-gcc9-inductor-benchmarks)
171+
CUDA_VERSION=12.6.3
172+
CUDNN_VERSION=9
173+
ANACONDA_PYTHON_VERSION=3.10
174+
GCC_VERSION=9
175+
PROTOBUF=yes
176+
VISION=yes
177+
KATEX=yes
178+
UCX_COMMIT=${_UCX_COMMIT}
179+
UCC_COMMIT=${_UCC_COMMIT}
180+
CONDA_CMAKE=yes
181+
TRITON=yes
182+
INDUCTOR_BENCHMARKS=yes
183+
;;
184+
pytorch-linux-focal-cuda12.6-cudnn9-py3.12-gcc9-inductor-benchmarks)
185+
CUDA_VERSION=12.6.3
186+
CUDNN_VERSION=9
187+
ANACONDA_PYTHON_VERSION=3.12
188+
GCC_VERSION=9
189+
PROTOBUF=yes
190+
VISION=yes
191+
KATEX=yes
192+
UCX_COMMIT=${_UCX_COMMIT}
193+
UCC_COMMIT=${_UCC_COMMIT}
194+
CONDA_CMAKE=yes
195+
TRITON=yes
196+
INDUCTOR_BENCHMARKS=yes
197+
;;
198+
pytorch-linux-focal-cuda12.6-cudnn9-py3.13-gcc9-inductor-benchmarks)
199+
CUDA_VERSION=12.6.3
200+
CUDNN_VERSION=9
201+
ANACONDA_PYTHON_VERSION=3.13
202+
GCC_VERSION=9
203+
PROTOBUF=yes
149204
VISION=yes
150205
KATEX=yes
151206
UCX_COMMIT=${_UCX_COMMIT}
@@ -160,7 +215,6 @@ case "$image" in
160215
ANACONDA_PYTHON_VERSION=3.10
161216
GCC_VERSION=9
162217
PROTOBUF=yes
163-
DB=yes
164218
VISION=yes
165219
KATEX=yes
166220
UCX_COMMIT=${_UCX_COMMIT}
@@ -172,7 +226,6 @@ case "$image" in
172226
ANACONDA_PYTHON_VERSION=3.9
173227
CLANG_VERSION=10
174228
PROTOBUF=yes
175-
DB=yes
176229
VISION=yes
177230
CONDA_CMAKE=yes
178231
ONNX=yes
@@ -181,29 +234,22 @@ case "$image" in
181234
ANACONDA_PYTHON_VERSION=3.9
182235
CLANG_VERSION=10
183236
PROTOBUF=yes
184-
DB=yes
185237
VISION=yes
186-
VULKAN_SDK_VERSION=1.2.162.1
187-
SWIFTSHADER=yes
188238
CONDA_CMAKE=yes
189239
TRITON=yes
190240
;;
191241
pytorch-linux-focal-py3.11-clang10)
192242
ANACONDA_PYTHON_VERSION=3.11
193243
CLANG_VERSION=10
194244
PROTOBUF=yes
195-
DB=yes
196245
VISION=yes
197-
VULKAN_SDK_VERSION=1.2.162.1
198-
SWIFTSHADER=yes
199246
CONDA_CMAKE=yes
200247
TRITON=yes
201248
;;
202249
pytorch-linux-focal-py3.9-gcc9)
203250
ANACONDA_PYTHON_VERSION=3.9
204251
GCC_VERSION=9
205252
PROTOBUF=yes
206-
DB=yes
207253
VISION=yes
208254
CONDA_CMAKE=yes
209255
TRITON=yes
@@ -212,7 +258,6 @@ case "$image" in
212258
ANACONDA_PYTHON_VERSION=3.10
213259
GCC_VERSION=11
214260
PROTOBUF=yes
215-
DB=yes
216261
VISION=yes
217262
ROCM_VERSION=6.2.4
218263
NINJA_VERSION=1.9.0
@@ -227,7 +272,6 @@ case "$image" in
227272
ANACONDA_PYTHON_VERSION=3.10
228273
GCC_VERSION=11
229274
PROTOBUF=yes
230-
DB=yes
231275
VISION=yes
232276
ROCM_VERSION=6.3
233277
NINJA_VERSION=1.9.0
@@ -242,7 +286,6 @@ case "$image" in
242286
ANACONDA_PYTHON_VERSION=3.9
243287
GCC_VERSION=11
244288
PROTOBUF=yes
245-
DB=yes
246289
VISION=yes
247290
XPU_VERSION=0.5
248291
NINJA_VERSION=1.9.0
@@ -253,7 +296,6 @@ case "$image" in
253296
ANACONDA_PYTHON_VERSION=3.9
254297
GCC_VERSION=11
255298
PROTOBUF=yes
256-
DB=yes
257299
VISION=yes
258300
XPU_VERSION=2025.0
259301
NINJA_VERSION=1.9.0
@@ -264,7 +306,6 @@ case "$image" in
264306
ANACONDA_PYTHON_VERSION=3.9
265307
GCC_VERSION=11
266308
PROTOBUF=yes
267-
DB=yes
268309
VISION=yes
269310
KATEX=yes
270311
CONDA_CMAKE=yes
@@ -278,15 +319,13 @@ case "$image" in
278319
CUDNN_VERSION=9
279320
CLANG_VERSION=12
280321
PROTOBUF=yes
281-
DB=yes
282322
VISION=yes
283323
TRITON=yes
284324
;;
285325
pytorch-linux-jammy-py3-clang12-asan)
286326
ANACONDA_PYTHON_VERSION=3.9
287327
CLANG_VERSION=12
288328
PROTOBUF=yes
289-
DB=yes
290329
VISION=yes
291330
CONDA_CMAKE=yes
292331
TRITON=yes
@@ -307,7 +346,6 @@ case "$image" in
307346
ANACONDA_PYTHON_VERSION=3.9
308347
GCC_VERSION=11
309348
PROTOBUF=yes
310-
DB=yes
311349
VISION=yes
312350
KATEX=yes
313351
CONDA_CMAKE=yes
@@ -322,15 +360,15 @@ case "$image" in
322360
EXECUTORCH=yes
323361
;;
324362
pytorch-linux-jammy-py3.12-halide)
325-
CUDA_VERSION=12.4
363+
CUDA_VERSION=12.6
326364
ANACONDA_PYTHON_VERSION=3.12
327365
GCC_VERSION=11
328366
CONDA_CMAKE=yes
329367
HALIDE=yes
330368
TRITON=yes
331369
;;
332370
pytorch-linux-jammy-py3.12-triton-cpu)
333-
CUDA_VERSION=12.4
371+
CUDA_VERSION=12.6
334372
ANACONDA_PYTHON_VERSION=3.12
335373
GCC_VERSION=11
336374
CONDA_CMAKE=yes
@@ -340,20 +378,19 @@ case "$image" in
340378
# TODO: Use 3.9 here because of this issue https://github.com/python/mypy/issues/13627.
341379
# We will need to update mypy version eventually, but that's for another day. The task
342380
# would be to upgrade mypy to 1.0.0 with Python 3.11
343-
ANACONDA_PYTHON_VERSION=3.9
344-
CONDA_CMAKE=yes
381+
PYTHON_VERSION=3.9
382+
PIP_CMAKE=yes
345383
;;
346384
pytorch-linux-jammy-cuda11.8-cudnn9-py3.9-linter)
347-
ANACONDA_PYTHON_VERSION=3.9
385+
PYTHON_VERSION=3.9
348386
CUDA_VERSION=11.8
349-
CONDA_CMAKE=yes
387+
PIP_CMAKE=yes
350388
;;
351389
pytorch-linux-jammy-aarch64-py3.10-gcc11)
352390
ANACONDA_PYTHON_VERSION=3.10
353391
GCC_VERSION=11
354392
ACL=yes
355393
PROTOBUF=yes
356-
DB=yes
357394
VISION=yes
358395
CONDA_CMAKE=yes
359396
# snadampal: skipping llvm src build install because the current version
@@ -365,7 +402,6 @@ case "$image" in
365402
GCC_VERSION=11
366403
ACL=yes
367404
PROTOBUF=yes
368-
DB=yes
369405
VISION=yes
370406
CONDA_CMAKE=yes
371407
# snadampal: skipping llvm src build install because the current version
@@ -376,7 +412,6 @@ case "$image" in
376412
*)
377413
# Catch-all for builds that are not hardcoded.
378414
PROTOBUF=yes
379-
DB=yes
380415
VISION=yes
381416
echo "image '$image' did not match an existing build configuration"
382417
if [[ "$image" == *py* ]]; then
@@ -432,21 +467,19 @@ docker build \
432467
--build-arg "BUILD_ENVIRONMENT=${image}" \
433468
--build-arg "PROTOBUF=${PROTOBUF:-}" \
434469
--build-arg "LLVMDEV=${LLVMDEV:-}" \
435-
--build-arg "DB=${DB:-}" \
436470
--build-arg "VISION=${VISION:-}" \
437471
--build-arg "UBUNTU_VERSION=${UBUNTU_VERSION}" \
438472
--build-arg "CENTOS_VERSION=${CENTOS_VERSION}" \
439473
--build-arg "DEVTOOLSET_VERSION=${DEVTOOLSET_VERSION}" \
440474
--build-arg "GLIBC_VERSION=${GLIBC_VERSION}" \
441475
--build-arg "CLANG_VERSION=${CLANG_VERSION}" \
442476
--build-arg "ANACONDA_PYTHON_VERSION=${ANACONDA_PYTHON_VERSION}" \
477+
--build-arg "PYTHON_VERSION=${PYTHON_VERSION}" \
443478
--build-arg "GCC_VERSION=${GCC_VERSION}" \
444479
--build-arg "CUDA_VERSION=${CUDA_VERSION}" \
445480
--build-arg "CUDNN_VERSION=${CUDNN_VERSION}" \
446481
--build-arg "TENSORRT_VERSION=${TENSORRT_VERSION}" \
447482
--build-arg "GRADLE_VERSION=${GRADLE_VERSION}" \
448-
--build-arg "VULKAN_SDK_VERSION=${VULKAN_SDK_VERSION}" \
449-
--build-arg "SWIFTSHADER=${SWIFTSHADER}" \
450483
--build-arg "CMAKE_VERSION=${CMAKE_VERSION:-}" \
451484
--build-arg "NINJA_VERSION=${NINJA_VERSION:-}" \
452485
--build-arg "KATEX=${KATEX:-}" \
@@ -456,6 +489,7 @@ docker build \
456489
--build-arg "UCX_COMMIT=${UCX_COMMIT}" \
457490
--build-arg "UCC_COMMIT=${UCC_COMMIT}" \
458491
--build-arg "CONDA_CMAKE=${CONDA_CMAKE}" \
492+
--build-arg "PIP_CMAKE=${PIP_CMAKE}" \
459493
--build-arg "TRITON=${TRITON}" \
460494
--build-arg "TRITON_CPU=${TRITON_CPU}" \
461495
--build-arg "ONNX=${ONNX}" \

0 commit comments

Comments
 (0)