Skip to content

Commit

Permalink
some last minute lowering of expectations
Browse files Browse the repository at this point in the history
  • Loading branch information
pierrebarbera committed Sep 29, 2017
1 parent 24f7c1b commit 56a24e0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ This tool is still in an active, *beta* phase of development. Suggestions, bug r

- do phylogenetic placement using the **GTR+GAMMA ML model only** (for now)
- take as input **separated reference and query alignment files**, in the **fasta** format (for now)
- handle **DNA** or **Protein** data (enable protein mode with the `--prot` flag)
- handle **DNA** data (protein data coming VERY soon)
- distribute the work to the **cluster**, with the choice of two different modes:
- normal: assumes the input tree and alignment's memory footprint is small enough to fit into the memory of each compute node
- pipeline: for large input trees and alignments: distributes the memory footprint across the compute nodes, at the expense of parallel efficiency (about 20% lower)
- **prepare inputs** for the cluster:
- precompute reference tree and alignment and save it to a *binary file* that allows random access by the different compute nodes
- convert query fasta file into a random access, binary encoded file called a `bfast`-file
- these two precomputations are simple, and reccomended in general! Use them!
- output the placement results in the [jplace format](http://journals.plos.org/plosone/article?id=10.1371/journal.pone.0031009) ready for downstream analysis by frameworks such as [genesis](https://github.com/lczech/genesis)

## Build Instructions
Expand Down Expand Up @@ -147,8 +148,6 @@ Overview of advanced features:
#### Reference Tree Optimization

When supplying the `-O` (or `--opt-ref-tree`) flag to `EPA-ng`, an initial round of model parameter and tree branch length optimization is performed.
The best way to circumvent having to do this, is to supply the model parameters, under which the tree was found, directly.
To this end we support parsing the model file emitted during a successful run of [RAxML-ng]() via the `--model` flag.

#### Configuring the Heuristic Preplacement

Expand Down
6 changes: 2 additions & 4 deletions src/core/place.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,7 @@ void simple_mpi(Tree& reference_tree,
MPI_COMM_RANK(MPI_COMM_WORLD, &local_rank);
MPI_COMM_SIZE(MPI_COMM_WORLD, &num_ranks);


LOG_DBG << "Number of ranks: " << num_ranks;

LOG_INFO << "Number of ranks: " << num_ranks;

std::vector<int> all_ranks(num_ranks);
for (int i = 0; i < num_ranks; ++i) {
Expand All @@ -383,7 +381,7 @@ void simple_mpi(Tree& reference_tree,

// how many should each rank read?
const size_t part_size = ceil(reader.num_sequences() / static_cast<double>(num_ranks));
LOG_DBG << "Number of sequences per rank: " << part_size;
LOG_INFO << "Number of sequences per rank: " << part_size;

// read only the locally relevant part of the queries
// ... by skipping the appropriate amount
Expand Down

0 comments on commit 56a24e0

Please sign in to comment.