Skip to content

Commit

Permalink
Merge branch 'master' into tests/flaky_integer_test
Browse files Browse the repository at this point in the history
  • Loading branch information
SkafteNicki authored Aug 27, 2024
2 parents 52f71d0 + c3b8945 commit ef372ce
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 21 deletions.
12 changes: 7 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ Steps to reproduce the behavior...
<details>
<summary>Code sample</summary>

<!-- Ideally attach a minimal code sample to reproduce the decried issue.
Minimal means having the shortest code but still preserving the bug. -->
```python
# Ideally attach a minimal code sample to reproduce the decried issue.
# Minimal means having the shortest code but still preserving the bug.
```

</details>

Expand All @@ -30,9 +32,9 @@ Minimal means having the shortest code but still preserving the bug. -->

### Environment

- TorchMetrics version (and how you installed TM, e.g. `conda`, `pip`, build from source):
- Python & PyTorch Version (e.g., 1.0):
- Any other relevant information such as OS (e.g., Linux):
- TorchMetrics version (if build from source, add commit SHA): ???
- Python & PyTorch Version (e.g., 1.0): ???
- Any other relevant information such as OS (e.g., Linux): ???

### Additional context

Expand Down
31 changes: 24 additions & 7 deletions .github/workflows/clear-cache.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,40 @@
name: Clear cache weekly
name: Clear cache ...

on:
pull_request:
paths:
- ".github/workflows/clear-cache.yml"
workflow_dispatch:
inputs:
pattern:
description: "pattern for cleaning cache"
default: "pip|conda"
default: "pip-|conda"
required: false
type: string
age-days:
description: "setting the age of caches in days to be dropped"
required: true
type: number
default: 5
schedule:
# on Sundays
- cron: "0 0 * * 0"

jobs:
cron-clear:
if: github.event_name == 'schedule'
uses: Lightning-AI/utilities/.github/workflows/clear-cache[email protected]
if: github.event_name == 'schedule' || github.event_name == 'pull_request'
uses: Lightning-AI/utilities/.github/workflows/cleanup-caches[email protected]
with:
scripts-ref: v0.11.6
dry-run: ${{ github.event_name == 'pull_request' }}
pattern: "pip-latest"
age-days: 7

direct-clear:
if: github.event_name == 'workflow_dispatch'
uses: Lightning-AI/utilities/.github/workflows/clear-cache[email protected]
if: github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
uses: Lightning-AI/utilities/.github/workflows/cleanup-caches[email protected]
with:
pattern: ${{ inputs.pattern }}
scripts-ref: v0.11.6
dry-run: ${{ github.event_name == 'pull_request' }}
pattern: ${{ inputs.pattern || 'pypi_wheels' }} # setting str in case of PR / debugging
age-days: ${{ fromJSON(inputs.age-days) || 0 }} # setting 0 in case of PR / debugging
6 changes: 3 additions & 3 deletions requirements/_docs.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sphinx ==5.3.0
myst-parser ==1.0.0
pandoc ==2.3
pandoc ==2.4
docutils ==0.19
sphinxcontrib-fulltoc >=1.0
sphinxcontrib-mockautodoc
Expand All @@ -9,9 +9,9 @@ sphinx-autodoc-typehints ==1.23.0
sphinx-paramlinks ==0.6.0
sphinx-togglebutton ==0.3.2
sphinx-copybutton ==0.5.2
sphinx-gallery ==0.17.0
sphinx-gallery ==0.17.1

lightning >=1.8.0, <2.4.0
lightning >=1.8.0, <2.5.0
lightning-utilities ==0.11.6
pydantic > 1.0.0, < 3.0.0

Expand Down
2 changes: 1 addition & 1 deletion requirements/_integrate.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# contentiously validated integration with these expected ranges

# ToDo: investigate and add validation with 2.0+ on GPU
pytorch-lightning >=1.9.0, <2.4.0
pytorch-lightning >=1.9.0, <2.5.0
2 changes: 1 addition & 1 deletion requirements/_tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pytest-xdist ==3.6.1
phmdoctest ==1.4.0

psutil <6.1.0
pyGithub ==2.3.0
pyGithub ==2.4.0
fire <=0.6.0

cloudpickle >1.3, <=3.0.0
Expand Down
4 changes: 2 additions & 2 deletions requirements/classification_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment

pandas >=1.4.0, <=2.2.2
netcal >1.0.0, <=1.3.5 # calibration_error
numpy <2.1.0
netcal >1.0.0, <1.4.0 # calibration_error
numpy <2.2.0
fairlearn # group_fairness
2 changes: 1 addition & 1 deletion requirements/image_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ scikit-image >=0.19.0, <0.25.0
kornia >=0.6.7, <0.8.0
pytorch-msssim ==1.0.0
sewar >=0.4.4, <=0.4.6
numpy <2.1.0
numpy <2.2.0
torch-fidelity @ git+https://github.com/toshas/torch-fidelity@master
lpips <=0.1.4
2 changes: 1 addition & 1 deletion requirements/typing.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mypy ==1.11.1
mypy ==1.11.2
torch ==2.4.0

types-PyYAML
Expand Down

0 comments on commit ef372ce

Please sign in to comment.