Skip to content

Commit 3fb4cad

Browse files
committed
Merge branch 'main' into ram
2 parents 90f7620 + 25224a4 commit 3fb4cad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1851
-444
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Bug report
2+
description: Report a bug to help us improve DeepInverse.
3+
labels: [bug]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thank you for reporting a bug! Please fill out the form below to help us reproduce and fix the issue.
9+
- type: input
10+
id: environment
11+
attributes:
12+
label: Environment
13+
description: OS, Python version, DeepInverse version, and any relevant dependencies.
14+
placeholder: e.g. Ubuntu 22.04, Python 3.12, DeepInverse 0.3.2
15+
validations:
16+
required: true
17+
- type: textarea
18+
id: description
19+
attributes:
20+
label: Describe the bug
21+
description: A clear and concise description of what the bug is.
22+
validations:
23+
required: true
24+
- type: textarea
25+
id: steps
26+
attributes:
27+
label: Steps to reproduce
28+
description: Please provide a minimum reproducible example, including code and data if possible.
29+
placeholder: |
30+
1. Go to '...'
31+
2. Run '...'
32+
3. See error
33+
validations:
34+
required: true
35+
- type: textarea
36+
id: expected
37+
attributes:
38+
label: Expected behavior
39+
description: What did you expect to happen?
40+
validations:
41+
required: true
42+
- type: textarea
43+
id: traceback
44+
attributes:
45+
label: Full traceback (if applicable)
46+
description: Please paste the full error message and traceback here.
47+
validations:
48+
required: false
49+
- type: textarea
50+
id: additional
51+
attributes:
52+
label: Additional context
53+
description: Add any other context about the problem here.
54+
validations:
55+
required: false

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: DeepInverse Discord community support
4+
url: https://discord.gg/qBqY5jKw3p
5+
about: Please ask and answer questions here.
6+
- name: DeepInverse github discussions
7+
url: https://github.com/deepinv/deepinv/discussions
8+
about: Please ask and answer questions here.
9+
- name: DeepInverse maintainers
10+
url: https://github.com/deepinv/deepinv/blob/main/MAINTAINERS.md
11+
about: Please reach out to the maintainers for assistance.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Documentation issue
2+
description: Report a problem or suggest an improvement for the DeepInverse documentation.
3+
labels: [documentation]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thank you for helping improve our documentation! Please fill out the form below to describe the issue or suggestion.
9+
- type: input
10+
id: location
11+
attributes:
12+
label: Documentation location
13+
description: Where did you find the issue? (e.g., file name, section, or URL)
14+
placeholder: e.g. docs/source/index.rst, README, or a specific URL
15+
validations:
16+
required: true
17+
- type: textarea
18+
id: description
19+
attributes:
20+
label: Describe the issue or suggestion
21+
description: What is unclear, incorrect, missing, or could be improved?
22+
validations:
23+
required: true
24+
- type: textarea
25+
id: suggestion
26+
attributes:
27+
label: Suggested fix or improvement (optional)
28+
description: If you have a suggestion for how to fix or improve the documentation, please provide it here.
29+
validations:
30+
required: false
31+
- type: textarea
32+
id: additional
33+
attributes:
34+
label: Additional context
35+
description: Add any other context, screenshots, or examples here.
36+
validations:
37+
required: false
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Feature request
2+
description: Suggest an idea or enhancement for DeepInverse.
3+
labels: [enhancement]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thank you for suggesting a feature! Please fill out the form below to help us understand your request.
9+
- type: input
10+
id: environment
11+
attributes:
12+
label: Environment (optional)
13+
description: OS, Python version, DeepInverse version, and any relevant dependencies.
14+
placeholder: e.g. Ubuntu 22.04, Python 3.12, DeepInverse 1.0.0
15+
validations:
16+
required: false
17+
- type: textarea
18+
id: description
19+
attributes:
20+
label: Describe the feature
21+
description: A clear and concise description of the feature you would like to see.
22+
validations:
23+
required: true
24+
- type: textarea
25+
id: motivation
26+
attributes:
27+
label: Motivation
28+
description: Why is this feature important? What problem does it solve?
29+
validations:
30+
required: true
31+
- type: textarea
32+
id: alternatives
33+
attributes:
34+
label: Alternatives considered
35+
description: Have you considered any alternative solutions or features?
36+
validations:
37+
required: false
38+
- type: textarea
39+
id: additional
40+
attributes:
41+
label: Additional context
42+
description: Add any other context or screenshots about the feature request here.
43+
validations:
44+
required: false

.github/codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ coverage:
55
patch: false
66

77
round: down # up, down, or nearest
8-
precision: 2 # Number of decimal places, between 0 and 5
8+
precision: 2 # Number of decimal places, between 0 and 5

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- name: Install deepinv and its dependencies
3232
run: |
33-
pip install -e .[dataset,denoisers,doc]
33+
pip install -e .[dataset,denoisers,doc,training]
3434
- name: Sphinx build
3535
run: |
3636
sphinx-build -W docs/source _build

.github/workflows/test.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,28 @@ jobs:
2727
# Ubuntu tests
2828
- os: ubuntu-latest
2929
version_python: "3.10"
30-
extra: dataset,denoisers,test
30+
extra: dataset,denoisers,test,training
3131
name: "ubuntu py3.10 all dependencies"
3232
- os: ubuntu-latest
3333
version_python: "3.11"
34-
extra: dataset,denoisers,test
34+
extra: dataset,denoisers,test,training
3535
name: "ubuntu py3.11 all dependencies"
3636
- os: ubuntu-latest
3737
version_python: "3.12"
38-
extra: dataset,denoisers,test
38+
extra: dataset,denoisers,test,training
3939
name: "ubuntu py3.12 all dependencies"
4040
# Windows tests
4141
- os: windows-latest
4242
version_python: "3.10"
43-
extra: dataset,denoisers,test
43+
extra: dataset,denoisers,test,training
4444
name: "windows py3.10 all dependencies"
4545
- os: windows-latest
4646
version_python: "3.11"
47-
extra: dataset,denoisers,test
47+
extra: dataset,denoisers,test,training
4848
name: "windows py3.11 all dependencies"
4949
- os: windows-latest
5050
version_python: "3.12"
51-
extra: dataset,denoisers,test
51+
extra: dataset,denoisers,test,training
5252
name: "windows py3.12 all dependencies"
5353
env:
5454
DEEPINV_MOCK_TESTS: "True"
@@ -70,16 +70,18 @@ jobs:
7070
- name: Check installed packages
7171
run: pip list
7272

73-
- name: Test importing numpy
74-
run: python3 -c "import numpy; print('NumPy version:', numpy.__version__)"
7573
# ----------------------------
7674

77-
- name: Test with pytest and generate coverage report
75+
- name: Test with pytest and generate coverage report
7876
run: |
7977
python3 -m pytest -n 2 --dist=loadgroup --cov=deepinv --junitxml=junit.xml -o junit_family=legacy -v
78+
8079
- name: Upload coverage to Codecov
80+
# Only upload coverage on Linux
81+
if: ${{ runner.os == 'Linux' && matrix.version_python == '3.10' }}
8182
uses: codecov/codecov-action@v5
8283

8384
- name: Upload test results to Codecov
85+
# NOTE: do we need the test results on both Linux and Windows sending to Codecov?
8486
if: ${{ !cancelled() }}
8587
uses: codecov/test-results-action@v1

CHANGELOG.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,19 @@ New Features
1111
^^^^^^^^^^^^
1212
- Add RAM model (:gh:`524` by `Matthieu Terris`_)
1313

14+
- FastMRI better raw data loading: load targets from different folder for test sets, load mask from test set, prewhitening, normalisation (:gh:`608` by `Andrew Wang`_)
15+
- SKM-TEA raw MRI dataset (:gh:`608` by `Andrew Wang`_)
16+
- New downsampling physics that matches MATLAB bicubic imresize (:gh:`608` by `Andrew Wang`_)
17+
1418
Changed
1519
^^^^^^^
1620

1721
Fixed
1822
^^^^^
1923

24+
- Fix downsampling generator batching (:gh:`608` by `Andrew Wang`_)
25+
- Fix memory leak in `deepinv.physics.tomography` when using autograd (:gh:`651` by `Minh Hai Nguyen`_)
26+
- Fix the circular padded UNet (:gh:`653` by `Victor Sechaud`_)
2027

2128
v0.3.2
2229
------
@@ -31,6 +38,7 @@ Changed
3138
- Parallelize the test suite making it 15% faster (:gh:`522` by `Jérémy Scanvic`_)
3239
- Adjust backward paths for tomography (:gh:`535` by `Johannes Hertrich`_)
3340
- Update python version to 3.10+ (:gh:`605` by `Minh Hai Nguyen`_)
41+
- Update the library dependencies, issue template, codecov report on linux only (:gh:`654` by `Minh Hai Nguyen`_)
3442

3543
Fixed
3644
^^^^^

deepinv/datasets/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@
1717
from .kohler import Kohler
1818
from .utils import download_archive
1919
from .satellite import NBUDataset
20+
from .skmtea import SKMTEASliceDataset

0 commit comments

Comments
 (0)