Skip to content

Commit

Permalink
revert rename
Browse files Browse the repository at this point in the history
  • Loading branch information
Borda committed Oct 2, 2023
1 parent 286477c commit 0a8d1f6
Show file tree
Hide file tree
Showing 18 changed files with 22 additions and 22 deletions.
10 changes: 5 additions & 5 deletions .azure/gpu-integrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@ jobs:
pip install -q packaging fire requests wget
python -m wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py
python adjust-torch-versions.py requirements/base.txt $(torch-ver)
python adjust-torch-versions.py requirements/_integrate.txt $(torch-ver)
python adjust-torch-versions.py requirements/integrate.txt $(torch-ver)
# FixMe: this shall not be for all integrations/cases
python .github/assistant.py set-oldest-versions --req_files='["requirements/_integrate.txt"]'
cat requirements/_integrate.txt
python .github/assistant.py set-oldest-versions --req_files='["requirements/integrate.txt"]'
cat requirements/integrate.txt
displayName: "Adjust versions"
- bash: |
pip install -q -r requirements/_integrate.txt
pip install -q -r requirements/integrate.txt
# force reinstall TM as it could be overwritten by integration's dependencies
pip install . -U -r requirements/_tests.txt --find-links ${TORCH_URL}
pip install . -U -r requirements/test.txt --find-links ${TORCH_URL}
displayName: "Install package & integrations"
- bash: |
Expand Down
2 changes: 1 addition & 1 deletion .azure/gpu-unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
displayName: "Adjust versions"
- bash: |
pip install . -U -r ./requirements/_devel.txt --prefer-binary --find-links=${TORCH_URL}
pip install . -U -r ./requirements/devel.txt --prefer-binary --find-links=${TORCH_URL}
displayName: "Install environment"
- bash: |
Expand Down
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ RUN \
pip3 install awscli && \
aws s3 sync --no-sign-request s3://sphinx-packages/ dist/ && \
pip3 --disable-pip-version-check --no-cache-dir install \
-r /tmp/pip-tmp/requirements/_devel.txt \
-r /tmp/pip-tmp/requirements/_docs.txt \
-r /tmp/pip-tmp/requirements/devel.txt \
-r /tmp/pip-tmp/requirements/docs.txt \
--find-links="https://download.pytorch.org/whl/cpu/torch_stable.html" \
--find-links="dist/" && \
rm -rf /tmp/pip-tmp
Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ When you send a PR the continuous integration will run tests and build the docs.
To setup a local development environment, install both local and test dependencies:

```bash
python -m pip install -r requirements/_tests.txt
python -m pip install -r requirements/test.txt
python -m pip install pre-commit
```

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/push-caches/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ runs:

- name: Dump wheels
run: |
pip wheel -r requirements/_devel.txt --prefer-binary \
pip wheel -r requirements/devel.txt --prefer-binary \
--wheel-dir=.pip-wheels \
-f ${{ inputs.torch-url }} -f ${{ inputs.pypi-dir }}
ls -lh .pip-wheels
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-integrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
run: |
set -e
curl https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py -o adjust-torch-versions.py
pip install -r requirements/_tests.txt -r requirements/_integrate.txt \
pip install -r requirements/test.txt -r requirements/integrate.txt \
--find-links $PYTORCH_URL -f $PYPI_CACHE --upgrade-strategy eager
python adjust-torch-versions.py requirements/base.txt
python adjust-torch-versions.py requirements/image.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
run: |
pip --version
pip install -e . -U --find-links $PYTORCH_URL -f $PYPI_CACHE
pip install -r requirements/_doctest.txt -U -f $PYPI_CACHE
pip install -r requirements/doctest.txt -U -f $PYPI_CACHE
pip list
# todo: copy this to install checks
Expand All @@ -119,7 +119,7 @@ jobs:
for fpath in `ls requirements/*.txt`; do
python adjust-torch-versions.py $fpath
done
pip install --requirement requirements/_devel.txt -U \
pip install --requirement requirements/devel.txt -U \
--find-links $PYTORCH_URL -f $PYPI_CACHE
pip list
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
sudo apt-get update --fix-missing
sudo apt-get install -y cmake
pip --version
pip install . -U -r requirements/_docs.txt \
pip install . -U -r requirements/docs.txt \
--find-links="${PYPI_CACHE}" --find-links="${TORCH_URL}" --find-links="dist/"
pip list
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ build:
- pip install -U pip awscli --user
- python -m awscli s3 sync --no-sign-request s3://sphinx-packages/ dist/ ; ls -lh dist/
- >
pip install -e . -q -r requirements/_docs.txt \
pip install -e . -q -r requirements/docs.txt \
-f 'https://download.pytorch.org/whl/cpu/torch_stable.html' -f dist/ ;
pip list
# this need to be split so `sphinx-build` is picked from previous installation
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ test: clean env data
cd tests && python -m coverage report

docs: clean
pip install -e . --quiet -r requirements/_docs.txt
pip install -e . --quiet -r requirements/docs.txt
# apt-get install -y texlive-latex-extra dvipng texlive-pictures texlive-fonts-recommended cm-super
TOKENIZERS_PARALLELISM=false python -m sphinx -b html -W --keep-going docs/source docs/build

env:
pip install -e . -U -r requirements/_devel.txt
pip install -e . -U -r requirements/devel.txt

data:
python -c "from urllib.request import urlretrieve ; urlretrieve('https://pl-public-data.s3.amazonaws.com/metrics/data.zip', 'data.zip')"
Expand Down
2 changes: 1 addition & 1 deletion dockers/ubuntu-cuda/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ RUN \
pip install "mkl-service==2.4.0" && \
CUDA_VERSION_MM=${CUDA_VERSION%.*} && \
CU_VERSION_MM=${CUDA_VERSION_MM//'.'/''} && \
pip install --no-cache-dir -r requirements/_devel.txt \
pip install --no-cache-dir -r requirements/devel.txt \
--find-links "https://download.pytorch.org/whl/cu${CU_VERSION_MM}/torch_stable.html" && \
rm -rf requirements/

Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ def package_list_from_file(file):
MOCK_PACKAGES = []
if SPHINX_MOCK_REQUIREMENTS:
# mock also base packages when we are on RTD since we don't install them there
MOCK_PACKAGES += package_list_from_file(os.path.join(_PATH_ROOT, "requirements", "_docs.txt"))
MOCK_PACKAGES += package_list_from_file(os.path.join(_PATH_ROOT, "requirements", "docs.txt"))
MOCK_PACKAGES = [PACKAGE_MAPPING.get(pkg, pkg) for pkg in MOCK_PACKAGES]

autodoc_mock_imports = MOCK_PACKAGES
Expand Down
2 changes: 1 addition & 1 deletion requirements/_devel.txt → requirements/devel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
-r base.txt

# add the testing dependencies
-r _tests.txt
-r test.txt

# add extra requirements
-r image.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/_docs.txt → requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ lightning-utilities >=0.9.0, <0.10.0
pydantic > 1.0.0, < 3.0.0

# integrations
-r _integrate.txt
-r integrate.txt
-r visual.txt
-r audio.txt
-r detection.txt
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def _load_py_module(fname: str, pkg: str = "torchmetrics"):


def _prepare_extras(
skip_files: Tuple[str] = ("base.txt", "_devel.txt", "_doctest.txt", "_integrate.txt", "_docs.txt")
skip_files: Tuple[str] = ("base.txt", "devel.txt", "doctest.txt", "integrate.txt", "docs.txt")
) -> dict:
# find all extra requirements
_load_req = partial(_load_requirements, path_dir=_PATH_REQUIRE)
Expand Down

0 comments on commit 0a8d1f6

Please sign in to comment.