Skip to content

Commit da9eb52

Browse files
committed
NOCOMMIT: Bisect CoreML failures when bumping PyTorch pin
ghstack-source-id: 5d03959 ghstack-comment-id: 2920234223 Pull-Request-resolved: #11222
1 parent 2e9c71c commit da9eb52

File tree

7 files changed

+11
-16
lines changed

7 files changed

+11
-16
lines changed

.ci/docker/ci_commit_pins/pytorch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
01f1cc44cbbfdf6307aa01b803a4ee22f9ade946
1+
7b25ff7cf2e6096c103da0068e417216a41be7a9

install_requirements.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def python_is_compatible():
7171
#
7272
# NOTE: If you're changing, make the corresponding change in .ci/docker/ci_commit_pins/pytorch.txt
7373
# by picking the hash from the same date in https://hud.pytorch.org/hud/pytorch/pytorch/nightly/
74-
NIGHTLY_VERSION = "dev20250422"
74+
NIGHTLY_VERSION = "dev20250525"
7575

7676

7777
def install_requirements(use_pytorch_nightly):

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ dependencies=[
6666
"ruamel.yaml",
6767
"sympy",
6868
"tabulate",
69-
"typing-extensions",
69+
# See also third-party/TARGETS for buck's typing-extensions version.
70+
"typing-extensions>=4.10.0",
7071
# Keep this version in sync with: ./backends/apple/coreml/scripts/install_requirements.sh
7172
"coremltools==8.3; platform_system == 'Darwin' or platform_system == 'Linux'",
7273
]

runtime/core/portable_type/c10/c10/macros/Macros.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ using namespace c10::xpu;
241241
#ifdef __HIPCC__
242242
// Unlike CUDA, HIP requires a HIP header to be included for __host__ to work.
243243
// We do this #include here so that C10_HOST_DEVICE and friends will Just Work.
244-
// See https://github.com/ROCm-Developer-Tools/HIP/issues/441
244+
// See https://github.com/ROCm/hip/issues/441
245245
#include <hip/hip_runtime.h>
246246
#endif
247247

@@ -286,7 +286,7 @@ constexpr uint32_t CUDA_THREADS_PER_BLOCK_FALLBACK = 256;
286286
#define C10_MIN_BLOCKS_PER_SM(threads_per_block, blocks_per_sm) \
287287
((((threads_per_block) * (blocks_per_sm) <= CUDA_MAX_THREADS_PER_SM) \
288288
? (blocks_per_sm) \
289-
: ((CUDA_MAX_THREADS_PER_SM + (threads_per_block)-1) / \
289+
: ((CUDA_MAX_THREADS_PER_SM + (threads_per_block) - 1) / \
290290
(threads_per_block))))
291291
// C10_LAUNCH_BOUNDS is analogous to __launch_bounds__
292292
#define C10_LAUNCH_BOUNDS_0 \

runtime/core/portable_type/c10/c10/util/BFloat16-inl.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,11 @@ C10_CLANG_DIAGNOSTIC_PUSH()
1010
C10_CLANG_DIAGNOSTIC_IGNORE("-Wimplicit-int-float-conversion")
1111
#endif
1212

13-
#if defined(SYCL_EXT_ONEAPI_BFLOAT16_MATH_FUNCTIONS)
1413
#if defined(CL_SYCL_LANGUAGE_VERSION)
1514
#include <CL/sycl.hpp> // for SYCL 1.2.1
16-
#else
15+
#elif defined(SYCL_LANGUAGE_VERSION)
1716
#include <sycl/sycl.hpp> // for SYCL 2020
1817
#endif
19-
#include <ext/oneapi/bfloat16.hpp>
20-
#endif
2118

2219
namespace c10 {
2320

runtime/core/portable_type/c10/c10/util/BFloat16.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@
1414
#include <cuda_bf16.h>
1515
#endif
1616

17-
#if defined(SYCL_EXT_ONEAPI_BFLOAT16_MATH_FUNCTIONS)
1817
#if defined(CL_SYCL_LANGUAGE_VERSION)
1918
#include <CL/sycl.hpp> // for SYCL 1.2.1
20-
#else
19+
#elif defined(SYCL_LANGUAGE_VERSION)
2120
#include <sycl/sycl.hpp> // for SYCL 2020
2221
#endif
23-
#include <ext/oneapi/bfloat16.hpp>
24-
#endif
2522

2623
namespace c10 {
2724

third-party/TARGETS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ prebuilt_python_library_defs = {
2323
"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",
2424
},
2525
"typing-extensions": {
26-
"out": "typing_extensions-4.2.0-py3-none-any.whl",
27-
"sha1": "ff0849420e94f425818bff5d0f25e3cdfaba8601",
28-
"url": "https://files.pythonhosted.org/packages/75/e1/932e06004039dd670c9d5e1df0cd606bf46e29a28e65d5bb28e894ea29c9/typing_extensions-4.2.0-py3-none-any.whl",
26+
"out": "typing_extensions-4.13.2-py3-none-any.whl",
27+
"sha1": "85a14b4d38ca0e528328b6b591769e1d989f12b8",
28+
"url": "https://files.pythonhosted.org/packages/8b/54/b1ae86c0973cc6f0210b53d508ca3641fb6d0c56823f288d108bc7ab3cc8/typing_extensions-4.13.2-py3-none-any.whl",
2929
},
3030
"wcwidth": {
3131
"out": "wcwidth-0.1.5-py2.py3-none-any.whl",

0 commit comments

Comments
 (0)