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

Added possibility to set name of dataset csv as part of model configu… #412

Merged
merged 18 commits into from
Mar 16, 2021

Conversation

kh296
Copy link
Collaborator

@kh296 kh296 commented Mar 9, 2021

Changes made to address Issue #403.

Definition of the dataset csv file name has been enabled by allowing the parameter dataset_csv to be set as part of model configuration. The parameter is initialised to DATASET_CSV_FILE_NAME in InnerEye/ML/config.py, then is used to locate the dataset csv file in InnerEye/ML/config.py, in InnerEye/ML/run_ml.py and in InnerEye/ML/utils/ml_util.py. An associated unit test has been added to Tests/ML/test_config_helpers.py.

@ghost
Copy link

ghost commented Mar 9, 2021

CLA assistant check
All CLA requirements met.

ant0nsc
ant0nsc previously approved these changes Mar 10, 2021
Tests/ML/test_config_helpers.py Outdated Show resolved Hide resolved
InnerEye/ML/utils/ml_util.py Outdated Show resolved Hide resolved
@ant0nsc
Copy link
Contributor

ant0nsc commented Mar 10, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@ant0nsc
Copy link
Contributor

ant0nsc commented Mar 10, 2021

Closes #403

@ant0nsc ant0nsc linked an issue Mar 10, 2021 that may be closed by this pull request
ant0nsc
ant0nsc previously approved these changes Mar 10, 2021
@ant0nsc
Copy link
Contributor

ant0nsc commented Mar 10, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@ant0nsc ant0nsc requested a review from Shruthi42 March 10, 2021 15:14
InnerEye/ML/config.py Outdated Show resolved Hide resolved
@ant0nsc
Copy link
Contributor

ant0nsc commented Mar 12, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Contributor

@Shruthi42 Shruthi42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are two uses of DATASET_CSV_FILE_NAME in run_ml.py that need to be switched to dataset_csv as well, this looks good otherwise.

@kh296
Copy link
Collaborator Author

kh296 commented Mar 12, 2021

@Shruthi42, thanks for spotting this! DATASET_CSV_FILE_NAME switched to dataset_csv everywhere in run_ml.py in latest commit. The changes directly affect run_ml.download_dataset() and run_ml.mount_or_download_dataset(). These are tested for the default value of dataset_csv (i.e. DATASET_CSV_FILE_NAME) in test_download_upload.py::test_download_azureml_dataset(). A test for a non-default value would require a test dataset in Azure with an index file having a name different from dataset.csv.

@kh296 kh296 requested a review from Shruthi42 March 13, 2021 11:33
Tests/ML/test_config_helpers.py Outdated Show resolved Hide resolved
Tests/ML/test_config_helpers.py Show resolved Hide resolved
@Shruthi42
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@ant0nsc ant0nsc enabled auto-merge (squash) March 15, 2021 14:12
@ant0nsc
Copy link
Contributor

ant0nsc commented Mar 15, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@ant0nsc
Copy link
Contributor

ant0nsc commented Mar 15, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@ant0nsc
Copy link
Contributor

ant0nsc commented Mar 15, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@ant0nsc
Copy link
Contributor

ant0nsc commented Mar 15, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Shruthi42
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@ant0nsc ant0nsc merged commit 36f5b13 into microsoft:main Mar 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow redefinition of DATASET_CSV_FILE_NAME
5 participants