Skip to content

Commit

Permalink
Merge pull request #7 from ImagingDataCommons/iteration2
Browse files Browse the repository at this point in the history
Updated gh references from prsnl acc to IDC
  • Loading branch information
vkt1414 authored Sep 20, 2023
2 parents a48f38a + b73d514 commit 34c31df
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Terra/TotalSegmentator/splitWorkflow/oneVM.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ workflow TotalSegmentator {
String dicomToNiftiConverterTool

#Docker Images for each task
String totalSegmentatorDocker = "vamsithiriveedhi/totalsegmentator:end_to_end_v1"
String totalSegmentatorDocker = "imagingdatacommons/totalsegmentator:end_to_end_v1"

#Preemptible retries
Int totalSegmentatorPreemptibleTries = 3
Expand Down Expand Up @@ -83,7 +83,7 @@ task totalSegmentatorEndToEnd{

}
command {
wget https://raw.githubusercontent.com/vkt1414/Cloud-Resources-Workflows/main/Notebooks/Totalsegmentator/endToEndTotalSegmentatorNotebook.ipynb
wget https://raw.githubusercontent.com/ImagingDataCommons/Cloud-Resources-Workflows/main/Notebooks/Totalsegmentator/endToEndTotalSegmentatorNotebook.ipynb
set -e
papermill -p csvFilePath ~{seriesInstanceS5cmdUrls} -p converterType ~{dicomToNiftiConverterTool} endToEndTotalSegmentatorNotebook.ipynb endToEndTotalSegmentatorOutputJupyterNotebook.ipynb || (>&2 echo "Killed" && exit 1)
}
Expand Down
12 changes: 6 additions & 6 deletions Terra/TotalSegmentator/splitWorkflow/threeVM.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ workflow TotalSegmentator {
String dicomToNiftiConverterTool

#Docker Images for each task
String downloadDicomAndConvertDocker = "vamsithiriveedhi/totalsegmentator:task1_v1"
String inferenceTotalSegmentatorDocker = "vamsithiriveedhi/totalsegmentator:task2_v3"
String dicomsegAndRadiomicsSR_Docker = "vamsithiriveedhi/totalsegmentator:task3_v3"
String downloadDicomAndConvertDocker = "imagingdatacommons/totalsegmentator:task1_v1"
String inferenceTotalSegmentatorDocker = "imagingdatacommons/totalsegmentator:task2_v3"
String dicomsegAndRadiomicsSR_Docker = "imagingdatacommons/totalsegmentator:task3_v3"

#Preemptible retries
Int downloadAndConvertPreemptibleTries = 3
Expand Down Expand Up @@ -119,7 +119,7 @@ task downloadAndConvert {
String downloadAndConvertCpuFamily
}
command {
wget https://raw.githubusercontent.com/vkt1414/Cloud-Resources-Workflows/main/Notebooks/Totalsegmentator/downloadDicomAndConvertNotebook.ipynb
wget https://raw.githubusercontent.com/ImagingDataCommons/Cloud-Resources-Workflows/main/Notebooks/Totalsegmentator/downloadDicomAndConvertNotebook.ipynb
set -e
papermill -p converterType ~{dicomToNiftiConverterTool} -p csvFilePath ~{seriesInstanceS5cmdUrls} downloadDicomAndConvertNotebook.ipynb downloadAndConvertOutputJupyterNotebook.ipynb
}
Expand Down Expand Up @@ -163,7 +163,7 @@ task inferenceTotalSegmentator {
}

command {
wget https://raw.githubusercontent.com/vkt1414/Cloud-Resources-Workflows/main/Notebooks/Totalsegmentator/inferenceTotalSegmentatorNotebook.ipynb
wget https://raw.githubusercontent.com/ImagingDataCommons/Cloud-Resources-Workflows/main/Notebooks/Totalsegmentator/inferenceTotalSegmentatorNotebook.ipynb
set -e
papermill -p converterType ~{dicomToNiftiConverterTool} -p niftiFilePath ~{NiftiFiles} inferenceTotalSegmentatorNotebook.ipynb inferenceOutputJupyterNotebook.ipynb
}
Expand Down Expand Up @@ -206,7 +206,7 @@ task dicomsegAndRadiomicsSR{
File inferenceZipFile
}
command {
wget https://raw.githubusercontent.com/vkt1414/Cloud-Resources-Workflows/main/Notebooks/Totalsegmentator/dicomsegAndRadiomicsSR_Notebook.ipynb
wget https://raw.githubusercontent.com/ImagingDataCommons/Cloud-Resources-Workflows/main/Notebooks/Totalsegmentator/dicomsegAndRadiomicsSR_Notebook.ipynb
set -e
papermill -p csvFilePath ~{seriesInstanceS5cmdUrls} -p inferenceNiftiFilePath ~{inferenceZipFile} dicomsegAndRadiomicsSR_Notebook.ipynb dicomsegAndRadiomicsSR_OutputJupyterNotebook.ipynb || (>&2 echo "Killed" && exit 1)
}
Expand Down
8 changes: 4 additions & 4 deletions Terra/TotalSegmentator/splitWorkflow/twoVM.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ workflow TotalSegmentator {
String dicomToNiftiConverterTool

#Docker Images for each task
String downloadDicomAndConvertAndInferenceTotalSegmentatorDocker = "vamsithiriveedhi/totalsegmentator:task1and2_v4"
String dicomsegAndRadiomicsSR_Docker = "vamsithiriveedhi/totalsegmentator:task3_v4"
String downloadDicomAndConvertAndInferenceTotalSegmentatorDocker = "imagingdatacommons/totalsegmentator:task1and2_v4"
String dicomsegAndRadiomicsSR_Docker = "imagingdatacommons/totalsegmentator:task3_v4"

#Preemptible retries
Expand Down Expand Up @@ -106,7 +106,7 @@ task downloadDicomAndConvertAndInferenceTotalSegmentator{
}

command {
wget https://raw.githubusercontent.com/vkt1414/Cloud-Resources-Workflows/main/Notebooks/Totalsegmentator/downloadDicomAndConvertAndInferenceTotalSegmentatorNotebook.ipynb
wget https://raw.githubusercontent.com/ImagingDataCommons/Cloud-Resources-Workflows/main/Notebooks/Totalsegmentator/downloadDicomAndConvertAndInferenceTotalSegmentatorNotebook.ipynb
set -e
papermill -p converterType ~{dicomToNiftiConverterTool} -p csvFilePath ~{seriesInstanceS5cmdUrls} downloadDicomAndConvertAndInferenceTotalSegmentatorNotebook.ipynb downloadDicomAndConvertAndInferenceTotalSegmentatorOutputJupyterNotebook.ipynb
}
Expand Down Expand Up @@ -150,7 +150,7 @@ task dicomsegAndRadiomicsSR{
File inferenceZipFile
}
command {
wget https://raw.githubusercontent.com/vkt1414/Cloud-Resources-Workflows/main/Notebooks/Totalsegmentator/dicomsegAndRadiomicsSR_Notebook.ipynb
wget https://raw.githubusercontent.com/ImagingDataCommons/Cloud-Resources-Workflows/main/Notebooks/Totalsegmentator/dicomsegAndRadiomicsSR_Notebook.ipynb

set -o xtrace
# For any command failures in the rest of this script, return the error.
Expand Down

0 comments on commit 34c31df

Please sign in to comment.