Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

iedb workflow #9

Open
wants to merge 20 commits into
base: webdb_workflow
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ec94b88
add placeholder for getAndUnpack/loadDataset for iedb epitopes
jbrestel Mar 19, 2024
1ca7697
Updated the project.xml to add template for the epitope analysis, add…
sybah2 Apr 2, 2024
0f099a1
Updated the mapEpitopeNextflow.xml
sybah2 Apr 4, 2024
508dec5
Updated the project.xml and mapEpitopeNextflow.xml for the epitope ma…
sybah2 Apr 8, 2024
977844f
Updated the datasetName and dependency in the project.xml file and in…
sybah2 Apr 8, 2024
cf609ca
Moved the component_epitope_IEDB_RSRC subgraph to the top of the proj…
sybah2 Apr 9, 2024
cdbc52b
Updated teh mapEpitopeNextflow.xml to fill the taxon
sybah2 Apr 9, 2024
47d2b79
some refactoring and dependency fixes
jbrestel Apr 9, 2024
73ee8e1
Merge branch 'webdb_workflow' into iedbWorkflow
jbrestel Apr 17, 2024
4034930
Added the loading step in the mapEpitopeNextflow.xml and added a perl…
sybah2 Apr 18, 2024
c474522
Merge branch 'iedbWorkflow' of github.com:VEuPathDB/ApiCommonWorkflow…
sybah2 Apr 18, 2024
1ed7be4
Updated the mapEpitopeNextflow.xml to add the external dabase release…
sybah2 Apr 19, 2024
b2fb8c3
Merge branch 'webdb_workflow' into iedbWorkflow
jbrestel Apr 19, 2024
4967d69
Merge branch 'webdb_workflow' into iedbWorkflow
jbrestel Apr 24, 2024
80409e8
Updated the mapEpitopeNextflow.xml and the project.xml for the iedb e…
sybah2 Apr 24, 2024
c6d7d70
Add speciesNcbiTaxonId prop to organism graph for IEDB workflow
kathryncrouch May 1, 2024
87929a6
Updated the nextflow making perl module, componentGlobal graph, mapEp…
sybah2 May 9, 2024
8c8ab3f
Updated the /mapEpitopeNextflow.xml and MakeEpitopeMappingNextflowCon…
sybah2 May 10, 2024
b89690c
Updated the MakeEpitopeMappingNextflowConfig.pm file paths, component…
sybah2 May 14, 2024
883d6da
Updated the mapEpitopeNextflow.xml and added the config param for loa…
sybah2 May 17, 2024
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
56 changes: 56 additions & 0 deletions Main/lib/perl/WorkflowSteps/MakeEpitopeMappingNextflowConfig.pm
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package ApiCommonWorkflow::Main::WorkflowSteps::MakeEpitopeMappingNextflowConfig;

@ISA = (ApiCommonWorkflow::Main::WorkflowSteps::WorkflowStep);

use warnings;
use strict;
use ApiCommonWorkflow::Main::WorkflowSteps::WorkflowStep;


sub run {
my ($self, $test, $undo) = @_;

my $workflowDataDir = $self->getWorkflowDataDir();
my $clusterWorkflowDataDir = $self->getClusterWorkflowDataDir();
my $results = join("/", $workflowDataDir, $self->getParamValue("clusterResultDir"));
my $refFasta = $self->getParamValue("refFasta");
my $peptidesTab = $self->getParamValue("peptidesTab");
my $peptideGeneFasta = $self->getParamValue("peptideGeneFasta");
my $taxon = $self->getParamValue("taxon");
my $peptideMatchResults = $self->getParamValue("peptideMatchResults");
my $peptidesFilteredBySpeciesFasta = $self->getParamValue("peptidesFilteredBySpeciesFasta");
my $peptideMatchBlastCombinedResults = $self->getParamValue("peptideMatchBlastCombinedResults");
my $chunkSize = $self->getParamValue("chunkSize");
my $configPath = join("/", $self->getWorkflowDataDir(), $self->getParamValue("configFileName"));


if ($undo) {
$self->runCmd(0,"rm -rf $configPath");
} else {

open(F, ">", $configPath) or die "$! :Can't open config file '$configPath' for writing";
print F
"
params {
refFasta = \"$refFasta\"
peptidesTab = \"$peptidesTab\"
peptideGeneFasta = \"$peptideGeneFasta\"
taxon = $taxon
peptideMatchResults = \"$peptideMatchResults\"
peptidesFilteredBySpeciesFasta = \"$peptidesFilteredBySpeciesFasta\"
peptideMatchBlastCombinedResults = \"$peptideMatchBlastCombinedResults\"
chuckSize = $chunkSize
results = \"$results\"

}

singularity {
enabled = true
autoMounts = true
}
"

}

}
1;
12 changes: 12 additions & 0 deletions Main/lib/xml/workflow/componentGlobalGraph.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,16 @@
</subgraph>


<!-- TODO: Replace this with call to new subgraph which will call loadDataset.xml AND mirror tab+protinFasta to cluster -->
<subgraph name="component_epitope_IEDB_RSRC" xmlFile="loadDataset.xml">
<paramValue name="datasetName">component_epitope_IEDB_RSRC</paramValue>
<paramValue name="datasetLoaderXmlFileName">$$globalDatasetLoaderXmlFile$$</paramValue>
<paramValue name="parentDataDir"/>
<paramValue name="gusConfigFile">$$gusConfigFile$$</paramValue>
<depends name="initUserGroupProject"/>
</subgraph>




</workflowGraph>
69 changes: 69 additions & 0 deletions Main/lib/xml/workflow/mapEpitopeNextflow.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<sworkflowGraph name="">
<param name="parentDataDir"/>
<param name="name"/>
<param name="refFasta"/>
<param name="peptideGeneFasta"/>
<param name="taxon"/>

<constant name="dataDir">$$parentDataDir$$/$$$$</constant>
<constant name="analysisConfig">$$parentDataDir$$/$$$$/final/analysisConfig.xml</constant>


<subgraph name="loadDataset" xml="loadDataset.xml">
<paramValue name="datasetName">$$$$</paramValue> <!-- should be conponent name -->
<paramValue name="datasetLoaderXmlFileName">$$$$</paramValue>
<paramValue name="parentDataDir">$$parentDataDir$$</paramValue>

</subgraph>


<step name="mirrorToClusterData" stepClass="ReFlow::StepClasses::MirrorToComputeCluster" stepLoadTypes="toCluster">
<paramValue name="fileOrDirToMirror">$$parentDataDir$$/$$$$</paramValue>
<depends name="loadDataset"/>
</step>


<step name="makeSamplesOutputDir" stepClass="ReFlow::StepClasses::MakeDataDir">
<paramValue name="dataDir">$$dataDir$$</paramValue>
<depends name="loadDataset"/>
</step>

<step name="epitopeNextflowConfig" stepClass="ApiCommonWorkflow::Main::WorkflowSteps::MakeEpitopeMappingNextflowConfig">
<paramValue name="analysisDir">$$parentDataDir$$</paramValue>
<paramValue name="refFasta">$$parentDataDir$$</paramValue>
<paramValue name="peptidesTab">$$parentDataDir$$/peptidesTab</paramValue>
<paramValue name="peptideGeneFasta">$$parentDataDir$$</paramValue>
<paramValue name="taxon">$$$$</paramValue>
<paramValue name="peptideMatchResults">PeptideMatches.txt</paramValue>
<paramValue name="peptidesFilteredBySpeciesFasta">PeptidesFilteredBySpecies.fasta</paramValue>
<paramValue name="peptideMatchBlastCombinedResults">peptideMatchBlastCombinedResults.txt</paramValue>
<paramValue name="results">$$DataDir$$/results</paramValue>
<paramValue name="chunkSize">500</paramValue>
<paramValue name="configFileName">$$parentDataDir$$/$$$$/nextflow.config</paramValue>

</step>


<step name="mirrorToCluster" stepClass="ReFlow::StepClasses::MirrorToComputeCluster" stepLoadTypes="toCluster">
<paramValue name="fileOrDirToMirror">$$dataDir$$</paramValue>
<depends name="epitopeNextflowConfig"/>
</step>

<step name="runEpitopeMapping" stepClass="ReFlow::StepClasses::RunAndMonitorNextflow">
<paramValue name="workingDir">$$dataDir$$</paramValue>
<paramValue name="resultsDir">$$dataDir$$/results</paramValue>
<paramValue name="nextflowConfigFile">$$dataDir$$/nextflow.config</paramValue>
<paramValue name="nextflowWorkflow">VEuPathDB/iedb-epitope-mapping-nextflow</paramValue>
<paramValue name="isGitRepo">true</paramValue>
<depends name="mirrorToCluster"/>
</step>

<step name="mirrorFromCluster" stepClass="ReFlow::StepClasses::MirrorFromComputeCluster" stepLoadTypes="fromCluster">
<paramValue name="fileOrDirToMirror">$$dataDir$$/results</paramValue>
<paramValue name="outputDir">$$dataDir$$/results</paramValue>
<paramValue name="outputFiles">TODO</paramValue>
<paramValue name="deleteAfterCopy">false</paramValue>
<depends name="runEpitopeMapping"/>
</step>

</workflowGraph>
15 changes: 15 additions & 0 deletions Main/lib/xml/workflowTemplates/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -683,4 +683,19 @@ ec
</subgraph>
</datasetTemplate>
-->
<datasetTemplate class="EpitopeMappingNextflow">
<prop name="organismAbbrev"/>
<prop name="name"/>
<prop name="version"/>

<subgraph name="${name}_${organismAbbrev}_epitope_sequences_IEDB" xml="mapEpitopeNextflow.xml">
<paramValue name="organismAbbrev">${organismAbbrev}</paramValue>
<paramValue name="name">EpitopeMapping</paramValue>
<paramValue name="version"></paramValue>

</subgraph>

</datasetTemplate>


</workflowGraph>