Skip to content

Commit

Permalink
Remove legacy "ignore_orphans". One day we will bring it back when
Browse files Browse the repository at this point in the history
someone complains
  • Loading branch information
ekiefl committed Mar 4, 2020
1 parent 10eec4c commit 48be7ed
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions anvio/profiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ def __init__(self, args, r=terminal.Run(width=35), p=terminal.Progress()):
self.overwrite_output_destinations = A('overwrite_output_destinations')
self.skip_SNV_profiling = A('skip_SNV_profiling')
self.profile_SCVs = A('profile_SCVs')
self.ignore_orphans = A('ignore_orphans')
self.gen_serialized_profile = A('gen_serialized_profile')
self.distance = A('distance') or constants.distance_metric_default
self.linkage = A('linkage') or constants.linkage_method_default
Expand Down Expand Up @@ -552,6 +551,7 @@ def populate_gene_info_for_splits(self, contig):
Populates Split.per_position_info as a dictionary of arrays, each with length equal to the
split.
"""

if self.skip_SNV_profiling:
return

Expand Down Expand Up @@ -631,7 +631,6 @@ def process_contig(self, bam_file, contig_name, contig_length):
contig.min_coverage_for_variability = self.min_coverage_for_variability
contig.skip_SNV_profiling = self.skip_SNV_profiling
contig.report_variability_full = self.report_variability_full
contig.ignore_orphans = self.ignore_orphans
timer.make_checkpoint('%s initialization done' % contig_name)

# populate contig with empty split objects
Expand Down Expand Up @@ -693,6 +692,8 @@ def process_contig(self, bam_file, contig_name, contig_length):


def profile_single_thread(self):
"""The main method for anvi-profile when num_threads is 1"""

bam_file = bamops.BAMFileObject(self.input_file_path)

received_contigs = 0
Expand Down Expand Up @@ -773,6 +774,8 @@ def profile_single_thread(self):


def profile_multi_thread(self):
"""The main method for anvi-profile when num_threads is >1"""

manager = multiprocessing.Manager()
available_index_queue = manager.Queue()
output_queue = manager.Queue(self.queue_size)
Expand Down

2 comments on commit 48be7ed

@meren
Copy link
Member

@meren meren commented on 48be7ed Mar 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These kinds of changes (and the previous change in the buffer size flag) may require updating the snakemake workflows so parameter assumptions in there do not break.

@ekiefl
Copy link
Contributor Author

@ekiefl ekiefl commented on 48be7ed Mar 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this was already taken out of snakemake workflows in a previous commit, so this commit was just cleaning up some extra

Please sign in to comment.