Skip to content

Commit 9a04d96

Browse files
authored
Merge branch 'main' into feat/dynamic_resource
2 parents 6e58312 + 1e3df20 commit 9a04d96

File tree

113 files changed

+2545
-4892
lines changed

Some content is hidden

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

113 files changed

+2545
-4892
lines changed

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Steps to reproduce the behavior:
3737

3838
## Environment
3939

40-
<!-- Please run and include the output from https://github.com/pytorch/torchx/blob/main/scripts/collect_env.py. -->
40+
<!-- Please run and include the output from https://github.com/meta-pytorch/torchx/blob/main/scripts/collect_env.py. -->
4141

4242
- torchx version (e.g. 0.1.0rc1):
4343
- Python version:

.github/ISSUE_TEMPLATE/questions-help-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ about: Do you need support? We have resources.
1010
### Please note that this issue tracker is not a help form and this issue will be closed.
1111

1212
Before submitting, please ensure you have gone through our
13-
[documentation](https://pytorch.org/torchx).
13+
[documentation](https://meta-pytorch.org/torchx).
1414

1515

1616
### Question

.github/workflows/components-integration-tests.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ jobs:
2424
platform: ubuntu-latest
2525
- scheduler: "local_docker"
2626
platform: linux.24_04.4x
27-
- scheduler: "ray"
28-
platform: ubuntu-latest
2927
fail-fast: false
3028
runs-on: ${{ matrix.platform }}
3129
permissions:
@@ -61,13 +59,6 @@ jobs:
6159
pip install -r dev-requirements.txt
6260
pip install -e .[kubernetes]
6361
64-
- name: Start Ray
65-
if: ${{ matrix.scheduler == 'ray' }}
66-
run: |
67-
ray start --head
68-
sleep 5 # wait till the node joins so that `status` command displays the head node info
69-
ray status
70-
7162
- name: Start Kubernetes
7263
if: ${{ matrix.scheduler == 'kubernetes' }}
7364
run: |

.github/workflows/container.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
run: |
3333
set -eux
3434
torchx/runtime/container/build.sh
35-
docker tag torchx "ghcr.io/pytorch/torchx:$VERSION"
35+
docker tag torchx "ghcr.io/meta-pytorch/torchx:$VERSION"
3636
- name: Push containers
3737
run: |
3838
set -eux
39-
docker push "ghcr.io/pytorch/torchx:$VERSION"
39+
docker push "ghcr.io/meta-pytorch/torchx:$VERSION"

.github/workflows/gcp-batch-integration-tests.yaml

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

.github/workflows/kfp-integration-tests.yaml

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

.github/workflows/python-unittests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
unittest:
1111
strategy:
1212
matrix:
13-
python-version: [3.9, "3.10", 3.11, 3.12]
13+
python-version: ["3.10", 3.11, 3.12]
1414
platform: [linux.24_04.4x]
1515
include:
1616
- python-version: 3.12

CHANGELOG.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575

7676
## torchx-0.5.0
7777

78-
* Milestone: https://github.com/pytorch/torchx/milestone/7
78+
* Milestone: https://github.com/meta-pytorch/torchx/milestone/7
7979

8080
* `torchx.schedulers`
8181
* Kubernetes MCAD Scheduler (Prototype)
@@ -116,7 +116,7 @@
116116

117117
## torchx-0.4.0
118118

119-
* Milestone: https://github.com/pytorch/torchx/milestone/6
119+
* Milestone: https://github.com/meta-pytorch/torchx/milestone/6
120120

121121
* `torchx.schedulers`
122122
* GCP Batch (Prototype)
@@ -142,7 +142,7 @@
142142

143143
## torchx-0.3.0
144144

145-
* Milestone: https://github.com/pytorch/torchx/milestone/5
145+
* Milestone: https://github.com/meta-pytorch/torchx/milestone/5
146146

147147
* `torchx.schedulers`
148148
* List API (Prototype)
@@ -189,7 +189,7 @@
189189

190190
## torchx-0.2.0
191191

192-
* Milestone: https://github.com/pytorch/torchx/milestone/4
192+
* Milestone: https://github.com/meta-pytorch/torchx/milestone/4
193193

194194
* `torchx.schedulers`
195195
* DeviceMounts
@@ -245,7 +245,7 @@
245245

246246
## torchx-0.1.2
247247

248-
Milestone: https://github.com/pytorch/torchx/milestones/3
248+
Milestone: https://github.com/meta-pytorch/torchx/milestones/3
249249

250250
* PyTorch 1.11 Support
251251
* Python 3.10 Support
@@ -285,7 +285,7 @@ Milestone: https://github.com/pytorch/torchx/milestones/3
285285
* Ax runner now lives in the Ax repo https://github.com/facebook/Ax/commit/8e2e68f21155e918996bda0b7d97b5b9ef4e0cba
286286
* `torchx.cli`
287287
* `.torchxconfig`
288-
* You can now specify component argument defaults `.torchxconfig` https://github.com/pytorch/torchx/commit/c37cfd7846d5a0cb527dd19c8c95e881858f8f0a
288+
* You can now specify component argument defaults `.torchxconfig` https://github.com/meta-pytorch/torchx/commit/c37cfd7846d5a0cb527dd19c8c95e881858f8f0a
289289
* `~/.torchxconfig` can now be used to set user level defaults. #378
290290
* `--workspace` can be configured #397
291291
* Color change and bug fixes #419
@@ -301,7 +301,7 @@ Milestone: https://github.com/pytorch/torchx/milestones/3
301301

302302
## torchx-0.1.1
303303

304-
* Milestone: https://github.com/pytorch/torchx/milestone/2
304+
* Milestone: https://github.com/meta-pytorch/torchx/milestone/2
305305

306306
* `torchx.schedulers`
307307
* #287, #286 - Implement `local_docker` scheduler using docker client lib

CONTRIBUTING.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ lintrunner init
3939
lintrunner -a
4040
```
4141

42-
## Integration Tests
43-
44-
See the [KFP integration test](scripts/kfpint.py) file for more details on setup
45-
and running them.
46-
4742
## License
4843
By contributing to TorchX, you agree that your contributions will be licensed
4944
under the LICENSE file in the root directory of this source tree.

README.md

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[![PyPI](https://img.shields.io/pypi/v/torchx)](https://pypi.org/project/torchx/)
2-
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://github.com/pytorch/torchx/blob/main/LICENSE)
3-
![Tests](https://github.com/pytorch/torchx/actions/workflows/python-unittests.yaml/badge.svg)
4-
![Lint](https://github.com/pytorch/torchx/actions/workflows/lint.yaml/badge.svg)
2+
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://github.com/meta-pytorch/torchx/blob/main/LICENSE)
3+
![Tests](https://github.com/meta-pytorch/torchx/actions/workflows/python-unittests.yaml/badge.svg)
4+
![Lint](https://github.com/meta-pytorch/torchx/actions/workflows/lint.yaml/badge.svg)
55
[![codecov](https://codecov.io/gh/pytorch/torchx/branch/main/graph/badge.svg?token=ceHHIm0hXy)](https://codecov.io/gh/pytorch/torchx)
66

77

@@ -19,19 +19,17 @@ TorchX currently supports:
1919
* AWS Batch
2020
* Docker
2121
* Local
22-
* Ray (prototype)
23-
* GCP Batch (prototype)
2422

25-
Need a scheduler not listed? [Let us know!](https://github.com/pytorch/torchx/issues?q=is%3Aopen+is%3Aissue+label%3Ascheduler-request)
23+
Need a scheduler not listed? [Let us know!](https://github.com/meta-pytorch/torchx/issues?q=is%3Aopen+is%3Aissue+label%3Ascheduler-request)
2624

2725
## Quickstart
2826

29-
See the [quickstart guide](https://pytorch.org/torchx/latest/quickstart.html).
27+
See the [quickstart guide](https://meta-pytorch.org/torchx/latest/quickstart.html).
3028

3129
## Documentation
3230

33-
* [Stable Documentation](https://pytorch.org/torchx/latest/)
34-
* [Nightly Documentation](https://pytorch.org/torchx/main/)
31+
* [Stable Documentation](https://meta-pytorch.org/torchx/latest/)
32+
* [Nightly Documentation](https://meta-pytorch.org/torchx/main/)
3533

3634
## Requirements
3735

@@ -55,15 +53,9 @@ pip install torchx
5553
# install torchx sdk and CLI -- all dependencies
5654
pip install "torchx[dev]"
5755

58-
# install torchx kubeflow pipelines (kfp) support
59-
pip install "torchx[kfp]"
60-
6156
# install torchx Kubernetes / Volcano support
6257
pip install "torchx[kubernetes]"
6358

64-
# install torchx Ray support
65-
pip install "torchx[ray]"
66-
6759
# install torchx GCP Batch support
6860
pip install "torchx[gcp_batch]"
6961
```
@@ -79,22 +71,22 @@ pip install torchx-nightly[dev]
7971

8072
```bash
8173
# install torchx sdk and CLI from source
82-
$ pip install -e git+https://github.com/pytorch/torchx.git#egg=torchx
74+
$ pip install -e git+https://github.com/meta-pytorch/torchx.git#egg=torchx
8375

8476
# install extra dependencies
85-
$ pip install -e git+https://github.com/pytorch/torchx.git#egg=torchx[dev]
77+
$ pip install -e git+https://github.com/meta-pytorch/torchx.git#egg=torchx[dev]
8678
```
8779

8880
### Docker
8981

9082
TorchX provides a docker container for using as as part of a TorchX role.
9183

92-
See: https://github.com/pytorch/torchx/pkgs/container/torchx
84+
See: https://github.com/meta-pytorch/torchx/pkgs/container/torchx
9385

9486
## Contributing
9587

96-
We welcome PRs! See the [CONTRIBUTING](https://github.com/pytorch/torchx/blob/main/CONTRIBUTING.md) file.
88+
We welcome PRs! See the [CONTRIBUTING](https://github.com/meta-pytorch/torchx/blob/main/CONTRIBUTING.md) file.
9789

9890
## License
9991

100-
TorchX is BSD licensed, as found in the [LICENSE](https://github.com/pytorch/torchx/blob/main/LICENSE) file.
92+
TorchX is BSD licensed, as found in the [LICENSE](https://github.com/meta-pytorch/torchx/blob/main/LICENSE) file.

0 commit comments

Comments
 (0)