diff --git a/bin/funannotate-predict.py b/bin/funannotate-predict.py index 0b01a875..b35be64c 100755 --- a/bin/funannotate-predict.py +++ b/bin/funannotate-predict.py @@ -1270,20 +1270,11 @@ def which_path(file_name): lib.print_table(InputListCounts) if args.keep_evm and os.path.isfile(EVM_out): - lib.log.info("Using existing EVM predictions") + lib.log.info("Using existing EVM predictions: {:}".format(EVM_out)) else: #setup EVM run EVM_script = os.path.join(parentdir, 'bin', 'funannotate-runEVM.py') - #check if EVM input is identical as before - if os.path.isfile(Predictions+'.old'): - if not lib.sha256_check(Predictions, Predictions+'.old'): - #need to run EVM again, so delete output - if os.path.isfile(EVM_out): - os.remove(EVM_out) - else: - lib.log.info("Using existing EVM run data") - #get absolute paths for everything Weights = os.path.abspath(Weights) EVM_out = os.path.abspath(EVM_out) @@ -1307,8 +1298,10 @@ def which_path(file_name): #add output to command evm_cmd = base_evm + ['--min_intron_length', str(args.min_intronlen), EVM_out] #run EVM - if not os.path.isfile(EVM_out): - subprocess.call(evm_cmd) + lib.log.debug(' '.join(evm_cmd)) + subprocess.call(evm_cmd) + + #check output try: total = lib.countGFFgenes(EVM_out) except IOError: diff --git a/funannotate.py b/funannotate.py index af3c9ee9..0175bf20 100755 --- a/funannotate.py +++ b/funannotate.py @@ -264,6 +264,7 @@ def fmtcols(mylist, cols): --repeats2evm Use repeats in EVM consensus model building --repeat_filter Repetitive gene model filtering. Default: overlap blast [overlap,blast,none] --keep_no_stops Keep gene models without valid stops + --keep_evm Keep existing EVM results (for rerunning pipeline) --SeqCenter Sequencing facilty for NCBI tbl file. Default: CFMR --SeqAccession Sequence accession number for NCBI tbl file. Default: 12345 --force Annotated unmasked genome