Skip to content

Commit

Permalink
req: move to base.txt (#1022)
Browse files Browse the repository at this point in the history
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
Borda and pre-commit-ci[bot] committed May 31, 2023
1 parent fd27b9e commit 514b22a
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 23 deletions.
13 changes: 1 addition & 12 deletions .azure/gpu-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
TORCH_VERSION: '2.0.1'
CUDA_VERSION_MM: '117'
# how long to run the job before automatically cancelling
timeoutInMinutes: "45"
timeoutInMinutes: "75"
# how much time to give 'run always even if cancelled tasks' before stopping them
cancelTimeoutInMinutes: "2"

Expand Down Expand Up @@ -89,13 +89,6 @@ jobs:
pip list
displayName: 'Image info & NVIDIA'
#- bash: |
# # Box2D requirement for swig
# sudo apt-get remove -y swig
# sudo apt-get install -y swig3.0
# sudo ln -s /usr/bin/swig3.0 /usr/bin/swig
# displayName: 'bypass/fix swig'

- bash: |
pip install "pip==21.2.3" # todo: drop after resolving extras
pip install ".[dev]" "torch==$TORCH_VERSION" \
Expand Down Expand Up @@ -147,10 +140,6 @@ jobs:
# testRunTitle: '$(Agent.OS) - $(Build.BuildNumber)[$(Agent.JobName)] - Python $(python.version)'
# condition: succeededOrFailed()

- bash: |
python -m pytest tests/models/test_detection.py tests/models/yolo -v
displayName: 'Test Detection'
- bash: rm -rf $(Build.SourcesDirectory)
condition: succeededOrFailed()
displayName: 'Cleanup'
6 changes: 2 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ updates:
schedule:
interval: "weekly"
# Labels on pull requests for version updates only
labels:
- "ci/cd"
labels: ["ci/cd"]
pull-request-branch-name:
# Separate sections of the branch name with a hyphen
# for example, `dependabot-npm_and_yarn-next_js-acorn-6.4.1`
Expand All @@ -28,8 +27,7 @@ updates:
schedule:
interval: "weekly"
# Labels on pull requests for version updates only
labels:
- "ci"
labels: ["ci"]
pull-request-branch-name:
# Separate sections of the branch name with a hyphen
# for example, `dependabot-npm_and_yarn-next_js-acorn-6.4.1`
Expand Down
6 changes: 1 addition & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
numpy <1.25.0
pytorch-lightning >1.7.0, <1.9.0 # strict
torchmetrics <0.11.0 # strict
lightning-utilities >0.3.1 # this is needed for PL 1.7
torchvision >=0.10.0 # todo: move to topic related extras
-r requirements/base.txt
5 changes: 5 additions & 0 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
numpy <1.25.0
pytorch-lightning >1.7.0, <1.9.0 # strict
torchmetrics <0.11.0 # strict
lightning-utilities >0.3.1 # this is needed for PL 1.7
torchvision >=0.10.0 # todo: move to topic related extras
2 changes: 1 addition & 1 deletion requirements/devel.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# install all mandatory dependencies
-r ../requirements.txt
-r ./base.txt

# install all extra dependencies for full package experience
-r ./models.txt
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def _prepare_extras():
keywords=["deep learning", "pytorch", "AI"],
python_requires=">=3.8",
setup_requires=["wheel"],
install_requires=_load_requirements(_PATH_ROOT, "requirements.txt"),
install_requires=_load_requirements(_PATH_REQUIRE, "base.txt"),
extras_require=_prepare_extras(),
project_urls={
"Bug Tracker": "https://github.com/PyTorchLightning/lightning-bolts/issues",
Expand Down

0 comments on commit 514b22a

Please sign in to comment.