TreeSAK 1.54.2__tar.gz → 1.54.4__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {treesak-1.54.2/treesak.egg-info → treesak-1.54.4}/PKG-INFO +2 -2
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/VERSION +1 -1
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/dating.py +44 -19
- {treesak-1.54.2 → treesak-1.54.4}/bin/TreeSAK +13 -8
- {treesak-1.54.2 → treesak-1.54.4/treesak.egg-info}/PKG-INFO +2 -2
- {treesak-1.54.2 → treesak-1.54.4}/LICENSE +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/MANIFEST.in +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/README.md +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ALE.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ALE1.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ALE2.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ALE2RTC.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ALE3.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ALE4.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ALE5.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ALE6.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ALE7.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ALE_backup.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/AssessCVG.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/AssessMarker.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/AssessMarkerDeltaLL.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/AssessMarkerPA.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/BMGE.jar +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/BMGE.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/C60SR4.nex +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/CompareMCMC.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ConcateMSA.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ConvertMSA.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/Dir.rb +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ExtractMarkerSeq.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/FastRoot.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/FastRoot_backup.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/FigTree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/GTDB_tree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/GeneTree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/KEGG_Luo17.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/LcaToLeaves.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/MarkerRef2Tree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/MarkerRef2Tree_backup.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/MarkerSeq2Tree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/MarkerSeq2Tree_backup.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ModifyTopo.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/Newick_tree_plotter.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/OMA.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/OMA2.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/OneLineAln.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/PB.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/PMSF.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/PhyloBiAssoc.R +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/PhyloBiAssoc.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/PlotMCMC.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/PlotMcmcNode.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/PlotMcmcNode_old.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/RootTree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/RootTreeGTDB.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/RootTreeGTDB214.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/RootTreeGTDB220.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/SequentialDating.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/SingleAleHGT.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/SingleLinePhy.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/SliceMSA.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/SplitScore.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/SplitScore1.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/SplitScore1OMA.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/SplitScore2.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/TaxaCountStats.R +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/TaxonTree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/TreeSAK_config.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/VisHPD95.R +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/VisHPD95.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/__init__.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ale_parser.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/ale_splitter.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/alignment_pruner.pl +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/assessOG.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/assessPB.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/batch_itol.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/catfasta2phy.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/cogTree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/compare_trees.R +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/compare_trees.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/dating_ss.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/deltall.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/do_rrtc.rb +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/fa2phy.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/filter_rename_ar53.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/format_leaf_name.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/gap_stats.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/get_SCG_tree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/get_arCOG_seq.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/global_functions.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/gnm_leaves.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/guide_tree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/iTOL.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/iTOL_gene_tree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/itol_msa_stats.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/keep_highest_rrtc.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/koTree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/label_gene_tree_by_gnm.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/label_tree.R +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/label_tree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/mad.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/mcmc2tree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/mcmcTC copy.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/mcmcTC.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/mcmctree_vs_reltime.R +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/mcmctree_vs_reltime.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/merge_pdf.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/pRTC.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/parse_mcmctree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/parse_reltime.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/phy2fa.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/plot_distruibution_th.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/prep_mcmctree_ctl.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/print_leaves.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/pruneMSA.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/recode.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/remove_bias.R +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/rename_leaves.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/replace_clade.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/root_with_out_group.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/run_TaxaCountStats_R_s1.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/subsample_drep_gnms.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/subset.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/subset_tree_stupid_old_way.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/supertree.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/tmp_1.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/tmp_2.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/tmp_3.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/tmp_4.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/tmp_5.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/TreeSAK/weighted_rand.rb +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/setup.cfg +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/setup.py +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/treesak.egg-info/SOURCES.txt +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/treesak.egg-info/dependency_links.txt +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/treesak.egg-info/requires.txt +0 -0
- {treesak-1.54.2 → treesak-1.54.4}/treesak.egg-info/top_level.txt +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: treesak
|
|
3
|
-
Version: 1.54.
|
|
3
|
+
Version: 1.54.4
|
|
4
4
|
Summary: BioSAK
|
|
5
5
|
Home-page: https://github.com/songweizhi/TreeSAK
|
|
6
6
|
Author: Weizhi Song
|
|
@@ -24,4 +24,4 @@ Requires-Dist: kaleido
|
|
|
24
24
|
Requires-Dist: PyPDF3
|
|
25
25
|
Requires-Dist: dendropy
|
|
26
26
|
|
|
27
|
-
TreeSAK v1.54.
|
|
27
|
+
TreeSAK v1.54.4
|
|
@@ -7,9 +7,10 @@ from distutils.spawn import find_executable
|
|
|
7
7
|
dating_usage = '''
|
|
8
8
|
============================ dating example commands ============================
|
|
9
9
|
|
|
10
|
-
# Requirement: PAML
|
|
10
|
+
# Requirement: mcmctree (part of PAML)
|
|
11
11
|
|
|
12
|
-
TreeSAK dating -i gnm.tree -m msa.phy -p topo1 -o dating_wd -f -s parameter.txt
|
|
12
|
+
TreeSAK dating -i gnm.tree -m msa.phy -p topo1 -o dating_wd -f -s parameter.txt -BDparas M -hpc4
|
|
13
|
+
TreeSAK dating -i gnm.tree -m msa.phy -p topo1 -o dating_wd -f -s parameter.txt -BDparas C -hpc4
|
|
13
14
|
|
|
14
15
|
# parameter.txt file format (tab separated)
|
|
15
16
|
clock 2,3
|
|
@@ -62,12 +63,12 @@ def prep_mcmctree_ctl(ctl_para_dict, mcmctree_ctl_file):
|
|
|
62
63
|
ctl_file_handle.write(' alpha = %s * alpha for gamma rates at sites\n' % ctl_para_dict.get('alpha', 0.5))
|
|
63
64
|
ctl_file_handle.write(' ncatG = %s * No. categories in discrete gamma\n' % ctl_para_dict.get('ncatG', 4))
|
|
64
65
|
ctl_file_handle.write(' cleandata = %s * remove sites with ambiguity data (1:yes, 0:no)?\n' % ctl_para_dict.get('cleandata', 0))
|
|
65
|
-
ctl_file_handle.write(' BDparas = %s * birth, death, sampling\n'
|
|
66
|
+
ctl_file_handle.write(' BDparas = %s * birth, death, sampling, conditional/multiplicative\n' % ctl_para_dict['BDparas'])
|
|
66
67
|
ctl_file_handle.write(' kappa_gamma = %s * gamma prior for kappa\n' % ctl_para_dict.get('kappa_gamma', '6 2'))
|
|
67
68
|
ctl_file_handle.write(' alpha_gamma = %s * gamma prior for alpha\n' % ctl_para_dict.get('alpha_gamma', '1 1'))
|
|
68
69
|
ctl_file_handle.write(' rgene_gamma = %s * gammaDir prior for rate for genes\n' % ctl_para_dict.get('rgene_gamma', '1 50 1'))
|
|
69
70
|
ctl_file_handle.write(' sigma2_gamma = %s * gammaDir prior for sigma^2 (for clock=2 or 3)\n' % ctl_para_dict.get('sigma2_gamma', '1 10 1'))
|
|
70
|
-
ctl_file_handle.write(' finetune = %s * auto (0 or 1): times, musigma2, rates, mixing, paras, FossilErr\n' % ctl_para_dict.get('finetune', '1: .1 .1 .1 .1 .1 .1'))
|
|
71
|
+
# ctl_file_handle.write(' finetune = %s * auto (0 or 1): times, musigma2, rates, mixing, paras, FossilErr\n' % ctl_para_dict.get('finetune', '1: .1 .1 .1 .1 .1 .1'))
|
|
71
72
|
ctl_file_handle.write(' print = %s * 0: no mcmc sample; 1: everything except branch rates 2: everything\n' % ctl_para_dict.get('print', 1))
|
|
72
73
|
ctl_file_handle.write(' burnin = %s\n' % ctl_para_dict.get('burnin', 50000))
|
|
73
74
|
ctl_file_handle.write(' sampfreq = %s\n' % ctl_para_dict.get('sampfreq', 50))
|
|
@@ -120,8 +121,13 @@ def dating(args):
|
|
|
120
121
|
op_prefix = args['p']
|
|
121
122
|
seq_type = args['st']
|
|
122
123
|
settings_to_compare = args['s']
|
|
123
|
-
wrap_with_srun = args['srun']
|
|
124
124
|
force_overwrite = args['f']
|
|
125
|
+
bd_paras = args['BDparas']
|
|
126
|
+
submit_to_hpc4 = args['hpc4']
|
|
127
|
+
hpc4_wt = args['hpc4_wt']
|
|
128
|
+
hpc4_a = args['hpc4_a']
|
|
129
|
+
hpc4_q = args['hpc4_q']
|
|
130
|
+
hpc4_conda = args['hpc4_conda']
|
|
125
131
|
|
|
126
132
|
check_dependencies(['mcmctree'])
|
|
127
133
|
|
|
@@ -167,6 +173,10 @@ def dating(args):
|
|
|
167
173
|
get_bv_para_dict['outfile'] = 'out.txt'
|
|
168
174
|
get_bv_para_dict['seqtype'] = seq_type
|
|
169
175
|
get_bv_para_dict['usedata'] = '3'
|
|
176
|
+
if bd_paras in ['M', 'm']:
|
|
177
|
+
get_bv_para_dict['BDparas'] = '1 1 0.1 M'
|
|
178
|
+
if bd_paras in ['C', 'c']:
|
|
179
|
+
get_bv_para_dict['BDparas'] = '1 1 0.1 C'
|
|
170
180
|
|
|
171
181
|
prep_mcmctree_ctl(get_bv_para_dict, mcmctree_ctl_bv)
|
|
172
182
|
|
|
@@ -186,10 +196,7 @@ def dating(args):
|
|
|
186
196
|
############################################# write out step 2 command #############################################
|
|
187
197
|
|
|
188
198
|
print('Preparing files for dating estimation')
|
|
189
|
-
|
|
190
199
|
para_comb_dict = get_parameter_combinations(para_to_test_dict)
|
|
191
|
-
print('para_comb_dict')
|
|
192
|
-
print(para_comb_dict)
|
|
193
200
|
|
|
194
201
|
dating_cmds_txt_handle = open(dating_cmds_txt, 'w')
|
|
195
202
|
for para_comb in sorted(list(para_comb_dict.keys())):
|
|
@@ -218,6 +225,10 @@ def dating(args):
|
|
|
218
225
|
current_para_dict_run1['outfile'] = '%s_%s_run1_out.txt' % (op_prefix, para_comb)
|
|
219
226
|
current_para_dict_run1['seqtype'] = seq_type
|
|
220
227
|
current_para_dict_run1['usedata'] = '2'
|
|
228
|
+
if bd_paras in ['M', 'm']:
|
|
229
|
+
current_para_dict_run1['BDparas'] = '1 1 0.1 M'
|
|
230
|
+
if bd_paras in ['C', 'c']:
|
|
231
|
+
current_para_dict_run1['BDparas'] = '1 1 0.1 C'
|
|
221
232
|
|
|
222
233
|
# run 2
|
|
223
234
|
current_para_dict_run2 = para_comb_dict[para_comb].copy()
|
|
@@ -227,6 +238,10 @@ def dating(args):
|
|
|
227
238
|
current_para_dict_run2['outfile'] = '%s_%s_run2_out.txt' % (op_prefix, para_comb)
|
|
228
239
|
current_para_dict_run2['seqtype'] = seq_type
|
|
229
240
|
current_para_dict_run2['usedata'] = '2'
|
|
241
|
+
if bd_paras in ['M', 'm']:
|
|
242
|
+
current_para_dict_run2['BDparas'] = '1 1 0.1 M'
|
|
243
|
+
if bd_paras in ['C', 'c']:
|
|
244
|
+
current_para_dict_run2['BDparas'] = '1 1 0.1 C'
|
|
230
245
|
|
|
231
246
|
prep_mcmctree_ctl(current_para_dict_run1, mcmctree_ctl_1)
|
|
232
247
|
prep_mcmctree_ctl(current_para_dict_run2, mcmctree_ctl_2)
|
|
@@ -238,11 +253,16 @@ def dating(args):
|
|
|
238
253
|
# write out commands
|
|
239
254
|
cmd_run_1 = 'cd %s/%s/%s; mcmctree' % (current_pwd, op_dir, current_dating_wd_1.split('/')[-1])
|
|
240
255
|
cmd_run_2 = 'cd %s/%s/%s; mcmctree' % (current_pwd, op_dir, current_dating_wd_2.split('/')[-1])
|
|
241
|
-
if wrap_with_srun is True:
|
|
242
|
-
cmd_run_1 = 'BioSAK srun -c "%s"' % cmd_run_1
|
|
243
|
-
cmd_run_2 = 'BioSAK srun -c "%s"' % cmd_run_2
|
|
244
256
|
dating_cmds_txt_handle.write(cmd_run_1 + '\n')
|
|
245
257
|
dating_cmds_txt_handle.write(cmd_run_2 + '\n')
|
|
258
|
+
|
|
259
|
+
# submit_to_hpc4
|
|
260
|
+
if submit_to_hpc4 is True:
|
|
261
|
+
hpc4_cmd_run_1 = 'BioSAK hpc4 -wt %s -q %s -a %s -t 2 -tpc 1 -conda %s -n %s_%s -c "%s"' % (hpc4_wt, hpc4_q, hpc4_a, hpc4_conda, op_prefix, para_comb, cmd_run_1)
|
|
262
|
+
hpc4_cmd_run_2 = 'BioSAK hpc4 -wt %s -q %s -a %s -t 2 -tpc 1 -conda %s -n %s_%s -c "%s"' % (hpc4_wt, hpc4_q, hpc4_a, hpc4_conda, op_prefix, para_comb, cmd_run_2)
|
|
263
|
+
os.system(hpc4_cmd_run_1)
|
|
264
|
+
os.system(hpc4_cmd_run_2)
|
|
265
|
+
|
|
246
266
|
dating_cmds_txt_handle.close()
|
|
247
267
|
|
|
248
268
|
print('Job script for performing dating exported to: %s' % dating_cmds_txt)
|
|
@@ -251,14 +271,19 @@ def dating(args):
|
|
|
251
271
|
if __name__ == '__main__':
|
|
252
272
|
|
|
253
273
|
dating_parser = argparse.ArgumentParser()
|
|
254
|
-
dating_parser.add_argument('-i',
|
|
255
|
-
dating_parser.add_argument('-m',
|
|
256
|
-
dating_parser.add_argument('-o',
|
|
257
|
-
dating_parser.add_argument('-p',
|
|
258
|
-
dating_parser.add_argument('-s',
|
|
259
|
-
dating_parser.add_argument('-
|
|
260
|
-
dating_parser.add_argument('-
|
|
261
|
-
dating_parser.add_argument('-
|
|
274
|
+
dating_parser.add_argument('-i', required=True, help='input tree file')
|
|
275
|
+
dating_parser.add_argument('-m', required=True, help='sequence alignments')
|
|
276
|
+
dating_parser.add_argument('-o', required=True, help='output directory')
|
|
277
|
+
dating_parser.add_argument('-p', required=True, help='output prefix')
|
|
278
|
+
dating_parser.add_argument('-s', required=True, help='settings to compare')
|
|
279
|
+
dating_parser.add_argument('-BDparas', required=True, help='BDparas, either M/m or C/c')
|
|
280
|
+
dating_parser.add_argument('-st', required=False, default='2', help='sequence type, 0 for nucleotides, 1 for codons, 2 for AAs, default: 2')
|
|
281
|
+
dating_parser.add_argument('-hpc4', required=False, action="store_true", help='submit job on hpc4')
|
|
282
|
+
dating_parser.add_argument('-hpc4_wt', required=False, default='119:59:59', help='walltime, default: 119:59:59')
|
|
283
|
+
dating_parser.add_argument('-hpc4_a', required=False, default='marmolecol', help='hpc4 account, select from marmolecol and spongeholobiont, default: marmolecol')
|
|
284
|
+
dating_parser.add_argument('-hpc4_q', required=False, default='amd', help='hpc4 queue, select from amd, intel, gpu-a30, gpu-l20 and gpu-rtx5880, default: amd')
|
|
285
|
+
dating_parser.add_argument('-hpc4_conda', required=False, default='mybase2', help='conda environment, default: mybase2')
|
|
286
|
+
dating_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
|
|
262
287
|
args = vars(dating_parser.parse_args())
|
|
263
288
|
dating(args)
|
|
264
289
|
|
|
@@ -313,14 +313,19 @@ if __name__ == '__main__':
|
|
|
313
313
|
elif sys.argv[1] == 'dating':
|
|
314
314
|
from TreeSAK import dating
|
|
315
315
|
dating_parser = subparsers.add_parser('dating', usage=dating.dating_usage)
|
|
316
|
-
dating_parser.add_argument('-i',
|
|
317
|
-
dating_parser.add_argument('-m',
|
|
318
|
-
dating_parser.add_argument('-o',
|
|
319
|
-
dating_parser.add_argument('-p',
|
|
320
|
-
dating_parser.add_argument('-s',
|
|
321
|
-
dating_parser.add_argument('-
|
|
322
|
-
dating_parser.add_argument('-
|
|
323
|
-
dating_parser.add_argument('-
|
|
316
|
+
dating_parser.add_argument('-i', required=True, help='input tree file')
|
|
317
|
+
dating_parser.add_argument('-m', required=True, help='sequence alignments')
|
|
318
|
+
dating_parser.add_argument('-o', required=True, help='output directory')
|
|
319
|
+
dating_parser.add_argument('-p', required=True, help='output prefix')
|
|
320
|
+
dating_parser.add_argument('-s', required=True, help='settings to compare')
|
|
321
|
+
dating_parser.add_argument('-BDparas', required=True, help='BDparas, either M/m or C/c')
|
|
322
|
+
dating_parser.add_argument('-st', required=False, default='2', help='sequence type, 0 for nucleotides, 1 for codons, 2 for AAs, default: 2')
|
|
323
|
+
dating_parser.add_argument('-hpc4', required=False, action="store_true", help='submit job on hpc4')
|
|
324
|
+
dating_parser.add_argument('-hpc4_wt', required=False, default='119:59:59', help='walltime, default: 119:59:59')
|
|
325
|
+
dating_parser.add_argument('-hpc4_a', required=False, default='marmolecol', help='hpc4 account, select from marmolecol and spongeholobiont, default: marmolecol')
|
|
326
|
+
dating_parser.add_argument('-hpc4_q', required=False, default='amd', help='hpc4 queue, select from amd, intel, gpu-a30, gpu-l20 and gpu-rtx5880, default: amd')
|
|
327
|
+
dating_parser.add_argument('-hpc4_conda', required=False, default='mybase2', help='conda environment, default: mybase2')
|
|
328
|
+
dating_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
|
|
324
329
|
args = vars(parser.parse_args())
|
|
325
330
|
dating.dating(args)
|
|
326
331
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: treesak
|
|
3
|
-
Version: 1.54.
|
|
3
|
+
Version: 1.54.4
|
|
4
4
|
Summary: BioSAK
|
|
5
5
|
Home-page: https://github.com/songweizhi/TreeSAK
|
|
6
6
|
Author: Weizhi Song
|
|
@@ -24,4 +24,4 @@ Requires-Dist: kaleido
|
|
|
24
24
|
Requires-Dist: PyPDF3
|
|
25
25
|
Requires-Dist: dendropy
|
|
26
26
|
|
|
27
|
-
TreeSAK v1.54.
|
|
27
|
+
TreeSAK v1.54.4
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|