# HG changeset patch # User iuc # Date 1758919633 0 # Node ID cefde4c7f92eb4ee8b89252737c2ec5d984bcc02 # Parent d1a30eb26392536354eca90c46342379bb34212e planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/main/tools/lexicmap commit a9227295a4cebc34b17def7b5ca3e4506222b963 diff -r d1a30eb26392 -r cefde4c7f92e lexicmap.xml --- a/lexicmap.xml Thu Sep 18 11:27:52 2025 +0000 +++ b/lexicmap.xml Fri Sep 26 20:47:13 2025 +0000 @@ -7,48 +7,82 @@ ' | while IFS= read -r line; do clean="\${line#>}"; echo "\${clean%% *}>"; done); + else + query_ids+=\$(cat "\$query_file" | grep '^>' | while IFS= read -r line; do clean="\${line#>}"; echo "\${clean%% *}>"; done); + fi + done; + declare -g -a query_array=(); + IFS='>' read -r -a query_array <<< "\$query_ids"; +} +&& +#for $counter, $index in enumerate($INDICES): + lexicmap search - #for $q in $query - '$q' - #end for + --threads "\${GALAXY_SLOTS:-1}" + + ${load_whole_seeds} + ${all} - --out-file '$out_file' + --index '${index}' + + #for $q in $query + '$q' + #end for + + --out-file 'lexicmap_search_result__index${counter}.tsv' - --top-n-genomes '$top_n_genomes' + --top-n-genomes '$top_n_genomes' + + --align-band '$align_band' + --align-ext-len '$align_ext_len' + --align-max-gap '$align_max_gap' + --align-min-match-len '$align_min_match_len' + --align-min-match-pident '$align_min_match_pident' + --max-evalue '$max_evalue' + --max-query-conc '$max_query_conc' + --seed-max-dist '$seed_max_dist' + --seed-max-gap '$seed_max_gap' + --seed-min-prefix '$seed_min_prefix' + --seed-min-single-prefix '$seed_min_single_prefix' + + #if $min_qcov_per_genome + --min-qcov-per-genome '$min_qcov_per_genome' + #end if - --align-band '$align_band' - --align-ext-len '$align_ext_len' - --align-max-gap '$align_max_gap' - --align-min-match-len '$align_min_match_len' - --align-min-match-pident '$align_min_match_pident' - --max-evalue '$max_evalue' - --max-query-conc '$max_query_conc' - --seed-max-dist '$seed_max_dist' - --seed-max-gap '$seed_max_gap' - --seed-min-prefix '$seed_min_prefix' - --seed-min-single-prefix '$seed_min_single_prefix' + #if $min_qcov_per_hsp + --min-qcov-per-hsp '$min_qcov_per_hsp' + #end if + && +#end for - #if $min_qcov_per_genome - --min-qcov-per-genome '$min_qcov_per_genome' - #end if - - #if $min_qcov_per_hsp - --min-qcov-per-hsp '$min_qcov_per_hsp' - #end if - +#if len($INDICES) > 1 + counter=0 && + extract_query_ids '$query' && + for ((i=0; i<\${#query_array[@]}; i++)); do + counter=\$((counter + 1)); + lexicmap utils merge-search-results + --out-file "combined_result.\${counter}.tsv" + -q "\${query_array[\$i]}" lexicmap_search_result__index*.tsv + -j "\${GALAXY_SLOTS:-1}"; + done && + cat combined_result.*.tsv | awk 'NR==1 || $0 !~ /^query\tqlen\thits/' > '$out_file' +#else + mv lexicmap_search_result__index0.tsv '$out_file' +#end if ]]> @@ -58,10 +92,10 @@ - + - + @@ -100,7 +134,7 @@ - + @@ -112,7 +146,7 @@ - + @@ -124,7 +158,56 @@ - + + + + + + + +
+ +
+ +
+ + + + + + + +
+ +
+ +
+ + + + + + + +
+ +
+ +
+ + + + + + + + +
+ +
+ +
+ @@ -137,6 +220,19 @@ + + + + + + + + +
+ +
+ +
diff -r d1a30eb26392 -r cefde4c7f92e macros.xml --- a/macros.xml Thu Sep 18 11:27:52 2025 +0000 +++ b/macros.xml Fri Sep 26 20:47:13 2025 +0000 @@ -1,11 +1,12 @@ - 0.7.0 - 1 + 0.8.0 + 0 25.0 fasta.gz,fasta lexicmap + file diff -r d1a30eb26392 -r cefde4c7f92e test-data/db2.lmi/genomes.chunks.bin diff -r d1a30eb26392 -r cefde4c7f92e test-data/db2.lmi/genomes.map.bin Binary file test-data/db2.lmi/genomes.map.bin has changed diff -r d1a30eb26392 -r cefde4c7f92e test-data/db2.lmi/genomes/batch_0000/genomes.bin Binary file test-data/db2.lmi/genomes/batch_0000/genomes.bin has changed diff -r d1a30eb26392 -r cefde4c7f92e test-data/db2.lmi/genomes/batch_0000/genomes.bin.idx Binary file test-data/db2.lmi/genomes/batch_0000/genomes.bin.idx has changed diff -r d1a30eb26392 -r cefde4c7f92e test-data/db2.lmi/info.toml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/db2.lmi/info.toml Fri Sep 26 20:47:13 2025 +0000 @@ -0,0 +1,24 @@ +# Index format +main-version = 3 +minor-version = 4 +# LexicHash +max-K = 31 +masks = 20000 +rand-seed = 1 +# Seed distance +max-seed-dist = 100 +seed-dist-in-desert = 50 +# Seeds (k-mer-value data) files +chunks = 2 +index-partitions = 4096 +# Input genomes +input-genomes = 1 +# Input bases +input-bases = 14243 +# Genome data. +# 'genomes' might be larger than 'input-genomes', as some big fragmented genomes are split into multiple chunks. +# In this case, 'genome-batch-size' is not accurate, being variable in different batches. +genomes = 1 +genome-batch-size = 1 +genome-batches = 1 +contig-interval = 1000 diff -r d1a30eb26392 -r cefde4c7f92e test-data/db2.lmi/masks.bin Binary file test-data/db2.lmi/masks.bin has changed diff -r d1a30eb26392 -r cefde4c7f92e test-data/db2.lmi/seeds/chunk_000.bin Binary file test-data/db2.lmi/seeds/chunk_000.bin has changed diff -r d1a30eb26392 -r cefde4c7f92e test-data/db2.lmi/seeds/chunk_000.bin.idx Binary file test-data/db2.lmi/seeds/chunk_000.bin.idx has changed diff -r d1a30eb26392 -r cefde4c7f92e test-data/db2.lmi/seeds/chunk_001.bin Binary file test-data/db2.lmi/seeds/chunk_001.bin has changed diff -r d1a30eb26392 -r cefde4c7f92e test-data/db2.lmi/seeds/chunk_001.bin.idx Binary file test-data/db2.lmi/seeds/chunk_001.bin.idx has changed diff -r d1a30eb26392 -r cefde4c7f92e test-data/lexicmap_index.loc --- a/test-data/lexicmap_index.loc Thu Sep 18 11:27:52 2025 +0000 +++ b/test-data/lexicmap_index.loc Fri Sep 26 20:47:13 2025 +0000 @@ -1,4 +1,6 @@ # This file is just a placeholder since Galxy does # not yet suppoort uploading a lexicmap index, which # is required for functional tests. -LexicMapIndex1 LexicMapIndex1 ${__HERE__}/db.lmi \ No newline at end of file +LexicMapIndex1 LexicMapIndex1 ${__HERE__}/db.lmi +LexicMapIndex2 LexicMapIndex2 ${__HERE__}/db2.lmi +LexicMapIndexCombined LexicMapIndexCombined ${__HERE__}/db.lmi,${__HERE__}/db2.lmi \ No newline at end of file diff -r d1a30eb26392 -r cefde4c7f92e test-data/lexicmap_query.fasta.gz Binary file test-data/lexicmap_query.fasta.gz has changed diff -r d1a30eb26392 -r cefde4c7f92e test-data/lexicmap_query2.fasta.gz Binary file test-data/lexicmap_query2.fasta.gz has changed diff -r d1a30eb26392 -r cefde4c7f92e test-data/lexicmap_query3.fasta --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/lexicmap_query3.fasta Fri Sep 26 20:47:13 2025 +0000 @@ -0,0 +1,4 @@ +>Third Query +CCATAGCTTATGCATACAAACCCTAAAAGTGTGCGGAAACCACATTCT +GTGTAGCCACAATATGCAACGATTACAAAGCACAGTTTTTCTCACTAAATAAACCCGTTATAATGAGCTCATCTTCCAGT +GTATGCATGCCAATACCTGTATGGAAAAATCCAATCAGTCACGTTGT diff -r d1a30eb26392 -r cefde4c7f92e test-data/lexicmap_query_result.tsv --- a/test-data/lexicmap_query_result.tsv Thu Sep 18 11:27:52 2025 +0000 +++ b/test-data/lexicmap_query_result.tsv Fri Sep 26 20:47:13 2025 +0000 @@ -1,2 +1,2 @@ query qlen hits sgenome sseqid qcovGnm cls hsp qcovHSP alenHSP pident gaps qstart qend sstart send sstr slen evalue bitscore -query1 240 1 dataset_963f49fd-cb75-4b60-909c-e63a9651ba65 NC_028981.1 100.000 1 1 100.000 240 100.000 0 1 240 2001 2240 + 7417 3.76e-125 434 +FirstQuery 240 1 dataset_963f49fd-cb75-4b60-909c-e63a9651ba65 NC_028981.1 100.000 1 1 100.000 240 100.000 0 1 240 2001 2240 + 7417 3.76e-125 434 diff -r d1a30eb26392 -r cefde4c7f92e test-data/lexicmap_query_result2.tsv --- a/test-data/lexicmap_query_result2.tsv Thu Sep 18 11:27:52 2025 +0000 +++ b/test-data/lexicmap_query_result2.tsv Fri Sep 26 20:47:13 2025 +0000 @@ -1,3 +1,3 @@ query qlen hits sgenome sseqid qcovGnm cls hsp qcovHSP alenHSP pident gaps qstart qend sstart send sstr slen evalue bitscore -query1 240 1 dataset_963f49fd-cb75-4b60-909c-e63a9651ba65 NC_028981.1 100.000 1 1 100.000 240 100.000 0 1 240 2001 2240 + 7417 3.76e-125 434 -query2 320 1 dataset_963f49fd-cb75-4b60-909c-e63a9651ba65 NC_028981.1 100.000 1 1 100.000 320 100.000 0 1 320 6161 6480 + 7417 1.86e-168 578 +FirstQuery 240 1 dataset_963f49fd-cb75-4b60-909c-e63a9651ba65 NC_028981.1 100.000 1 1 100.000 240 100.000 0 1 240 2001 2240 + 7417 3.76e-125 434 +SecondQuery 320 1 dataset_963f49fd-cb75-4b60-909c-e63a9651ba65 NC_028981.1 100.000 1 1 100.000 320 100.000 0 1 320 6161 6480 + 7417 1.86e-168 578 diff -r d1a30eb26392 -r cefde4c7f92e test-data/lexicmap_query_result3.tsv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/lexicmap_query_result3.tsv Fri Sep 26 20:47:13 2025 +0000 @@ -0,0 +1,2 @@ +query qlen hits sgenome sseqid qcovGnm cls hsp qcovHSP alenHSP pident gaps qstart qend sstart send sstr slen evalue bitscore +Third 175 1 dataset_e743a62d-cda6-41a8-b3f7-0e517bd8b59e NC_028949.1 100.000 1 1 100.000 177 98.870 2 1 175 1631 1807 + 14243 6.86e-92 324 diff -r d1a30eb26392 -r cefde4c7f92e test-data/lexicmap_query_result4.tsv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/lexicmap_query_result4.tsv Fri Sep 26 20:47:13 2025 +0000 @@ -0,0 +1,4 @@ +query qlen hits sgenome sseqid qcovGnm cls hsp qcovHSP alenHSP pident gaps qstart qend sstart send sstr slen evalue bitscore +FirstQuery 240 1 dataset_963f49fd-cb75-4b60-909c-e63a9651ba65 NC_028981.1 100.000 1 1 100.000 240 100.000 0 1 240 2001 2240 + 7417 3.76e-125 434 +SecondQuery 320 1 dataset_963f49fd-cb75-4b60-909c-e63a9651ba65 NC_028981.1 100.000 1 1 100.000 320 100.000 0 1 320 6161 6480 + 7417 1.86e-168 578 +Third 175 1 dataset_e743a62d-cda6-41a8-b3f7-0e517bd8b59e NC_028949.1 100.000 1 1 100.000 177 98.870 2 1 175 1631 1807 + 14243 6.86e-92 324 diff -r d1a30eb26392 -r cefde4c7f92e test-data/lexicmap_query_result5.tsv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/lexicmap_query_result5.tsv Fri Sep 26 20:47:13 2025 +0000 @@ -0,0 +1,3 @@ +query qlen hits sgenome sseqid qcovGnm cls hsp qcovHSP alenHSP pident gaps qstart qend sstart send sstr slen evalue bitscore +FirstQuery 240 1 dataset_963f49fd-cb75-4b60-909c-e63a9651ba65 NC_028981.1 100.000 1 1 100.000 240 100.000 0 1 240 2001 2240 + 7417 3.76e-125 434 +Third 175 1 dataset_e743a62d-cda6-41a8-b3f7-0e517bd8b59e NC_028949.1 100.000 1 1 100.000 177 98.870 2 1 175 1631 1807 + 14243 6.86e-92 324 diff -r d1a30eb26392 -r cefde4c7f92e test-data/lexicmap_query_result6.tsv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/lexicmap_query_result6.tsv Fri Sep 26 20:47:13 2025 +0000 @@ -0,0 +1,7 @@ +query qlen hits sgenome sseqid qcovGnm cls hsp qcovHSP alenHSP pident gaps qstart qend sstart send sstr slen evalue bitscore +FirstQuery 240 2 dataset_963f49fd-cb75-4b60-909c-e63a9651ba65 NC_028981.1 100.000 1 1 100.000 240 100.000 0 1 240 2001 2240 + 7417 3.76e-125 434 +FirstQuery 240 2 dataset_963f49fd-cb75-4b60-909c-e63a9651ba65 NC_028981.1 100.000 1 1 100.000 240 100.000 0 1 240 2001 2240 + 7417 3.76e-125 434 +SecondQuery 320 2 dataset_963f49fd-cb75-4b60-909c-e63a9651ba65 NC_028981.1 100.000 1 1 100.000 320 100.000 0 1 320 6161 6480 + 7417 1.86e-168 578 +SecondQuery 320 2 dataset_963f49fd-cb75-4b60-909c-e63a9651ba65 NC_028981.1 100.000 1 1 100.000 320 100.000 0 1 320 6161 6480 + 7417 1.86e-168 578 +Third 175 2 dataset_e743a62d-cda6-41a8-b3f7-0e517bd8b59e NC_028949.1 100.000 1 1 100.000 177 98.870 2 1 175 1631 1807 + 14243 6.86e-92 324 +Third 175 2 dataset_e743a62d-cda6-41a8-b3f7-0e517bd8b59e NC_028949.1 100.000 1 1 100.000 177 98.870 2 1 175 1631 1807 + 14243 6.86e-92 324