# HG changeset patch # User iuc # Date 1490974549 14400 # Node ID 36681c1ad6d7b7ea6f27ca126f97bd9230995cfd # Parent 7d1758a8688418066a96f382a81b76b1ab089b6b planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/trinity commit 7efdf3224552d113a01043ee5bf4517d770df933 diff -r 7d1758a86884 -r 36681c1ad6d7 README.rst --- a/README.rst Thu Mar 23 10:15:57 2017 -0400 +++ b/README.rst Fri Mar 31 11:35:49 2017 -0400 @@ -6,13 +6,25 @@ trinity requires a large amount of memory to perform the assembly: "roughly ~1G of RAM per 1M reads to be assembled" -By default, this tool is configured to limit the memory consumption to 30G. +By default, this tool is configured to limit the memory consumption to 1G. You might need to lower this limit if the machine(s) executing the jobs have less memory available. If you have a lot of reads to assemble and a machine with enough memory, you can increase it. -In both cases, you can edit the TRINITY_MEM_OPTIONS in the file: - -/environment_settings/TRINITY_MEM_OPTIONS/iuc/trinity//env.sh +In both cases, you can set the TRINITY_MAX_MEMORY environmental variable in the destination section of the job_conf.xml file: -to lower the maximum memory usage to 2G for example: + + + + + + + + + + + + 1G + + + -TRINITY_MEM_OPTIONS='--max_memory 2G --bflyHeapSpaceMax 2G' + diff -r 7d1758a86884 -r 36681c1ad6d7 macros.xml --- a/macros.xml Thu Mar 23 10:15:57 2017 -0400 +++ b/macros.xml Fri Mar 31 11:35:49 2017 -0400 @@ -2,18 +2,12 @@ - trinity + trinity - 2.2.0 - - - - - - + 2.4.0 diff -r 7d1758a86884 -r 36681c1ad6d7 samples_qccheck.xml --- a/samples_qccheck.xml Thu Mar 23 10:15:57 2017 -0400 +++ b/samples_qccheck.xml Fri Mar 31 11:35:49 2017 -0400 @@ -1,16 +1,15 @@ - + for transcript quantification macros.xml - bioconductor-biobase - bioconductor-qvalue + bioconductor-biobase + bioconductor-qvalue - - TRINITY_DN1_c0_g1_i1 len=380 path=[358:0-379] [-1, 358, -2] top_iso:1 pct_iso_expr=100 pct_dom_iso_expr=100 +>TRINITY_DN1_c0_g1_i1 len=380 path=[358:0-379] [-1, 358, -2] top_iso:0 pct_iso_expr=NA pct_dom_iso_expr=NA CCAAGGTAGAAAACATCCCTGCTGACAAGACCTACCTGTGACATACTCACTCTCTTAGGG CTTTTAAAGACAAGCCATTAAAATAGATGACCTTTCACAGACTGAAACTTGAATCACTGC AAAATGAATCTAGGTTGCTGTCACTTTTTCTTTTGGGTGGCGGGGCTTGATGTAGATTTT @@ -6,12 +6,12 @@ GGAGGTTAGATTTACTGGAAATGTATTCATACTGTGAACTGTGCTCTGATGGTTAGAATG AAAAGCTTATCAAGCATTCCATATAACAGTGGATGTAGAAAATGTTTTCAGGTGGATATG TATATGGTACAGATGTAAAG ->TRINITY_DN0_c0_g1_i1 len=229 path=[207:0-228] [-1, 207, -2] top_iso:1 pct_iso_expr=100 pct_dom_iso_expr=100 +>TRINITY_DN0_c0_g1_i1 len=229 path=[207:0-228] [-1, 207, -2] top_iso:0 pct_iso_expr=NA pct_dom_iso_expr=NA AAATATCACAACCACCTGAACAGGAACTTGGGATAAACAGGCAATGATGAGAGCCGATGT TTTTCTGTTGGTGTTTACATTGCTCTGCTCTGTGAAAGGATCCTGCAGCAGAGGCTTCCT ACCTGAAAAATGTTTCTCTCAATTGTAGTGTGTGAGTTACTGGTAAGACGCTTACACCTA TAACTCAAGGTCGGAATAGTCCCTCCAGTCCCTTTAGTAACCCAGTGGC ->TRINITY_DN2_c1_g1_i1 len=541 path=[519:0-540] [-1, 519, -2] top_iso:1 pct_iso_expr=100 pct_dom_iso_expr=100 +>TRINITY_DN2_c1_g1_i1 len=541 path=[519:0-540] [-1, 519, -2] top_iso:0 pct_iso_expr=NA pct_dom_iso_expr=NA GTCTGAATTCGCATGTAATGCAGCTTTCCCAGACACAAGTATGGAAGCAATCCGACTTAT TCGCCATTGTGCAAAATATGTGTCTGATAGACCGCAGGCTTTCAAGGAGTACACAAGTGA TGACATGAGCGTGGCACCTGAAGACAGGGTGTGGGTGAGAGGGTGGTTCCCGATCCTCTT @@ -22,12 +22,12 @@ CCAGTATTTAGAAGTTCTCAGCGATGTACTTTTGGATGATATTTTTGCCCAGCTTTACTG GTGTGTACAACAAGACAATGAGCAGTTAGCACGATCTGGTACAAACTGCTTAGAAAACGT G ->TRINITY_DN2_c3_g1_i1 len=202 path=[180:0-201] [-1, 180, -2] top_iso:1 pct_iso_expr=100 pct_dom_iso_expr=100 +>TRINITY_DN2_c3_g1_i1 len=202 path=[180:0-201] [-1, 180, -2] top_iso:0 pct_iso_expr=NA pct_dom_iso_expr=NA GGTGAAAAGTTTACTCTTGAAATCTGGGATAAAACGTGTAACTGCACCCTGGATATCTTC AAAACCACAATTCCTCACGCGCTTCTGACTTGGCGTCCCACCTCTGGCGAGGCCGAACCC CCATCTCCATCAGCTGTGAGTGAAAAGCCGTTGGATGCAATATCACAAAAATCTGTAGAC ATACATGATTCTATTCAACCAA ->TRINITY_DN3_c0_g1_i1 len=216 path=[194:0-215] [-1, 194, -2] top_iso:1 pct_iso_expr=100 pct_dom_iso_expr=100 +>TRINITY_DN3_c0_g1_i1 len=216 path=[194:0-215] [-1, 194, -2] top_iso:0 pct_iso_expr=NA pct_dom_iso_expr=NA ATTGATTTATTTAATAAGAAACCAAAGAGAGGAATACAATACCTCCAAGAACAAGGGATG CTTGGCACCACACCCGAAGATATAGCTCAGTTCTTACATCAAGAAGAAAGATTAGACTCT ACTCAGGTGGGTGAGTTCCTGGGAGATAATGATAAATTCAATAAAGAAGTCATGTATGCA diff -r 7d1758a86884 -r 36681c1ad6d7 test-data/filtered/Trinity_filtered_hi_iso.fasta --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/filtered/Trinity_filtered_hi_iso.fasta Fri Mar 31 11:35:49 2017 -0400 @@ -0,0 +1,45 @@ +>TRINITY_DN1_c0_g1_i1 len=380 path=[358:0-379] [-1, 358, -2] top_iso:1 pct_iso_expr=100 pct_dom_iso_expr=100 +CCAAGGTAGAAAACATCCCTGCTGACAAGACCTACCTGTGACATACTCACTCTCTTAGGG +CTTTTAAAGACAAGCCATTAAAATAGATGACCTTTCACAGACTGAAACTTGAATCACTGC +AAAATGAATCTAGGTTGCTGTCACTTTTTCTTTTGGGTGGCGGGGCTTGATGTAGATTTT +ATTCTATGTACAGAATTTAATGTTGAATATATTAAAAATAACAAACCTGGCATGGTTTTG +GGAGGTTAGATTTACTGGAAATGTATTCATACTGTGAACTGTGCTCTGATGGTTAGAATG +AAAAGCTTATCAAGCATTCCATATAACAGTGGATGTAGAAAATGTTTTCAGGTGGATATG +TATATGGTACAGATGTAAAG +>TRINITY_DN0_c0_g1_i1 len=229 path=[207:0-228] [-1, 207, -2] top_iso:1 pct_iso_expr=100 pct_dom_iso_expr=100 +AAATATCACAACCACCTGAACAGGAACTTGGGATAAACAGGCAATGATGAGAGCCGATGT +TTTTCTGTTGGTGTTTACATTGCTCTGCTCTGTGAAAGGATCCTGCAGCAGAGGCTTCCT +ACCTGAAAAATGTTTCTCTCAATTGTAGTGTGTGAGTTACTGGTAAGACGCTTACACCTA +TAACTCAAGGTCGGAATAGTCCCTCCAGTCCCTTTAGTAACCCAGTGGC +>TRINITY_DN2_c0_g1_i1 len=279 path=[257:0-278] [-1, 257, -2] top_iso:1 pct_iso_expr=100 pct_dom_iso_expr=100 +TCCAGACCATCGACAACATTGTCTTCTTCCCAGCCACAAGCAAGAAGGAGGATGCAGAGA +ACTTAGCTGCAGCCCAGAGAGATGCAGTAGACTTCGATGTTCGAGTTGATACTCAAGACC +AAGGAATGTACCGCTTTTTAACATCACAACAACTGTTCAAGCTACTGGACTGCTTATTAG +AGTCGCATAGATTTGCAAAAGCATTTAATTCCAACAATGAACAGAGGACTGCTCTGTGGA +AAGCAGGCTTCAAAGGCAAGTCCAAGCCCAATCTTCTAA +>TRINITY_DN2_c1_g1_i1 len=541 path=[519:0-540] [-1, 519, -2] top_iso:1 pct_iso_expr=100 pct_dom_iso_expr=100 +GTCTGAATTCGCATGTAATGCAGCTTTCCCAGACACAAGTATGGAAGCAATCCGACTTAT +TCGCCATTGTGCAAAATATGTGTCTGATAGACCGCAGGCTTTCAAGGAGTACACAAGTGA +TGACATGAGCGTGGCACCTGAAGACAGGGTGTGGGTGAGAGGGTGGTTCCCGATCCTCTT +TGAGTTGTCTTGTATCATCAATAGATGCAAATTAGATGTAAGAACCAGGGGCTTAACAGT +AATGTTTGAAATAATGAAAACATATGGCCACACTTATGAAAAACATTGGTGGCAGGACTT +ATTCAGAATTGTTTTCAGAATCTTTGACAACATGAAATTGCCAGAACAGCAGACAGAGAA +AGCTGAATGGATGACAACAACTTGTAACCATGTCCTTTATGCAATATGTGATGTATTCAC +CCAGTATTTAGAAGTTCTCAGCGATGTACTTTTGGATGATATTTTTGCCCAGCTTTACTG +GTGTGTACAACAAGACAATGAGCAGTTAGCACGATCTGGTACAAACTGCTTAGAAAACGT +G +>TRINITY_DN2_c2_g1_i1 len=240 path=[218:0-239] [-1, 218, -2] top_iso:1 pct_iso_expr=100 pct_dom_iso_expr=100 +ACAAGCAGCCTGGCGTGTGGGCTGCGCATTCTCTTCCGGATGTACATGGACGAGAGCAGA +GTCAGTGCCTGGGAAGAAGTCCAGCAGAGGCTTTTAAACGTCTGCAGGGAAGCGCTGAGC +TACTTCCTCACTCTAACATCCGAAAGTCACCGGGAAGCCTGGACTAACTTACTGTTACTG +TTCCTCACTAAAGTTCTGAAGATCAGTGACAGCAGGTTTAAAGCTCACGCATCATTCTAC +>TRINITY_DN2_c3_g1_i1 len=202 path=[180:0-201] [-1, 180, -2] top_iso:1 pct_iso_expr=100 pct_dom_iso_expr=100 +GGTGAAAAGTTTACTCTTGAAATCTGGGATAAAACGTGTAACTGCACCCTGGATATCTTC +AAAACCACAATTCCTCACGCGCTTCTGACTTGGCGTCCCACCTCTGGCGAGGCCGAACCC +CCATCTCCATCAGCTGTGAGTGAAAAGCCGTTGGATGCAATATCACAAAAATCTGTAGAC +ATACATGATTCTATTCAACCAA +>TRINITY_DN3_c0_g1_i1 len=216 path=[194:0-215] [-1, 194, -2] top_iso:1 pct_iso_expr=100 pct_dom_iso_expr=100 +ATTGATTTATTTAATAAGAAACCAAAGAGAGGAATACAATACCTCCAAGAACAAGGGATG +CTTGGCACCACACCCGAAGATATAGCTCAGTTCTTACATCAAGAAGAAAGATTAGACTCT +ACTCAGGTGGGTGAGTTCCTGGGAGATAATGATAAATTCAATAAAGAAGTCATGTATGCA +TATGTAGACCAACATGACTTTTCAGGAAAAGACTTT diff -r 7d1758a86884 -r 36681c1ad6d7 tool_dependencies.xml --- a/tool_dependencies.xml Thu Mar 23 10:15:57 2017 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - '--max_memory 30G --bflyHeapSpaceMax 30G' - -