Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
6c54d87
Update mri_transforms.py
jonasteuwen May 18, 2021
da645b4
Remove named tensors support initial commit
May 23, 2021
4c65ea5
Minor transforms fix
May 27, 2021
386ebd9
Remove unnecessary transforms
May 27, 2021
d0eabe6
Minor fix
May 27, 2021
5a7d3ba
Fixed to no named-tensors support
May 27, 2021
8c29a7a
Delete projects/fastmri directory
georgeyiasemis May 27, 2021
3fe0fd1
Minor transforms fixes
May 31, 2021
75e8d5e
Added test yaml file for fastmri challange
May 31, 2021
a6f737c
Updated test_transforms for unnamed tensors support
May 31, 2021
591d511
Drop named tensors & add documentation
Jun 1, 2021
812d963
Drop named tensors & add documentation
Jun 1, 2021
96e0cce
Drop named tensors & add documentation
Jun 1, 2021
174ffb6
Update mri_models.py to unnamed tensors support
Jun 2, 2021
e14606e
Update rim.py to unnamed tensors support
Jun 2, 2021
6d4ad48
Minor fix
Jun 2, 2021
d50893a
Update rim_engine.py to unnamed tensors support, first try
Jun 2, 2021
26cba8a
Update mri_model tests to unnamed tensors support
Jun 2, 2021
bc06d12
Update mri_model tests to unnamed tensors support minor fix
Jun 2, 2021
f0d5e28
Remove unnecessary comments
Jun 2, 2021
0f82674
Added fake mri data generator
Jun 8, 2021
f2028dd
Added RandomFakeMRIDataset for fake mri data support
Jun 8, 2021
16f5cf8
Update data generator to support 3D data generation
Jun 9, 2021
0adb76b
Minor fixes
Jun 9, 2021
9ec481e
Added generator tests
Jun 9, 2021
bb22a22
Minor Fixes
Jun 9, 2021
ace467f
Remove unused attributes
Jun 10, 2021
04a917a
Merge branch 'main' into remove-named-tensors
Jun 10, 2021
4277a6b
Cleanup of comments
jonasteuwen Jun 10, 2021
344d223
Update pytorch version
jonasteuwen Jun 10, 2021
77ed17c
Remove unnecessary named tensor stuff
Jun 10, 2021
4c0d4ba
Merge branch 'remove-named-tensors' of github.com:directgroup/direct …
Jun 10, 2021
0df12c0
Remove unnecessary named tensor stuff
Jun 10, 2021
d0fbd8e
Remove unnecessary named tensor stuff
Jun 10, 2021
74e6ece
Minor fix
Jun 10, 2021
481a061
Minor docs fix
Jun 10, 2021
fbfa0ab
Added FakeMRIBlobsDataset in datasets
Jun 11, 2021
d532a48
Added FakeMRIBlobsDataset in datasets
Jun 11, 2021
bf6e0d3
Updated generator.py
Jun 11, 2021
d1a5946
Minor fixes
Jun 14, 2021
355d932
direct/Minor fixes to work with unnamed tensors
Jun 14, 2021
f0d5e14
Update after pre-commit fixes
Jun 14, 2021
8603035
Fixed some pylint errors
Jun 16, 2021
208ad1c
Add dependency in setup
Jun 16, 2021
24a9c47
Fix pylint errors
Jun 16, 2021
25a746c
Fix pylint errors
Jun 16, 2021
0411ce6
Remove collate
Jun 16, 2021
eb3665a
Fixing pylint errors
Jun 16, 2021
5fd18da
Fixing pylint errors
Jun 16, 2021
e75a4e9
Change scikit-image dependency
Jun 16, 2021
4b94994
Update challanges w/ new version of scikit-image psnr
Jun 16, 2021
6de7d7f
Testing unnamed version
Jun 18, 2021
a79ab66
Testing unnamed version
Jun 18, 2021
01fde76
Add packaging in setup
Jun 18, 2021
307e227
filenames_filter can also be empty list
jonasteuwen Jun 25, 2021
5fba2de
Return None when there are no lists.
jonasteuwen Jun 25, 2021
ed0fd2c
Delete ISSUE_TEMPLATE.md
jonasteuwen Jun 26, 2021
f4c142b
Updated ISSUE_TEMPLATE (Closes #106)
jonasteuwen Jun 26, 2021
0b813b8
Added timeout to workers
jonasteuwen Jun 26, 2021
d1ce9a9
black, isort fixes
jonasteuwen Jun 26, 2021
6b6ad6d
Merge pull request #107 from directgroup/main
jonasteuwen Jun 26, 2021
674a3a2
Bump pytorch and torchvision versions
jonasteuwen Jun 26, 2021
c5e9290
Reviewing pull request
Jun 28, 2021
baece8c
Delete projects/fastmri directory
georgeyiasemis Jun 28, 2021
194fd66
Reviewing pull request
Jun 28, 2021
4591002
Reviewing pull request
Jun 28, 2021
465ac3f
Reviewing pull request
Jun 28, 2021
a6d8f29
Reviewing pull request
Jun 28, 2021
64d06ef
Code cleanup
jonasteuwen Jun 28, 2021
d8727ee
Suggestion for new dockerfile
jonasteuwen Jun 28, 2021
d8d6b74
Code cleanup
jonasteuwen Jun 28, 2021
56bc615
Code quality
jonasteuwen Jun 28, 2021
de205cc
Code cleanup
Jun 28, 2021
33ce0d4
Code quality
jonasteuwen Jun 29, 2021
e779c7e
Merge branch 'remove-named-tensors' of github.com:directgroup/direct …
jonasteuwen Jun 29, 2021
fb186b0
Smaller dockerfile
jonasteuwen Jun 29, 2021
78c6fa6
Code cleanup
Jun 29, 2021
e829a71
Rollback f-string for logger
jonasteuwen Jun 29, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
A clear and concise description on how to reproduce the problem.

**Expected behavior**
A clear and concise description of what you expected to happen.

**Environment**
dlup version:
How installed:
Python version:
Operating System:

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: enhancement
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
19 changes: 13 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,22 @@ repos:
- id: isort
name: isort (pyi)
types: [pyi]
- repo: https://github.com/pycqa/pylint
rev: v2.8.2
hooks:
- id: pylint
- repo: https://github.com/psf/black
rev: 21.5b0
rev: 21.6b0
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.812
rev: v0.902
hooks:
- id: mypy
additional_dependencies: [types-requests, types-docutils]
- repo: local
hooks:
- id: pylint
name: pylint
entry: pylint
language: system
types: [python]
args:
- dlup
- --errors-only
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![tox](https://github.com/directgroup/direct/actions/workflows/tox.yml/badge.svg)](https://github.com/directgroup/direct/actions/workflows/tox.yml)
[![pylint](https://github.com/directgroup/direct/actions/workflows/pylint.yml/badge.svg)](https://github.com/directgroup/direct/actions/workflows/pylint.yml)
[![tox](https://github.com/directgroup/direct/actions/workflows/tox.yml/badge.svg)](https://github.com/directgroup/direct/actions/workflows/tox.yml)
[![pylint](https://github.com/directgroup/direct/actions/workflows/pylint.yml/badge.svg)](https://github.com/directgroup/direct/actions/workflows/pylint.yml)
[![black](https://github.com/directgroup/direct/actions/workflows/black.yml/badge.svg)](https://github.com/directgroup/direct/actions/workflows/black.yml)

# DIRECT
Expand Down
11 changes: 9 additions & 2 deletions direct/checkpointer.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# coding=utf-8
# Copyright (c) DIRECT Contributors
"""Checkpointer module. Handles all logic related to checkpointing."""
import datetime
import logging
import pathlib
Expand All @@ -25,6 +26,8 @@


class Checkpointer:
"""Main Checkpointer module. Handles writing and restoring from checkpoints of modules and submodels."""

def __init__(
self,
save_directory: pathlib.Path,
Expand Down Expand Up @@ -180,8 +183,12 @@ def _load_checkpoint(self, checkpoint_path: PathOrString) -> Dict:
try:
checkpoint = torch.load(checkpoint_path, map_location=torch.device("cpu"))

except UnpicklingError as e:
self.logger.exception(f"Tried to load {checkpoint_path}, but was unable to unpickle: {e}.")
except UnpicklingError as exc:
self.logger.exception(
"Tried to load {checkpoint_path}, but was unable to unpickle: {exc}.",
checkpoint_path=checkpoint_path,
exc=exc,
)
raise

return checkpoint
2 changes: 1 addition & 1 deletion direct/common/subsample.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def __call__(self, data, seed=None, return_acs=False):
ndarray
"""
self.rng.seed(seed)
mask = self.mask_func(data, return_acs=return_acs)
mask = self.mask_func(data, return_acs=return_acs) # pylint: disable = E1123
return mask


Expand Down
5 changes: 2 additions & 3 deletions direct/data/bbox.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# coding=utf-8
# Copyright (c) DIRECT Contributors
"""Utilities to handle images with respect to bounding boxes."""
from typing import List, Union

import numpy as np
Expand Down Expand Up @@ -59,10 +60,8 @@ def crop_to_bbox(
patch = pad_value * np.ones(bbox_size, dtype=data.dtype)

patch_idx = [slice(i, j) for i, j in zip(l_offset, bbox_size - r_offset)]
patch_names = patch.names

patch.rename(None)[tuple(patch_idx)] = out.rename(None)
patch = patch.refine_names(*patch_names)
patch[tuple(patch_idx)] = out

return patch

Expand Down
Loading