Skip to content

Commit

Permalink
Merge branch 'master' into fix/deepspeed_apx_lvl
Browse files Browse the repository at this point in the history
  • Loading branch information
rohitgr7 authored Jul 29, 2022
2 parents b9814ae + caaf356 commit 468c37d
Show file tree
Hide file tree
Showing 25 changed files with 2,663 additions and 2,614 deletions.
8 changes: 4 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,16 +202,16 @@ We recommend creating a PR in a separate branch other than `master`, especially
First, make sure you have set [upstream](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork) by running:

```bash
git remote add upstream https://github.com/PyTorchLightning/pytorch-lightning.git
git remote add upstream https://github.com/Lightning-AI/lightning.git
```

You'll know its set up right if you run `git remote -v` and see something similar to this:

```bash
origin https://github.com/{YOUR_USERNAME}/pytorch-lightning.git (fetch)
origin https://github.com/{YOUR_USERNAME}/pytorch-lightning.git (push)
upstream https://github.com/PyTorchLightning/pytorch-lightning.git (fetch)
upstream https://github.com/PyTorchLightning/pytorch-lightning.git (push)
upstream https://github.com/Lightning-AI/lightning.git (fetch)
upstream https://github.com/Lightning-AI/lightning.git (push)
```

Checkout your feature branch and rebase it with upstream's master before pushing up your feature branch:
Expand Down Expand Up @@ -319,7 +319,7 @@ NOTE: Once you edit one of these files, remember to `source` it or restart your
plclone (){
git clone https://github.com/{YOUR_USERNAME}/pytorch-lightning.git
cd pytorch-lightning
git remote add upstream https://github.com/PyTorchLightning/pytorch-lightning.git
git remote add upstream https://github.com/Lightning-AI/lightning.git
# This is just here to print out info about your remote upstream/origin
git remote -v
}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@

## Code Quality

| workflow file | action |
| --------------------------------- | ----------------------------------------------------------------------------------------------------- |
| .codecov.yml | Measure test coverage with [codecov.io](https://app.codecov.io/gh/PyTorchLightning/pytorch-lightning) |
| .github/workflows/code-checks.yml | Check Python typing with [MyPy](https://mypy.readthedocs.io/en/stable/). |
| .github/workflows/ci_schema.yml | Validate the syntax of workflow files. |
| workflow file | action |
| --------------------------------- | ----------------------------------------------------------------------------------------- |
| .codecov.yml | Measure test coverage with [codecov.io](https://app.codecov.io/gh/Lightning-AI/lightning) |
| .github/workflows/code-checks.yml | Check Python typing with [MyPy](https://mypy.readthedocs.io/en/stable/). |
| .github/workflows/ci_schema.yml | Validate the syntax of workflow files. |

## Others

Expand Down
51 changes: 25 additions & 26 deletions README.md

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion dockers/tpu-tests/tpu_test_cases.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@ local tputests = base.BaseTest {
git checkout {SHA}
export PACKAGE_NAME=pytorch
export FREEZE_REQUIREMENTS=1
export PL_STANDALONE_TESTS_BATCH_SIZE=1
pip install -e .[test]
echo $KUBE_GOOGLE_CLOUD_TPU_ENDPOINTS
export XRT_TPU_CONFIG="tpu_worker;0;${KUBE_GOOGLE_CLOUD_TPU_ENDPOINTS:7}"
export PL_RUN_TPU_TESTS=1
cd tests/tests_pytorch
coverage run --source=pytorch_lightning -m pytest -vv --durations=0 ./
echo "\n||| Running standalone tests |||\n"
bash run_standalone_tests.sh -b 1
bash run_standalone_tests.sh
test_exit_code=$?
echo "\n||| END PYTEST LOGS |||\n"
coverage xml
Expand Down
8 changes: 4 additions & 4 deletions docs/source-pytorch/_templates/theme_variables.jinja
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{%- set external_urls = {
'github': 'https://github.com/PyTorchLightning/pytorch-lightning',
'github_issues': 'https://github.com/PyTorchLightning/pytorch-lightning/issues',
'contributing': 'https://github.com/PyTorchLightning/pytorch-lightning/blob/master/CONTRIBUTING.md',
'github': 'https://github.com/Lightning-AI/lightning',
'github_issues': 'https://github.com/Lightning-AI/lightning/issues',
'contributing': 'https://github.com/Lightning-AI/lightning/blob/master/.github/CONTRIBUTING.md',
'governance': 'https://pytorch-lightning.readthedocs.io/en/latest/governance.html',
'docs': 'https://pytorch-lightning.rtfd.io/en/latest',
'twitter': 'https://twitter.com/PyTorchLightnin',
Expand All @@ -15,6 +15,6 @@
'resources': 'https://pytorch-lightning.readthedocs.io/en/latest/#community-examples',
'support': 'https://pytorch-lightning.rtfd.io/en/latest/',
'community': 'https://www.pytorchlightning.ai/community',
'forums': 'https://github.com/PyTorchLightning/pytorch-lightning/discussions',
'forums': 'https://github.com/Lightning-AI/lightning/discussions',
}
-%}
4 changes: 2 additions & 2 deletions docs/source-pytorch/starter/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ are not published yet. This is the bleeding edge, so use it at your own discreti

.. code-block:: bash
pip install https://github.com/PyTorchLightning/pytorch-lightning/archive/master.zip
pip install https://github.com/Lightning-AI/lightning/archive/refs/heads/master.zip -U
Install future patch releases from the source. Note that the patch release contains only the bug fixes for the recent major release.

.. code-block:: bash
pip install https://github.com/PyTorchLightning/pytorch-lightning/archive/refs/heads/release/1.5.x.zip
pip install https://github.com/Lightning-AI/lightning/archive/refs/heads/release/pytorch.zip -U
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ module = [
"pytorch_lightning.profilers.pytorch",
"pytorch_lightning.profilers.simple",
"pytorch_lightning.strategies.ddp",
"pytorch_lightning.strategies.ddp_spawn",
"pytorch_lightning.strategies.fully_sharded",
"pytorch_lightning.strategies.ipu",
"pytorch_lightning.strategies.sharded",
Expand Down
2 changes: 1 addition & 1 deletion src/lightning_app/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

### Changed

- Update the Lightning App docs ([#13537](https://github.com/PyTorchLightning/pytorch-lightning/pull/13537))
- Update the Lightning App docs ([#13537](https://github.com/Lightning-AI/lightning/pull/13537))

### Changed

Expand Down
Loading

0 comments on commit 468c37d

Please sign in to comment.