From 6e1e01d289abaa417deda97985a476eff8662e90 Mon Sep 17 00:00:00 2001 From: Deepali Chourasia Date: Fri, 28 Oct 2022 12:29:27 +0000 Subject: [PATCH 1/6] add lightning-app --- config/build-config.yaml | 9 ++++ lightning-app/0301-fix-tests.patch | 10 ++++ lightning-app/0302-skip-horovod-tests.patch | 40 ++++++++++++++ lightning-app/meta.yaml | 60 +++++++++++++++++++++ lightning-cloud/meta.yaml | 48 +++++++++++++++++ lightning-utilities/meta.yaml | 42 +++++++++++++++ lightning/meta.yaml | 5 +- 7 files changed, 212 insertions(+), 2 deletions(-) create mode 100644 lightning-app/0301-fix-tests.patch create mode 100644 lightning-app/0302-skip-horovod-tests.patch create mode 100644 lightning-app/meta.yaml create mode 100644 lightning-cloud/meta.yaml create mode 100644 lightning-utilities/meta.yaml diff --git a/config/build-config.yaml b/config/build-config.yaml index 3c9e548..33a61c1 100644 --- a/config/build-config.yaml +++ b/config/build-config.yaml @@ -5,5 +5,14 @@ recipes: - name : pydeprecate path : pydeprecate + - name : lightning-utilities + path : lightning-utilities + + - name : lightning-cloud + path : lightning-cloud + + - name : lightning-app + path : lightning-app + - name : pytorch-lightning path : lightning diff --git a/lightning-app/0301-fix-tests.patch b/lightning-app/0301-fix-tests.patch new file mode 100644 index 0000000..52e7e5c --- /dev/null +++ b/lightning-app/0301-fix-tests.patch @@ -0,0 +1,10 @@ +diff --git a/requirements/test.txt b/requirements/test.txt +index de749e233..17b84ed22 100644 +--- a/requirements/test.txt ++++ b/requirements/test.txt +@@ -11,5 +11,4 @@ pre-commit>=1.0 + # needed in tests + cloudpickle>=1.3 + scikit-learn>0.22.1 +-onnxruntime + pandas # needed in benchmarks diff --git a/lightning-app/0302-skip-horovod-tests.patch b/lightning-app/0302-skip-horovod-tests.patch new file mode 100644 index 0000000..111697b --- /dev/null +++ b/lightning-app/0302-skip-horovod-tests.patch @@ -0,0 +1,40 @@ +diff --git a/tests/models/test_horovod.py b/tests/models/test_horovod.py +index 52d1fe666..02c693313 100644 +--- a/tests/models/test_horovod.py ++++ b/tests/models/test_horovod.py +@@ -135,7 +135,7 @@ def test_horovod_cpu_implicit(tmpdir): + _run_horovod(trainer_options) + + +-@RunIf(min_gpus=2, horovod_nccl=True, skip_windows=True) ++@RunIf(min_gpus=2, horovod=True, horovod_nccl=True, skip_windows=True) + def test_horovod_multi_gpu(tmpdir): + """Test Horovod with multi-GPU support.""" + trainer_options = dict( +@@ -185,7 +185,7 @@ def test_horovod_raises_unsupported_accumulate_grad_batches(tmpdir): + trainer.fit(model) + + +-@RunIf(min_gpus=2, horovod_nccl=True, skip_windows=True) ++@RunIf(min_gpus=2, horovod=True, horovod_nccl=True, skip_windows=True) + def test_horovod_multi_gpu_grad_by_value(tmpdir): + """Test Horovod with multi-GPU support.""" + trainer_options = dict( +@@ -226,7 +226,7 @@ def test_horovod_apex(tmpdir): + _run_horovod(trainer_options) + + +-@RunIf(min_gpus=2, horovod_nccl=True, skip_windows=True) ++@RunIf(min_gpus=2, horovod=True, horovod_nccl=True, skip_windows=True) + def test_horovod_amp(tmpdir): + """Test Horovod with multi-GPU support using native amp.""" + trainer_options = dict( +@@ -245,7 +245,7 @@ def test_horovod_amp(tmpdir): + _run_horovod(trainer_options) + + +-@RunIf(min_gpus=2, horovod_nccl=True, skip_windows=True) ++@RunIf(min_gpus=2, horovod=True, horovod_nccl=True, skip_windows=True) + def test_horovod_gather(tmpdir): + """Test Horovod with multi-GPU support using native amp.""" + trainer_options = dict( diff --git a/lightning-app/meta.yaml b/lightning-app/meta.yaml new file mode 100644 index 0000000..100e53b --- /dev/null +++ b/lightning-app/meta.yaml @@ -0,0 +1,60 @@ +{% set name = "lightning-app" %} +{% set version = "0.6.3" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz + sha256: 238aabb747fef3911d5551039e8c4d3d24d73d9b452a6042eb19b3813dceeee5 + +build: + number: 1 + noarch: python + string: pyh{{ PKG_HASH }}_{{ PKG_BUILDNUM }} + script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed . -vv + +requirements: + host: + - pip {{ pip }} + - python + run: + - packaging + - python + - lightning-utilities + - lightning-cloud + - deepdiff + - croniter + - fastapi + - websockets + - click + - requests + - rich + - fsspec {{ fsspec }} + - uvicorn + - six + - websocket-client + - beautifulsoup4 + - starsessions + - s3fs + - arrow + - traitlets + +test: + imports: + - lightning_app + commands: + - pip check + +about: + home: https://pypi.org/project/pytorch-lightning/ + summary: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate. + description: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate. + license: Apache-2.0 + license_family: Apache + license_file: LICENSE + +extra: + recipe-maintainers: + - open-ce/open-ce-dev-team diff --git a/lightning-cloud/meta.yaml b/lightning-cloud/meta.yaml new file mode 100644 index 0000000..c635147 --- /dev/null +++ b/lightning-cloud/meta.yaml @@ -0,0 +1,48 @@ +{% set name = "lightning-cloud" %} +{% set version = "0.5.7" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/lightning_cloud-{{ version }}.tar.gz + sha256: d8bfd825403686d686788d19f77495400e25d0d925667cf086a647eacb5ac8f5 + +build: + number: 1 + noarch: python + string: pyh{{ PKG_HASH }}_{{ PKG_BUILDNUM }} + script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed . -vv + +requirements: + host: + - pip {{ pip }} + - python + run: + - python + - click + - requests + - rich + - pyjwt + - fastapi + - six + - websocket-client + +test: + imports: + - lightning_cloud + commands: + - pip check + +about: + home: https://pypi.org/project/pytorch-lightning/ + summary: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate. + description: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate. + license: Apache-2.0 + license_family: Apache + license_file: LICENSE + +extra: + recipe-maintainers: + - open-ce/open-ce-dev-team diff --git a/lightning-utilities/meta.yaml b/lightning-utilities/meta.yaml new file mode 100644 index 0000000..e636e04 --- /dev/null +++ b/lightning-utilities/meta.yaml @@ -0,0 +1,42 @@ +{% set name = "lightning-utilities" %} +{% set version = "0.3.0" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz + sha256: d769ab9b76ebdee3243d1051d509aafee57d7947734ddc22977deef8a6427f2f + +build: + number: 1 + noarch: python + string: pyh{{ PKG_HASH }}_{{ PKG_BUILDNUM }} + script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed . -vv + +requirements: + host: + - pip {{ pip }} + - python + run: + - python + - fire + +test: + imports: + - lightning_utilities + commands: + - pip check + +about: + home: https://pypi.org/project/pytorch-lightning/ + summary: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate. + description: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate. + license: Apache-2.0 + license_family: Apache + license_file: LICENSE + +extra: + recipe-maintainers: + - open-ce/open-ce-dev-team diff --git a/lightning/meta.yaml b/lightning/meta.yaml index 8de2385..9cbe028 100644 --- a/lightning/meta.yaml +++ b/lightning/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pytorch-lightning" %} -{% set version = "1.6.5" %} +{% set version = "1.7.7" %} package: name: {{ name|lower }} @@ -13,7 +13,7 @@ build: number: 1 noarch: python string: pyh{{ PKG_HASH }}_{{ PKG_BUILDNUM }} - script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed . -vv + script: export PACKAGE_NAME=pytorch; {{ PYTHON }} -m pip install . --no-deps --ignore-installed . -vv requirements: build: @@ -34,6 +34,7 @@ requirements: - fsspec {{ fsspec }} - torchmetrics {{ torchmetrics }} - pyDeprecate 0.3.2 + test: imports: - pytorch_lightning From cd37db0b89a46c134753356d681363590ccc17b5 Mon Sep 17 00:00:00 2001 From: Deepali Chourasia Date: Wed, 16 Nov 2022 13:05:16 +0000 Subject: [PATCH 2/6] update to v1.8.1 --- lightning/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lightning/meta.yaml b/lightning/meta.yaml index 9cbe028..7f98374 100644 --- a/lightning/meta.yaml +++ b/lightning/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pytorch-lightning" %} -{% set version = "1.7.7" %} +{% set version = "1.8.1" %} package: name: {{ name|lower }} @@ -34,6 +34,7 @@ requirements: - fsspec {{ fsspec }} - torchmetrics {{ torchmetrics }} - pyDeprecate 0.3.2 + - lightning-utilities test: imports: From 4076588af2c0ec9172171eb8028aae5b73a7fa11 Mon Sep 17 00:00:00 2001 From: Deepali Chourasia Date: Fri, 18 Nov 2022 10:10:05 +0000 Subject: [PATCH 3/6] update patch --- lightning/0301-fix-tests.patch | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lightning/0301-fix-tests.patch b/lightning/0301-fix-tests.patch index 52e7e5c..1518a6f 100644 --- a/lightning/0301-fix-tests.patch +++ b/lightning/0301-fix-tests.patch @@ -1,10 +1,12 @@ -diff --git a/requirements/test.txt b/requirements/test.txt -index de749e233..17b84ed22 100644 ---- a/requirements/test.txt -+++ b/requirements/test.txt -@@ -11,5 +11,4 @@ pre-commit>=1.0 +diff --git a/requirements/pytorch/test.txt b/requirements/pytorch/test.txt +index fbd65ff0e..94cdcfa92 100644 +--- a/requirements/pytorch/test.txt ++++ b/requirements/pytorch/test.txt +@@ -9,7 +9,6 @@ pre-commit==2.20.0 # needed in tests - cloudpickle>=1.3 - scikit-learn>0.22.1 --onnxruntime - pandas # needed in benchmarks + cloudpickle>=1.3, <=2.1.0 + scikit-learn>0.22.1, <1.1.3 +-onnxruntime<1.13.0 + psutil<5.9.4 # for `DeviceStatsMonitor` + pandas>1.0, <1.5.2 # needed in benchmarks + fastapi<0.87.0 From d143c6312cdb58b4afe00effd72fc9e0a32b3403 Mon Sep 17 00:00:00 2001 From: Deepali Chourasia Date: Mon, 21 Nov 2022 12:59:31 +0000 Subject: [PATCH 4/6] more updates --- config/build-config.yaml | 5 ++- lightning-api-access/meta.yaml | 44 +++++++++++++++++++++ lightning-app/0301-fix-tests.patch | 10 ----- lightning-app/0302-skip-horovod-tests.patch | 40 ------------------- lightning-app/meta.yaml | 14 ++++--- lightning-cloud/meta.yaml | 4 +- lightning/meta.yaml | 20 +++++----- tests/open-ce-tests.yaml | 10 +++-- 8 files changed, 75 insertions(+), 72 deletions(-) create mode 100644 lightning-api-access/meta.yaml delete mode 100644 lightning-app/0301-fix-tests.patch delete mode 100644 lightning-app/0302-skip-horovod-tests.patch diff --git a/config/build-config.yaml b/config/build-config.yaml index 33a61c1..85d5a7b 100644 --- a/config/build-config.yaml +++ b/config/build-config.yaml @@ -11,8 +11,11 @@ recipes: - name : lightning-cloud path : lightning-cloud + - name : lightning-api-access + path : lightning-api-access + - name : lightning-app path : lightning-app - - name : pytorch-lightning + - name : lightning path : lightning diff --git a/lightning-api-access/meta.yaml b/lightning-api-access/meta.yaml new file mode 100644 index 0000000..14a04cc --- /dev/null +++ b/lightning-api-access/meta.yaml @@ -0,0 +1,44 @@ +{% set version = "0.0.1" %} + +package: + name: lightning-api-access + version: {{ version }} + +source: + url: https://files.pythonhosted.org/packages/bf/bf/c3937a5a981a429a66bdd186454d1ecaf311c0337812d6bce2045c817835/lightning_api_access-{{ version }}-py3-none-any.whl + sha256: dd9dd9a2a5b32b563fd6609e6f01c582a41f9a6239d8e6012d7e5ec3c9a286aa + +build: + noarch: python + number: 1 + script: "python -m pip install lightning_api_access-{{ version }}*.whl --no-deps --ignore-installed -vv " + +requirements: + host: + - python + - pip + run: + - python + - lightning + - fastapi + - websockets + - deepdiff + - lightning-cloud + - uvicorn + - bs4 + - croniter + +test: + imports: + - lightning_api_access + + +about: + home: https://github.com/Lightning-AI/LAI-API-Access-UI-Component + license: Apache License 2.0 +# license_file: LICENSE + summary: Lightning API Access UI Component + +extra: + recipe-maintainers: + - open-ce/open-ce-dev-team diff --git a/lightning-app/0301-fix-tests.patch b/lightning-app/0301-fix-tests.patch deleted file mode 100644 index 52e7e5c..0000000 --- a/lightning-app/0301-fix-tests.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/requirements/test.txt b/requirements/test.txt -index de749e233..17b84ed22 100644 ---- a/requirements/test.txt -+++ b/requirements/test.txt -@@ -11,5 +11,4 @@ pre-commit>=1.0 - # needed in tests - cloudpickle>=1.3 - scikit-learn>0.22.1 --onnxruntime - pandas # needed in benchmarks diff --git a/lightning-app/0302-skip-horovod-tests.patch b/lightning-app/0302-skip-horovod-tests.patch deleted file mode 100644 index 111697b..0000000 --- a/lightning-app/0302-skip-horovod-tests.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/tests/models/test_horovod.py b/tests/models/test_horovod.py -index 52d1fe666..02c693313 100644 ---- a/tests/models/test_horovod.py -+++ b/tests/models/test_horovod.py -@@ -135,7 +135,7 @@ def test_horovod_cpu_implicit(tmpdir): - _run_horovod(trainer_options) - - --@RunIf(min_gpus=2, horovod_nccl=True, skip_windows=True) -+@RunIf(min_gpus=2, horovod=True, horovod_nccl=True, skip_windows=True) - def test_horovod_multi_gpu(tmpdir): - """Test Horovod with multi-GPU support.""" - trainer_options = dict( -@@ -185,7 +185,7 @@ def test_horovod_raises_unsupported_accumulate_grad_batches(tmpdir): - trainer.fit(model) - - --@RunIf(min_gpus=2, horovod_nccl=True, skip_windows=True) -+@RunIf(min_gpus=2, horovod=True, horovod_nccl=True, skip_windows=True) - def test_horovod_multi_gpu_grad_by_value(tmpdir): - """Test Horovod with multi-GPU support.""" - trainer_options = dict( -@@ -226,7 +226,7 @@ def test_horovod_apex(tmpdir): - _run_horovod(trainer_options) - - --@RunIf(min_gpus=2, horovod_nccl=True, skip_windows=True) -+@RunIf(min_gpus=2, horovod=True, horovod_nccl=True, skip_windows=True) - def test_horovod_amp(tmpdir): - """Test Horovod with multi-GPU support using native amp.""" - trainer_options = dict( -@@ -245,7 +245,7 @@ def test_horovod_amp(tmpdir): - _run_horovod(trainer_options) - - --@RunIf(min_gpus=2, horovod_nccl=True, skip_windows=True) -+@RunIf(min_gpus=2, horovod=True, horovod_nccl=True, skip_windows=True) - def test_horovod_gather(tmpdir): - """Test Horovod with multi-GPU support using native amp.""" - trainer_options = dict( diff --git a/lightning-app/meta.yaml b/lightning-app/meta.yaml index 100e53b..2d2964d 100644 --- a/lightning-app/meta.yaml +++ b/lightning-app/meta.yaml @@ -1,13 +1,13 @@ {% set name = "lightning-app" %} -{% set version = "0.6.3" %} +{% set version = "1.8.2" %} package: name: {{ name|lower }} version: {{ version }} source: - url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 238aabb747fef3911d5551039e8c4d3d24d73d9b452a6042eb19b3813dceeee5 + url: https://github.com/Lightning-AI/lightning/releases/download/{{ version }}/{{ name }}-{{ version }}.tar.gz + sha256: 990f9af72cbc79c0f1536486b1abf86aca7dfccbd330ba718f9af61e2c837756 build: number: 1 @@ -22,8 +22,10 @@ requirements: run: - packaging - python + - lightning - lightning-utilities - lightning-cloud + - lightning-api-access - deepdiff - croniter - fastapi @@ -40,12 +42,14 @@ requirements: - s3fs - arrow - traitlets + - psutil + - inquirer test: imports: - lightning_app - commands: - - pip check +# commands: +# - pip check about: home: https://pypi.org/project/pytorch-lightning/ diff --git a/lightning-cloud/meta.yaml b/lightning-cloud/meta.yaml index c635147..c06a86b 100644 --- a/lightning-cloud/meta.yaml +++ b/lightning-cloud/meta.yaml @@ -1,5 +1,5 @@ {% set name = "lightning-cloud" %} -{% set version = "0.5.7" %} +{% set version = "0.5.11" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/lightning_cloud-{{ version }}.tar.gz - sha256: d8bfd825403686d686788d19f77495400e25d0d925667cf086a647eacb5ac8f5 + sha256: 33ca411d8f88dd690ba7af82260e1e27546471954cfa042221781627144288b7 build: number: 1 diff --git a/lightning/meta.yaml b/lightning/meta.yaml index 7f98374..9416314 100644 --- a/lightning/meta.yaml +++ b/lightning/meta.yaml @@ -1,19 +1,19 @@ -{% set name = "pytorch-lightning" %} -{% set version = "1.8.1" %} +{% set name = "lightning" %} +{% set version = "1.8.2" %} package: name: {{ name|lower }} version: {{ version }} source: - git_url: https://github.com/PyTorchLightning/pytorch-lightning + git_url: https://github.com/Lightning-AI/lightning git_rev: {{ version }} build: number: 1 noarch: python string: pyh{{ PKG_HASH }}_{{ PKG_BUILDNUM }} - script: export PACKAGE_NAME=pytorch; {{ PYTHON }} -m pip install . --no-deps --ignore-installed . -vv + script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed . -vv requirements: build: @@ -36,14 +36,14 @@ requirements: - pyDeprecate 0.3.2 - lightning-utilities -test: - imports: - - pytorch_lightning - commands: - - pip check +#test: +# imports: +# - lightning +# commands: +# - pip check about: - home: https://pypi.org/project/pytorch-lightning/ + home: https://github.com/Lightning-AI/lightning summary: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate. description: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate. license: Apache-2.0 diff --git a/tests/open-ce-tests.yaml b/tests/open-ce-tests.yaml index 350fba0..4372100 100644 --- a/tests/open-ce-tests.yaml +++ b/tests/open-ce-tests.yaml @@ -8,9 +8,8 @@ tests: cd pytorch-lightning git checkout ${PL_COMMIT} git apply $FEEDSTOCK_DIR/lightning/0301-fix-tests.patch - git apply $FEEDSTOCK_DIR/lightning/0302-skip-horovod-tests.patch - conda install -y scikit-learn>=0.22.2 numba regex typed-ast pandas scikit-image coverage cryptography - pip install -r requirements/test.txt + conda install -y "scikit-learn>=0.22.2, <1.1.3" regex typed-ast pandas scikit-image coverage cryptography psutil + pip install -r requirements/pytorch/test.txt pip install sklearn omegaconf rich jsonargparse docstring-parser - name: Run PyTorch-Lightning tests command: | @@ -33,6 +32,10 @@ tests: "not test_callbacks_restore" ) TESTSUITES_TO_SKIP=( + tests/tests_app/utilities/packaging/test_app_config.py + tests/tests_app/core/test_queues.py + tests/tests_pytorch/models/test_onnx.py + tests/tests_app_examples/test_commands_and_api.py tests/models/test_onnx.py tests/checkpointing/test_legacy_checkpoints.py tests/trainer/test_dataloaders.py @@ -86,7 +89,6 @@ tests: do TEST_SUITES+="${test_suite} " done - pytest -v ${TEST_SUITES} - name: Clean tests command: rm -rf torchmetrics From 3a995e8727d0dcb30bb54d3447023143606561ab Mon Sep 17 00:00:00 2001 From: Deepali Chourasia Date: Mon, 21 Nov 2022 15:05:45 +0000 Subject: [PATCH 5/6] more changes --- lightning-api-access/meta.yaml | 4 ++-- lightning-app/meta.yaml | 30 +++++++++++++++--------------- lightning-cloud/meta.yaml | 6 +++--- lightning-utilities/meta.yaml | 6 +++--- lightning/meta.yaml | 10 +++++----- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lightning-api-access/meta.yaml b/lightning-api-access/meta.yaml index 14a04cc..e592ec2 100644 --- a/lightning-api-access/meta.yaml +++ b/lightning-api-access/meta.yaml @@ -19,7 +19,7 @@ requirements: - pip run: - python - - lightning + - lightning {{ pytorch_lightning }} - fastapi - websockets - deepdiff @@ -36,8 +36,8 @@ test: about: home: https://github.com/Lightning-AI/LAI-API-Access-UI-Component license: Apache License 2.0 -# license_file: LICENSE summary: Lightning API Access UI Component + description: Lightning API Access UI Component extra: recipe-maintainers: diff --git a/lightning-app/meta.yaml b/lightning-app/meta.yaml index 2d2964d..c042fa3 100644 --- a/lightning-app/meta.yaml +++ b/lightning-app/meta.yaml @@ -22,28 +22,28 @@ requirements: run: - packaging - python - - lightning + - lightning {{ pytorch_lightning }} - lightning-utilities - lightning-cloud - lightning-api-access - - deepdiff - - croniter + - deepdiff >=5.7.0, <=5.8.1 + - croniter >=1.3.0, <1.4.0 - fastapi - websockets - - click - - requests + - click {{ click }} + - requests {{ requests }} - rich - fsspec {{ fsspec }} - uvicorn - - six + - six {{ six }} - websocket-client - beautifulsoup4 - - starsessions - - s3fs - - arrow - - traitlets - - psutil - - inquirer + - starsessions >=1.2.1, <2.0 + - s3fs >=2022.5.0, <2022.8.3 + - arrow >=1.2.0, <1.2.4 + - traitlets >=5.3.0, <=5.4.0 + - psutil {{ psutil }} + - inquirer >=2.10.0 test: imports: @@ -52,9 +52,9 @@ test: # - pip check about: - home: https://pypi.org/project/pytorch-lightning/ - summary: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate. - description: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate. + home: https://github.com/Lightning-AI/lightning + summary: Use Lightning Apps to build everything from production-ready, multi-cloud ML systems to simple research demos. + description: Use Lightning Apps to build everything from production-ready, multi-cloud ML systems to simple research demos. license: Apache-2.0 license_family: Apache license_file: LICENSE diff --git a/lightning-cloud/meta.yaml b/lightning-cloud/meta.yaml index c06a86b..1efcb91 100644 --- a/lightning-cloud/meta.yaml +++ b/lightning-cloud/meta.yaml @@ -36,9 +36,9 @@ test: - pip check about: - home: https://pypi.org/project/pytorch-lightning/ - summary: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate. - description: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate. + home: https://lightning.ai/ + summary: Lightning Cloud. + description: Lightning Cloud. license: Apache-2.0 license_family: Apache license_file: LICENSE diff --git a/lightning-utilities/meta.yaml b/lightning-utilities/meta.yaml index e636e04..6e4c2c2 100644 --- a/lightning-utilities/meta.yaml +++ b/lightning-utilities/meta.yaml @@ -30,9 +30,9 @@ test: - pip check about: - home: https://pypi.org/project/pytorch-lightning/ - summary: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate. - description: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate. + home: https://github.com/Lightning-AI/utilities + summary: Lightning Utilities. + description: Lightning Utilities. license: Apache-2.0 license_family: Apache license_file: LICENSE diff --git a/lightning/meta.yaml b/lightning/meta.yaml index 9416314..701830e 100644 --- a/lightning/meta.yaml +++ b/lightning/meta.yaml @@ -36,11 +36,11 @@ requirements: - pyDeprecate 0.3.2 - lightning-utilities -#test: -# imports: -# - lightning -# commands: -# - pip check +test: + imports: + - lightning + commands: + - pip check about: home: https://github.com/Lightning-AI/lightning From 8819b2faa37c3ac7467e7072839b6050fdf71bcf Mon Sep 17 00:00:00 2001 From: Deepali Chourasia Date: Tue, 22 Nov 2022 08:19:28 +0000 Subject: [PATCH 6/6] update tests --- lightning/0301-fix-tests.patch | 4 +-- tests/open-ce-tests.yaml | 50 +++++++--------------------------- 2 files changed, 12 insertions(+), 42 deletions(-) diff --git a/lightning/0301-fix-tests.patch b/lightning/0301-fix-tests.patch index 1518a6f..160eb32 100644 --- a/lightning/0301-fix-tests.patch +++ b/lightning/0301-fix-tests.patch @@ -1,12 +1,12 @@ diff --git a/requirements/pytorch/test.txt b/requirements/pytorch/test.txt -index fbd65ff0e..94cdcfa92 100644 +index 5ba99b269..a646c027a 100644 --- a/requirements/pytorch/test.txt +++ b/requirements/pytorch/test.txt @@ -9,7 +9,6 @@ pre-commit==2.20.0 # needed in tests cloudpickle>=1.3, <=2.1.0 scikit-learn>0.22.1, <1.1.3 --onnxruntime<1.13.0 +-onnxruntime<1.14.0 psutil<5.9.4 # for `DeviceStatsMonitor` pandas>1.0, <1.5.2 # needed in benchmarks fastapi<0.87.0 diff --git a/tests/open-ce-tests.yaml b/tests/open-ce-tests.yaml index 4372100..3647ac1 100644 --- a/tests/open-ce-tests.yaml +++ b/tests/open-ce-tests.yaml @@ -1,7 +1,7 @@ tests: - name: Setup PyTorch-Lightning Tests command: | - PL_VERSION=$(python -c "import pytorch_lightning; print(pytorch_lightning.__version__)") + PL_VERSION=$(python -c "import lightning; print(lightning.__version__)") PL_COMMIT=${PL_VERSION#*+} conda install -y git git clone https://github.com/PyTorchLightning/pytorch-lightning.git @@ -14,47 +14,18 @@ tests: - name: Run PyTorch-Lightning tests command: | cd pytorch-lightning - SKIPPED_TESTS=( - "not test_gpu_stats_monitor_cpu_machine and" - "not test_amp_gpus and" - "not test_boring_lite_model_single_device and" - "not test_lite_module_forward_conversion and" - "not test_gradient_clipping_by_norm and" - "not test_gradient_clipping_by_value and" - "not test_models and" - "not tests.helpers.datasets.TrialMNIST and" - "not test_optimizers_and_lr_schedulers and" - "not test_ddp_all_dataloaders_passed_to_fit and" - "not test_multiple_optimizers_step and" - "not test_unbalanced_logging_with_multiple_optimizers and" - "not test_proper_refcount and" - "not test_tensor_to_float_conversion and" - "not test_callbacks_restore" - ) - TESTSUITES_TO_SKIP=( - tests/tests_app/utilities/packaging/test_app_config.py - tests/tests_app/core/test_queues.py - tests/tests_pytorch/models/test_onnx.py - tests/tests_app_examples/test_commands_and_api.py - tests/models/test_onnx.py - tests/checkpointing/test_legacy_checkpoints.py - tests/trainer/test_dataloaders.py - tests/trainer/test_trainer.py - tests/tuner/test_scale_batch_size.py - tests/trainer/test_trainer_tricks.py - tests/helpers/test_datasets.py - tests/utilities/test_auto_restart.py - tests/strategies/test_common.py - tests/models/test_amp.py - tests/models/test_restore.py + TESTSUITES_TO_RUN=( + tests/tests_pytorch/test_cli.py + tests/tests_pytorch/accelerators + tests/tests_pytorch/trainer/test_trainer.py + tests/tests_pytorch/strategies ) - - for skipped_test in "${TESTSUITES_TO_SKIP[@]}" + for test_suite in "${TESTSUITES_TO_RUN[@]}" do - SKIPPED_TEST_SUITES+="--ignore $skipped_test " + TEST_SUITES+="$test_suite " done - pytest -k "${SKIPPED_TESTS[*]}" ${SKIPPED_TEST_SUITES} -v tests/ + pytest -v ${TEST_SUITES} - name: Clean tests command: rm -rf pytorch-lightning - name: Setup torchmetrics Tests @@ -70,7 +41,7 @@ tests: then ARCH="64" fi - conda install -y scikit-learn>=0.22.2 numba regex typed-ast scikit-image nltk gcc_linux-${ARCH} coverage cryptography pandas + conda install -y scikit-learn>=0.22.2 regex typed-ast scikit-image nltk gcc_linux-${ARCH} coverage cryptography pandas pip install -r requirements/test.txt pip install torch-fidelity - name: Run torchmetrics tests @@ -81,7 +52,6 @@ tests: tests/bases/test_aggregation.py tests/classification/test_accuracy.py tests/detection/test_map.py - tests/image/test_inception.py tests/regression/test_r2.py tests/retrieval/test_ndcg.py )