Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to MST #148

Merged
merged 338 commits into from
Mar 23, 2021
Merged

Updates to MST #148

merged 338 commits into from
Mar 23, 2021

Conversation

nickjcroucher
Copy link
Collaborator

Minor updates:

  • MST plots now work with lineages
  • --previous-clustering now requires a specific file in both visualise and plot_mst modes
  • test updated accordingly

Not sure about:

  • as sparse_mst.py still requires --distances, do we still require calculation of all-v-all, or are we just using the "metadata" without calculating the values?

@nickjcroucher
Copy link
Collaborator Author

(I don't know why endswith() works, where the regex was failing - could not figure this out).

Copy link
Member

@johnlees johnlees left a comment

Choose a reason for hiding this comment

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

Thanks for these fixes/improvements. A couple of suggestions on the code.

Also:

  • The tests appear to be failing
  • The distances in sparse_mst just load the sample names from the .pkl file and not the dense matrix. But really these should be optional, and only required if the clusters are provided (as it is valid to not colour the nodes by strain). Maybe you could make that change? Or alternatively, can we expect the sample names to be stored as a vertex property?

PopPUNK/sparse_mst.py Show resolved Hide resolved
PopPUNK/visualise.py Show resolved Hide resolved
PopPUNK/sparse_mst.py Outdated Show resolved Hide resolved
@johnlees
Copy link
Member

johnlees commented Feb 9, 2021

Can we also pin the version of graph-tool, had a few reports of that going wrong.
i.e. modify environment.yml to:

graph-tool >=2.35

Copy link
Collaborator Author

@nickjcroucher nickjcroucher left a comment

Choose a reason for hiding this comment

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

I think these are already incorporated, but approving again just in case.

@johnlees johnlees linked an issue Mar 10, 2021 that may be closed by this pull request
Copy link
Member

@johnlees johnlees left a comment

Choose a reason for hiding this comment

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

Can you also add to the environment.yml cugraph and cudf (I think you would also need to add nvidia to the channel list at the top of the file)

PopPUNK/__main__.py Outdated Show resolved Hide resolved
PopPUNK/__main__.py Outdated Show resolved Hide resolved
PopPUNK/network.py Outdated Show resolved Hide resolved
PopPUNK/network.py Outdated Show resolved Hide resolved
PopPUNK/network.py Outdated Show resolved Hide resolved
PopPUNK/refine.py Outdated Show resolved Hide resolved
@nickjcroucher
Copy link
Collaborator Author

Added cugraph and cudf to environment.yml in 3e5160e.

@johnlees johnlees merged commit 16af4dd into master Mar 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GPU accelerated graphs
2 participants