Skip to content

Commit eb01197

Browse files
Rohanjames1997Rohanjames1997
authored
Merge branch 'pytorch:main' into neon_vec_reduce_all
2 parents b7fecf4 + 15ea0a0 commit eb01197

File tree

228 files changed

+24778
-1878
lines changed

Some content is hidden

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

228 files changed

+24778
-1878
lines changed

‎.ci/docker/requirements-ci.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ librosa>=0.6.2 ; python_version < "3.11"
7575
#Pinned versions:
7676
#test that import:
7777

78-
mypy==1.4.1
78+
mypy==0.960
7979
# Pin MyPy version because new errors are likely to appear with each release
8080
#Description: linter
81-
#Pinned versions: 1.4.1
81+
#Pinned versions: 0.960
8282
#test that import: test_typing.py, test_type_hints.py
8383

8484
networkx==2.8.8

‎.ci/pytorch/test.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ test_dynamo_shard() {
268268
test_package \
269269
test_legacy_vmap \
270270
test_custom_op_testing \
271+
test_content_store \
271272
export/test_db \
272273
functorch/test_dims \
273274
functorch/test_aotdispatch \
@@ -369,7 +370,7 @@ test_perf_for_dashboard() {
369370
if [[ "$DASHBOARD_TAG" == *dynamic-true* ]]; then
370371
python "benchmarks/dynamo/$suite.py" \
371372
"${target_flag[@]}" --"$mode" --"$dtype" --backend "$backend" --dynamic-shapes \
372-
--dynamic-batch-only --disable-cudagraphs "$@" \
373+
--dynamic-batch-only "$@" \
373374
--output "$TEST_REPORTS_DIR/${backend}_dynamic_${suite}_${dtype}_${mode}_cuda_${target}.csv"
374375
fi
375376
if [[ "$DASHBOARD_TAG" == *cppwrapper-true* ]] && [[ "$mode" == "inference" ]]; then

‎.github/ci_commit_pins/vision.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
08c9938f3e69b4fb2d710a038479264f3c23b133
1+
bb3aae7b2543637191ad9c810f082eae622534b8

‎.github/scripts/github_utils.py‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import json
44
import os
5+
import warnings
56

67
from dataclasses import dataclass
78
from typing import Any, Callable, cast, Dict, List, Optional, Tuple
@@ -143,3 +144,26 @@ def gh_post_commit_comment(
143144
def gh_delete_comment(org: str, repo: str, comment_id: int) -> None:
144145
url = f"https://api.github.com/repos/{org}/{repo}/issues/comments/{comment_id}"
145146
gh_fetch_url(url, method="DELETE")
147+
148+
149+
def gh_fetch_merge_base(org: str, repo: str, base: str, head: str) -> str:
150+
merge_base = ""
151+
# Get the merge base using the GitHub REST API. This is the same as using
152+
# git merge-base without the need to have git. The API doc can be found at
153+
# https://docs.github.com/en/rest/commits/commits?apiVersion=2022-11-28#compare-two-commits
154+
try:
155+
json_data = gh_fetch_url(
156+
f"https://api.github.com/repos/{org}/{repo}/compare/{base}...{head}",
157+
headers={"Accept": "application/vnd.github.v3+json"},
158+
reader=json.load,
159+
)
160+
if json_data:
161+
merge_base = json_data.get("merge_base_commit", {}).get("sha", "")
162+
else:
163+
warnings.warn(
164+
f"Failed to get merge base for {base}...{head}: Empty response"
165+
)
166+
except Exception as error:
167+
warnings.warn(f"Failed to get merge base for {base}...{head}: {error}")
168+
169+
return merge_base

0 commit comments

Comments
 (0)