8000 Merge branch 'pytorch:master' into jiterator/reciprocal · pytorch/pytorch@0eebe2f · GitHub
[go: up one dir, main page]

Skip to content

Commit 0eebe2f

Browse files
authored
Merge branch 'pytorch:master' into jiterator/reciprocal
2 parents 1343234 + dca42dc commit 0eebe2f

File tree

533 files changed

+26997
-7737
lines changed

Some content is hidden

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

533 files changed

+26997
-7737
lines changed

.circleci/docker/common/install_user.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
set -ex
44

55
# Mirror jenkins user in container
6-
echo "jenkins:x:1014:1014::/var/lib/jenkins:" >> /etc/passwd
7-
echo "jenkins:x:1014:" >> /etc/group
6+
# jenkins user as ec2-user should have the same user-id
7+
echo "jenkins:x:1000:1000::/var/lib/jenkins:" >> /etc/passwd
8+
echo "jenkins:x:1000:" >> /etc/group
89

910
# Create $HOME
1011
mkdir -p /var/lib/jenkins

.circleci/scripts/cpp_doc_push_script.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ cp torch/_utils_internal.py tools/shared
6565

6666
# Generate PyTorch files
6767
time python tools/setup_helpers/generate_code.py \
68-
--native-functions-path aten/src/ATen/native/native_functions.yaml \
69-
--nn-path aten/src/
68+
--native-functions-path aten/src/ATen/native/native_functions.yaml
7069

7170
# Build the docs
7271
pushd docs/cpp

.github/scripts/README.md

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# pytorch/.github
2+
3+
> NOTE: This README contains information for the `.github` directory but cannot be located there because it will overwrite the
4+
repo README.
5+
6+
This directory contains workflows and scripts to support our CI infrastructure that runs on Github Actions.
7+
8+
## Workflows
9+
10+
- Pull CI (`pull.yml`) is run on PRs and on master.
11+
- Trunk CI (`trunk.yml`) is run on trunk to validate incoming commits. Trunk jobs are usually more expensive to run so we do not run them on PRs unless specified.
12+
- Scheduled CI (`periodic.yml`) is a subset of trunk CI that is run every few hours on master.
13+
- Binary CI is run to package binaries for distribution for all platforms.
14+
15+
## Templates
16+
17+
Templates written in [Jinja](https://jinja.palletsprojects.com/en/3.0.x/) are located in the `.github/templates` directory
18+
and used to generate workflow files for binary jobs found in the `.github/workflows/` directory. These are also a
19+
couple of utility templates used to discern common utilities that can be used amongst different templates.
20+
21+
### (Re)Generating workflow files
22+
23+
You will need `jinja2` in order to regenerate the workflow files which can be installed using:
24+
```bash
25+
pip install -r .github/requirements.txt
26+
```
27+
28+
Workflows can be generated / regenerated using the following command:
29+
```bash
30+
.github/regenerate.sh
31+
```
32+
33+
### Adding a new generated binary workflow
34+
35+
New generated binary workflows can be added in the `.github/scripts/generate_ci_workflows.py` script. You can reference
36+
examples from that script in order to add the workflow to the stream that is relevant to what you particularly
37+
care about.
38+
39+
Different parameters can be used to acheive different goals, i.e. running jobs on a cron, running only on trunk, etc.
40+
41+
#### ciflow (trunk)
42+
43+
The label `ciflow/trunk` can be used to run `trunk` only workflows. This is especially useful if trying to re-land a PR that was
44+
reverted for failing a `non-default` workflow.
45+
46+
## Infra
47+
48+
Currently most of our self hosted runners are hosted on AWS, for a comprehensive list of available runner types you
49+
can reference `.github/scale-config.yml`.
50+
51+
Exceptions to AWS for self hosted:
52+
* ROCM runners
53+
54+
### Adding new runner types
55+
56+
New runner types can be added by committing changes to `.github/scale-config.yml`. Example: https://github.com/pytorch/pytorch/pull/70474
57+
58+
> NOTE: New runner types can only be used once the changes to `.github/scale-config.yml` have made their way into the default branch

.github/templates/android_ci_full_workflow.yml.j2

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

.github/templates/android_ci_workflow.yml.j2

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

0 commit comments

Comments
 (0)
0