From f5a74e9eea8e051d8d061410c959231643285386 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Thu, 29 May 2025 11:30:26 -0700 Subject: [PATCH 01/12] Update [ghstack-poisoned] --- .ci/docker/ci_commit_pins/pytorch.txt | 2 +- install_requirements.py | 2 +- pyproject.toml | 3 ++- runtime/core/portable_type/c10/c10/macros/Macros.h | 4 ++-- runtime/core/portable_type/c10/c10/util/BFloat16-inl.h | 5 +---- runtime/core/portable_type/c10/c10/util/BFloat16.h | 5 +---- third-party/TARGETS | 6 +++--- 7 files changed, 11 insertions(+), 16 deletions(-) diff --git a/.ci/docker/ci_commit_pins/pytorch.txt b/.ci/docker/ci_commit_pins/pytorch.txt index 75a95d0522b..02f9dcd57ad 100644 --- a/.ci/docker/ci_commit_pins/pytorch.txt +++ b/.ci/docker/ci_commit_pins/pytorch.txt @@ -1 +1 @@ -01f1cc44cbbfdf6307aa01b803a4ee22f9ade946 +d042ec856b2da248e122ddc7dfad25a57b99344e diff --git a/install_requirements.py b/install_requirements.py index 2fcd65ea338..31b843c83a7 100644 --- a/install_requirements.py +++ b/install_requirements.py @@ -71,7 +71,7 @@ def python_is_compatible(): # # NOTE: If you're changing, make the corresponding change in .ci/docker/ci_commit_pins/pytorch.txt # by picking the hash from the same date in https://hud.pytorch.org/hud/pytorch/pytorch/nightly/ -NIGHTLY_VERSION = "dev20250422" +NIGHTLY_VERSION = "dev20250525" def install_requirements(use_pytorch_nightly): diff --git a/pyproject.toml b/pyproject.toml index 2b636fb00e3..240252b7405 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,7 +66,8 @@ dependencies=[ "ruamel.yaml", "sympy", "tabulate", - "typing-extensions", + # See also third-party/TARGETS for buck's typing-extensions version. + "typing-extensions>=4.10.0", # Keep this version in sync with: ./backends/apple/coreml/scripts/install_requirements.sh "coremltools==8.3; platform_system == 'Darwin' or platform_system == 'Linux'", ] diff --git a/runtime/core/portable_type/c10/c10/macros/Macros.h b/runtime/core/portable_type/c10/c10/macros/Macros.h index 7e61ad7e26b..0947be6c0d0 100644 --- a/runtime/core/portable_type/c10/c10/macros/Macros.h +++ b/runtime/core/portable_type/c10/c10/macros/Macros.h @@ -241,7 +241,7 @@ using namespace c10::xpu; #ifdef __HIPCC__ // Unlike CUDA, HIP requires a HIP header to be included for __host__ to work. // We do this #include here so that C10_HOST_DEVICE and friends will Just Work. -// See https://github.com/ROCm-Developer-Tools/HIP/issues/441 +// See https://github.com/ROCm/hip/issues/441 #include #endif @@ -286,7 +286,7 @@ constexpr uint32_t CUDA_THREADS_PER_BLOCK_FALLBACK = 256; #define C10_MIN_BLOCKS_PER_SM(threads_per_block, blocks_per_sm) \ ((((threads_per_block) * (blocks_per_sm) <= CUDA_MAX_THREADS_PER_SM) \ ? (blocks_per_sm) \ - : ((CUDA_MAX_THREADS_PER_SM + (threads_per_block)-1) / \ + : ((CUDA_MAX_THREADS_PER_SM + (threads_per_block) - 1) / \ (threads_per_block)))) // C10_LAUNCH_BOUNDS is analogous to __launch_bounds__ #define C10_LAUNCH_BOUNDS_0 \ diff --git a/runtime/core/portable_type/c10/c10/util/BFloat16-inl.h b/runtime/core/portable_type/c10/c10/util/BFloat16-inl.h index 10ab0c828d7..1ed866f78d9 100644 --- a/runtime/core/portable_type/c10/c10/util/BFloat16-inl.h +++ b/runtime/core/portable_type/c10/c10/util/BFloat16-inl.h @@ -10,14 +10,11 @@ C10_CLANG_DIAGNOSTIC_PUSH() C10_CLANG_DIAGNOSTIC_IGNORE("-Wimplicit-int-float-conversion") #endif -#if defined(SYCL_EXT_ONEAPI_BFLOAT16_MATH_FUNCTIONS) #if defined(CL_SYCL_LANGUAGE_VERSION) #include // for SYCL 1.2.1 -#else +#elif defined(SYCL_LANGUAGE_VERSION) #include // for SYCL 2020 #endif -#include -#endif namespace c10 { diff --git a/runtime/core/portable_type/c10/c10/util/BFloat16.h b/runtime/core/portable_type/c10/c10/util/BFloat16.h index 93d0ec54fb0..0f7cecda46b 100644 --- a/runtime/core/portable_type/c10/c10/util/BFloat16.h +++ b/runtime/core/portable_type/c10/c10/util/BFloat16.h @@ -14,14 +14,11 @@ #include #endif -#if defined(SYCL_EXT_ONEAPI_BFLOAT16_MATH_FUNCTIONS) #if defined(CL_SYCL_LANGUAGE_VERSION) #include // for SYCL 1.2.1 -#else +#elif defined(SYCL_LANGUAGE_VERSION) #include // for SYCL 2020 #endif -#include -#endif namespace c10 { diff --git a/third-party/TARGETS b/third-party/TARGETS index 0ec62c1536f..c80bd9448b3 100644 --- a/third-party/TARGETS +++ b/third-party/TARGETS @@ -23,9 +23,9 @@ prebuilt_python_library_defs = { "url": "https://files.pythonhosted.org/packages/12/fc/a4d5a7554e0067677823f7265cb3ae22aed8a238560b5133b58cda252dad/PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", }, "typing-extensions": { - "out": "typing_extensions-4.2.0-py3-none-any.whl", - "sha1": "ff0849420e94f425818bff5d0f25e3cdfaba8601", - "url": "https://files.pythonhosted.org/packages/75/e1/932e06004039dd670c9d5e1df0cd606bf46e29a28e65d5bb28e894ea29c9/typing_extensions-4.2.0-py3-none-any.whl", + "out": "typing_extensions-4.13.2-py3-none-any.whl", + "sha1": "85a14b4d38ca0e528328b6b591769e1d989f12b8", + "url": "https://files.pythonhosted.org/packages/8b/54/b1ae86c0973cc6f0210b53d508ca3641fb6d0c56823f288d108bc7ab3cc8/typing_extensions-4.13.2-py3-none-any.whl", }, "wcwidth": { "out": "wcwidth-0.1.5-py2.py3-none-any.whl", From 874ff86cb76979f14ccc78671a6dcbf9c59db6fd Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Thu, 29 May 2025 12:18:42 -0700 Subject: [PATCH 02/12] try 2327c9eedcc0fa673dc183fe9393858ee34b4517 [ghstack-poisoned] --- .ci/docker/ci_commit_pins/pytorch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/docker/ci_commit_pins/pytorch.txt b/.ci/docker/ci_commit_pins/pytorch.txt index 02f9dcd57ad..36f18327592 100644 --- a/.ci/docker/ci_commit_pins/pytorch.txt +++ b/.ci/docker/ci_commit_pins/pytorch.txt @@ -1 +1 @@ -d042ec856b2da248e122ddc7dfad25a57b99344e +2327c9eedcc0fa673dc183fe9393858ee34b4517 From dcdacd1ef7e248519b741617d8ffe4ba9e502f19 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Thu, 29 May 2025 12:39:59 -0700 Subject: [PATCH 03/12] Update [ghstack-poisoned] --- .ci/docker/ci_commit_pins/pytorch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/docker/ci_commit_pins/pytorch.txt b/.ci/docker/ci_commit_pins/pytorch.txt index 36f18327592..1b0be14b881 100644 --- a/.ci/docker/ci_commit_pins/pytorch.txt +++ b/.ci/docker/ci_commit_pins/pytorch.txt @@ -1 +1 @@ -2327c9eedcc0fa673dc183fe9393858ee34b4517 +179e7d8624396706b3bd4bd13d60eafb0a1f7a2b From a30e9697571970fb2a4a24e2d91317224a5d575d Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Thu, 29 May 2025 13:10:45 -0700 Subject: [PATCH 04/12] Update [ghstack-poisoned] --- .ci/docker/ci_commit_pins/pytorch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/docker/ci_commit_pins/pytorch.txt b/.ci/docker/ci_commit_pins/pytorch.txt index 1b0be14b881..04fc690b038 100644 --- a/.ci/docker/ci_commit_pins/pytorch.txt +++ b/.ci/docker/ci_commit_pins/pytorch.txt @@ -1 +1 @@ -179e7d8624396706b3bd4bd13d60eafb0a1f7a2b +6cd9d66b7f3d29fbbcb46c4b3326fac76d48f30d From 2fb49eb651571d1d2ce3b382c4d75d7c83867e0c Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Thu, 29 May 2025 13:28:59 -0700 Subject: [PATCH 05/12] Update [ghstack-poisoned] --- .ci/docker/ci_commit_pins/pytorch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/docker/ci_commit_pins/pytorch.txt b/.ci/docker/ci_commit_pins/pytorch.txt index 04fc690b038..7af1416ce80 100644 --- a/.ci/docker/ci_commit_pins/pytorch.txt +++ b/.ci/docker/ci_commit_pins/pytorch.txt @@ -1 +1 @@ -6cd9d66b7f3d29fbbcb46c4b3326fac76d48f30d +7e80f23516a86e18ae5bc5579d3005c1e7610102 From 485572d767b48d448b9956bc8ad7b54f545383aa Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Thu, 29 May 2025 13:51:17 -0700 Subject: [PATCH 06/12] Update [ghstack-poisoned] --- .ci/docker/ci_commit_pins/pytorch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/docker/ci_commit_pins/pytorch.txt b/.ci/docker/ci_commit_pins/pytorch.txt index 7af1416ce80..9bf054e0d6f 100644 --- a/.ci/docker/ci_commit_pins/pytorch.txt +++ b/.ci/docker/ci_commit_pins/pytorch.txt @@ -1 +1 @@ -7e80f23516a86e18ae5bc5579d3005c1e7610102 +7b25ff7cf2e6096c103da0068e417216a41be7a9 From 9629c328b170d8ca032ba89980a35feca903ab2c Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Thu, 29 May 2025 14:25:04 -0700 Subject: [PATCH 07/12] Update [ghstack-poisoned] --- .ci/docker/ci_commit_pins/pytorch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/docker/ci_commit_pins/pytorch.txt b/.ci/docker/ci_commit_pins/pytorch.txt index 9bf054e0d6f..872b2cbdcfd 100644 --- a/.ci/docker/ci_commit_pins/pytorch.txt +++ b/.ci/docker/ci_commit_pins/pytorch.txt @@ -1 +1 @@ -7b25ff7cf2e6096c103da0068e417216a41be7a9 +26471fc20395111b96541b1d3fe9dac6bb8dcd98 From 6bb426e25ba8e276afdbb268dc460e234f018100 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Thu, 29 May 2025 14:55:19 -0700 Subject: [PATCH 08/12] Update [ghstack-poisoned] --- .ci/docker/ci_commit_pins/pytorch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/docker/ci_commit_pins/pytorch.txt b/.ci/docker/ci_commit_pins/pytorch.txt index 872b2cbdcfd..bba3adc5cd3 100644 --- a/.ci/docker/ci_commit_pins/pytorch.txt +++ b/.ci/docker/ci_commit_pins/pytorch.txt @@ -1 +1 @@ -26471fc20395111b96541b1d3fe9dac6bb8dcd98 +2225231a144f182e2e1bd26a619cc1bafad49e6d From 8f5e4f77ec03c5fb22f7c56b3a20108c078fba88 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Thu, 29 May 2025 15:15:33 -0700 Subject: [PATCH 09/12] Update [ghstack-poisoned] --- .ci/docker/ci_commit_pins/pytorch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/docker/ci_commit_pins/pytorch.txt b/.ci/docker/ci_commit_pins/pytorch.txt index bba3adc5cd3..523b366c615 100644 --- a/.ci/docker/ci_commit_pins/pytorch.txt +++ b/.ci/docker/ci_commit_pins/pytorch.txt @@ -1 +1 @@ -2225231a144f182e2e1bd26a619cc1bafad49e6d +4b7abce6a4d766dd1ab54780298e6e9046caf3d1 From 92cb41a9da61220e2164b63c6db569b94a36436b Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Thu, 29 May 2025 15:38:53 -0700 Subject: [PATCH 10/12] Update [ghstack-poisoned] --- .ci/docker/ci_commit_pins/pytorch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/docker/ci_commit_pins/pytorch.txt b/.ci/docker/ci_commit_pins/pytorch.txt index 523b366c615..247128a1904 100644 --- a/.ci/docker/ci_commit_pins/pytorch.txt +++ b/.ci/docker/ci_commit_pins/pytorch.txt @@ -1 +1 @@ -4b7abce6a4d766dd1ab54780298e6e9046caf3d1 +214e4cef9f12ea33997dfb902b79e0c972af5b23 From 0eeceadf43cf6819045ab98303059604003b35a6 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Fri, 30 May 2025 09:45:40 -0700 Subject: [PATCH 11/12] repeat CI for bisect blamed rev [ghstack-poisoned] --- .ci/docker/ci_commit_pins/pytorch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/docker/ci_commit_pins/pytorch.txt b/.ci/docker/ci_commit_pins/pytorch.txt index 247128a1904..7af1416ce80 100644 --- a/.ci/docker/ci_commit_pins/pytorch.txt +++ b/.ci/docker/ci_commit_pins/pytorch.txt @@ -1 +1 @@ -214e4cef9f12ea33997dfb902b79e0c972af5b23 +7e80f23516a86e18ae5bc5579d3005c1e7610102 From 4061a9f69a2b5858ffd6737cdac164f677a8dac3 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Fri, 30 May 2025 10:11:55 -0700 Subject: [PATCH 12/12] repeat CI for rev prior to bisect blamed rev [ghstack-poisoned] --- .ci/docker/ci_commit_pins/pytorch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/docker/ci_commit_pins/pytorch.txt b/.ci/docker/ci_commit_pins/pytorch.txt index 7af1416ce80..247128a1904 100644 --- a/.ci/docker/ci_commit_pins/pytorch.txt +++ b/.ci/docker/ci_commit_pins/pytorch.txt @@ -1 +1 @@ -7e80f23516a86e18ae5bc5579d3005c1e7610102 +214e4cef9f12ea33997dfb902b79e0c972af5b23