Skip to content

Commit 85d2ae8

Browse files
aawdehaawdeh
authored
Merge branch 'develop' into aa-remove-task
2 parents 51586e3 + feec84a commit 85d2ae8

21 files changed

+888
-50
lines changed

‎.dockstore.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,14 @@ workflows:
8383
subclass: WDL
8484
primaryDescriptorPath: /pipelines/broad/arrays/imputation/Imputation.wdl
8585

86+
- name: ImputationBeagle
87+
subclass: WDL
88+
primaryDescriptorPath: /pipelines/broad/arrays/imputation_beagle/ImputationBeagle.wdl
89+
90+
- name: ArrayImputationQuotaConsumed
91+
subclass: WDL
92+
primaryDescriptorPath: /pipelines/broad/arrays/imputation_beagle/ArrayImputationQuotaConsumed.wdl
93+
8694
- name: RNAWithUMIsPipeline
8795
subclass: WDL
8896
primaryDescriptorPath: /pipelines/broad/rna_seq/RNAWithUMIsPipeline.wdl
@@ -155,6 +163,10 @@ workflows:
155163
subclass: WDL
156164
primaryDescriptorPath: /verification/test-wdls/TestImputation.wdl
157165

166+
- name: TestImputationBeagle
167+
subclass: WDL
168+
primaryDescriptorPath: /verification/test-wdls/TestImputationBeagle.wdl
169+
158170
- name: TestJointGenotyping
159171
subclass: WDL
160172
primaryDescriptorPath: /verification/test-wdls/TestJointGenotyping.wdl

‎.github/workflows/test_imputation_beagle.yml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: Test ImputationBeagle
2+
3+
# Controls when the workflow will run
4+
on:
5+
pull_request:
6+
branches: [ "develop", "staging", "master" ]
7+
# Only run if files in these paths changed:
8+
####################################
9+
# SET PIPELINE SPECIFIC PATHS HERE #
10+
####################################
11+
paths:
12+
- 'pipelines/broad/arrays/imputation_beagle/**'
13+
- 'structs/imputation/ImputationBeagleStructs.wdl'
14+
- 'tasks/broad/ImputationTasks.wdl'
15+
- 'tasks/broad/ImputationBeagleTasks.wdl'
16+
- 'verification/VerifyImputationBeagle.wdl'
17+
- 'verification/test-wdls/TestImputationBeagle.wdl'
18+
- 'tasks/broad/Utilities.wdl'
19+
- 'tasks/broad/TerraCopyFilesFromCloudToCloud.wdl'
20+
- '.github/workflows/test_imputation_beagle.yml'
21+
- '.github/workflows/warp_test_workflow.yml'
22+
23+
24+
# Allows you to run this workflow manually from the Actions tab
25+
workflow_dispatch:
26+
inputs:
27+
useCallCache:
28+
description: 'Use call cache (default: true)'
29+
required: false
30+
default: "true"
31+
updateTruth:
32+
description: 'Update truth files (default: false)'
33+
required: false
34+
default: "false"
35+
testType:
36+
description: 'Specify the type of test (Plumbing or Scientific)'
37+
required: false
38+
type: choice
39+
options:
40+
- Plumbing
41+
- Scientific
42+
truthBranch:
43+
description: 'Specify the branch for truth files (default: master)'
44+
required: false
45+
default: "master"
46+
47+
env:
48+
# pipeline configuration
49+
PIPELINE_NAME: TestImputationBeagle
50+
DOCKSTORE_PIPELINE_NAME: ImputationBeagle
51+
PIPELINE_DIR: "pipelines/broad/arrays/imputation_beagle"
52+
53+
# workspace configuration
54+
TESTING_WORKSPACE: WARP Tests
55+
WORKSPACE_NAMESPACE: warp-pipelines
56+
57+
# service account configuration
58+
SA_JSON_B64: ${{ secrets.PDT_TESTER_SA_B64 }}
59+
USER: pdt-tester@warp-pipeline-dev.iam.gserviceaccount.com
60+
61+
62+
jobs:
63+
TestImputationBeagle:
64+
uses: ./.github/workflows/warp_test_workflow.yml
65+
with:
66+
pipeline_name: TestImputationBeagle
67+
dockstore_pipeline_name: ImputationBeagle
68+
pipeline_dir: pipelines/broad/arrays/imputation_beagle
69+
use_call_cache: ${{ github.event.inputs.useCallCache || 'true' }}
70+
update_truth: ${{ github.event.inputs.updateTruth || 'false' }}
71+
test_type: ${{ github.event.inputs.testType }}
72+
truth_branch: ${{ github.event.inputs.truthBranch || 'master' }}
73+
secrets:
74+
PDT_TESTER_SA_B64: ${{ secrets.PDT_TESTER_SA_B64 }}
75+
DOCKSTORE_TOKEN: ${{ secrets.DOCKSTORE_TOKEN }}

‎pipeline_versions.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
Pipeline Name Version Date of Last Commit
22
Arrays 2.6.30 2024-11-04
33
ValidateChip 1.16.7 2024-11-04
4-
Imputation 1.1.15 2024-11-04
4+
ArrayImputationQuotaConsumed 1.0.0 2025-02-24
5+
ImputationBeagle 1.0.0 2025-02-26
6+
Imputation 1.1.16 2025-02-24
57
MultiSampleArrays 1.6.2 2024-08-02
68
WholeGenomeReprocessing 3.3.3 2024-11-04
79
ExomeReprocessing 3.3.3 2024-11-04
810
CramToUnmappedBams 1.1.3 2024-08-02
911
ExternalWholeGenomeReprocessing 2.3.3 2024-11-04
1012
ExternalExomeReprocessing 3.3.3 2024-11-04
1113
BroadInternalArrays 1.1.14 2024-11-04
12-
BroadInternalImputation 1.1.14 2024-11-04
14+
BroadInternalImputation 1.1.15 2025-02-24
1315
BroadInternalRNAWithUMIs 1.0.36 2024-11-04
1416
BroadInternalUltimaGenomics 1.1.3 2024-12-05
1517
RNAWithUMIsPipeline 1.0.18 2024-11-04

‎pipelines/broad/arrays/imputation/Imputation.changelog.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 1.1.16
2+
2025-02-24 (Date of Last Commit)
3+
4+
* Updated runtime parameters in some ImputationTasks, and added an explicit definition of a vcf_index.
5+
16
# 1.1.15
27
2024-11-04 (Date of Last Commit)
38

‎pipelines/broad/arrays/imputation/Imputation.wdl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import "../../../../tasks/broad/Utilities.wdl" as utils
66

77
workflow Imputation {
88

9-
String pipeline_version = "1.1.15"
9+
String pipeline_version = "1.1.16"
1010

1111
input {
1212
Int chunkLength = 25000000
@@ -242,6 +242,7 @@ workflow Imputation {
242242
call tasks.SelectVariantsByIds {
243243
input:
244244
vcf = SetIdsVcfToImpute.output_vcf,
245+
vcf_index = SetIdsVcfToImpute.output_vcf_index,
245246
ids = FindSitesUniqueToFileTwoOnly.missing_sites,
246247
basename = "imputed_sites_to_recover"
247248
}

‎pipelines/broad/arrays/imputation_beagle/ArrayImputationQuotaConsumed.changelog.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# 1.0.0
2+
2025-02-24 (Date of Last Commit)
3+
4+
* Initial release of pipeline to calculate the number of samples, i.e. quota used by an imputation service that uses ImputationBeagle.wdl.

‎pipelines/broad/arrays/imputation_beagle/ArrayImputationQuotaConsumed.wdl‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
version 1.0
2+
3+
import "../../../../tasks/broad/ImputationTasks.wdl" as tasks
4+
5+
workflow QuotaConsumed {
6+
String pipeline_version = "1.0.0"
7+
8+
input {
9+
Int chunkLength = 25000000
10+
Int chunkOverlaps = 5000000
11+
12+
File multi_sample_vcf
13+
14+
File ref_dict
15+
Array[String] contigs
16+
String reference_panel_path_prefix
17+
String genetic_maps_path
18+
String output_basename
19+
}
20+
21+
call tasks.CountSamples {
22+
input:
23+
vcf = multi_sample_vcf
24+
}
25+
26+
output {
27+
Int quota_consumed = CountSamples.nSamples
28+
}
29+
}

‎pipelines/broad/arrays/imputation_beagle/ImputationBeagle.changelog.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# 1.0.0
2+
2025-02-26 (Date of Last Commit)
3+
4+
* Initial public release of the ImputationBeagle pipeline.
5+
* The ImputationBeagle pipeline imputes missing genotypes from a multi-sample VCF using a large genomic reference panel. It is based on the Michigan Imputation Server pipeline but uses the Beagle imputation tool instead of minimac. Overall, the pipeline filters, phases, and performs imputation on a multi-sample VCF. It outputs the imputed VCF.

0 commit comments

Comments
 (0)