Skip to content
This repository has been archived by the owner on Mar 21, 2024. It is now read-only.

Clean up legacy code #671

Merged
merged 23 commits into from
Mar 9, 2022
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -167,4 +167,7 @@ InnerEye-DataQuality/cifar-10-batches-py
InnerEye-DataQuality/logs
InnerEye-DataQuality/data

!**/InnerEye/ML/Histopathology/datasets
!**/InnerEye/ML/Histopathology/datasets
javier-alvarez marked this conversation as resolved.
Show resolved Hide resolved
None
cifar-10-batches-py
cifar-10-python.tar.gz
8 changes: 8 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"python.analysis.typeCheckingMode": "basic",
"python.testing.pytestArgs": [
"Tests"
],
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true
}
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ created.
## Upcoming

### Added

-([#671](https://github.com/microsoft/InnerEye-DeepLearning/pull/671)) Remove sequence models and unused variables. Simplify README.
- ([#678](https://github.com/microsoft/InnerEye-DeepLearning/pull/678)) Add function to get log level name and use it for logging.
- ([#666](https://github.com/microsoft/InnerEye-DeepLearning/pull/666)) Replace RadIO with TorchIO for patch-based inference.
- ([#643](https://github.com/microsoft/InnerEye-DeepLearning/pull/643)) Test for recovery of SSL job. Tracks learning rate and train
Expand Down
2 changes: 0 additions & 2 deletions InnerEye/Azure/azure_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
# The name of the "azureml" property of AzureConfig
AZURECONFIG_SUBMIT_TO_AZUREML = "azureml"

INPUT_DATA_KEY = "input_data"


@dataclass(frozen=True)
class GitInformation:
Expand Down
2 changes: 0 additions & 2 deletions InnerEye/Azure/azure_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
from InnerEye.ML.common import ModelExecutionMode
from InnerEye.ML.utils.config_loader import ModelConfigLoader

SLEEP_TIME_SECONDS = 30

DEFAULT_DOCKER_BASE_IMAGE = "mcr.microsoft.com/azureml/openmpi3.1.2-cuda10.2-cudnn8-ubuntu18.04"

# Environment variables used for multi-node training
Expand Down
14 changes: 1 addition & 13 deletions InnerEye/Common/Statistics/wilcoxon_signed_rank_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@
"""

from collections import defaultdict
from itertools import filterfalse, tee
from typing import Any, Callable, Dict, List, Optional, Tuple, Union
from typing import Callable, Dict, List, Optional, Tuple, Union

import matplotlib.pyplot as plt
import numpy as np
Expand All @@ -67,8 +66,6 @@
from InnerEye.Common.generic_parsing import GenericConfig
from InnerEye.ML.visualizers.metrics_scatterplot import create_scatterplots

INTERSECT = lambda l, r: np.intersect1d(l, r, False)

"""
The factor by which the Wilcoxon Z value should be divided to allow for incomplete independence of the data.
Experimentation (from comparing models built from exactly the same code and data, but different random seeds)
Expand Down Expand Up @@ -206,15 +203,6 @@ def compose_pairwise_result(threshold: float, results: Dict[str, Dict[str, float
return []


def partition_results(pred: Callable, results: List[Any]) -> Tuple[List[Any], List[Any]]:
"""
Helper function to partition results into passed/failed
"""
t1, t2 = tee(results)
map_func = lambda r: (r, results[r])
return list(map(map_func, filterfalse(pred, t1))), list(map(map_func, filter(pred, t2)))


def read_data(csv_file: str, subset: str = 'all', exclude: Optional[List[str]] = None) \
-> Dict[str, Dict[str, Dict[str, float]]]:
"""
Expand Down
171 changes: 0 additions & 171 deletions InnerEye/ML/Histopathology/datamodules/base_module.py

This file was deleted.

31 changes: 0 additions & 31 deletions InnerEye/ML/Histopathology/datamodules/panda_module.py

This file was deleted.

38 changes: 0 additions & 38 deletions InnerEye/ML/Histopathology/datamodules/tcga_crck_module.py

This file was deleted.

Loading