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

Rename _feature_0 to _whole_cell and _feature_1 to _nuclear #786

Merged
merged 24 commits into from
Nov 11, 2022

Conversation

alex-l-kong
Copy link
Contributor

What is the purpose of this PR?

Closes #745. The current suffixes for the segmented images are unclear, they need to be renamed.

How did you implement your changes

See title.

@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@alex-l-kong alex-l-kong marked this pull request as draft October 21, 2022 20:41
@alex-l-kong alex-l-kong self-assigned this Oct 21, 2022
@alex-l-kong alex-l-kong marked this pull request as ready for review November 10, 2022 21:38
Copy link
Member

@ngreenwald ngreenwald left a comment

Choose a reason for hiding this comment

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

Changing the example dataset should have automatically uncovered any remaining references in notebooks 1-4, right?. Will you check the spatial notebooks to see if any of them have remaining references to the old format?

@alex-l-kong
Copy link
Contributor Author

Changing the example dataset should have automatically uncovered any remaining references in notebooks 1-4, right?. Will you check the spatial notebooks to see if any of them have remaining references to the old format?

Yes, and I've verified that all the spatial notebooks are purged of old references.

Copy link
Member

@ngreenwald ngreenwald left a comment

Choose a reason for hiding this comment

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

Looks good

@alex-l-kong
Copy link
Contributor Author

alex-l-kong commented Nov 11, 2022

@ngreenwald can you merge this PR for me? It seems like coveralls is underreporting and blocking me from merging on my end.

@ngreenwald ngreenwald merged commit f25f809 into main Nov 11, 2022
@ngreenwald ngreenwald deleted the feature_0_1 branch November 11, 2022 03:18
srivarra pushed a commit that referenced this pull request Nov 21, 2022
…786)

* Initial commit of replacing _feature_0 with _whole_cell and _feature_1 with _nuclear

* Make sure dataset tests include _whole_cell and _nuclear

* Update distance matrix column to be dist_whole_cell

* Patch up marker quantification loading

* Ensure channels for stitch_images test are being passed in correctly

* Rename segmentation label saving to _whole_cell and _nuclear

* Define both the whole cell and nuclear suffix renaming choices for create_deepcell_output

* Change revision to match current PR on HuggingFace with new suffix names

* Patch up calc_dist_matrix suffix

* PYCODESTYLE in data_utils.py

* Patch up deepcell_utils

* Use new HuggingFace commit hash without hidden old files

* Change legacy example_dataset extensions to _whole_cell.tiff

* Make sure neighborhood mask uses _whole_cell.tiff

* Update comment to _whole_cell.tiff too

* Aesthetics

* Patch _feature_0 to _whole_cell to pass neighborhood mask generation test

* Change suffix in the README

* Refer to main branch for HuggingFace
@srivarra srivarra added the enhancement New feature or request label Jan 10, 2023
ngreenwald pushed a commit that referenced this pull request Jan 20, 2023
* added OME-TIFF support

* requirements update

* requirement went missing?

* Added tmi to requirements

* set pillow requirement

* update numpy

* add xmltodict to docs

* added tmi to docs/conf.py

* added utility notebook

* switched lambda/map for list comprehension

* switched lambda/map for list comprehension in test function

* Rename `_feature_0` to `_whole_cell` and `_feature_1` to `_nuclear` (#786)

* Initial commit of replacing _feature_0 with _whole_cell and _feature_1 with _nuclear

* Make sure dataset tests include _whole_cell and _nuclear

* Update distance matrix column to be dist_whole_cell

* Patch up marker quantification loading

* Ensure channels for stitch_images test are being passed in correctly

* Rename segmentation label saving to _whole_cell and _nuclear

* Define both the whole cell and nuclear suffix renaming choices for create_deepcell_output

* Change revision to match current PR on HuggingFace with new suffix names

* Patch up calc_dist_matrix suffix

* PYCODESTYLE in data_utils.py

* Patch up deepcell_utils

* Use new HuggingFace commit hash without hidden old files

* Change legacy example_dataset extensions to _whole_cell.tiff

* Make sure neighborhood mask uses _whole_cell.tiff

* Update comment to _whole_cell.tiff too

* Aesthetics

* Patch _feature_0 to _whole_cell to pass neighborhood mask generation test

* Change suffix in the README

* Refer to main branch for HuggingFace

* updated ome-tiff notebook

renamed utility notebook

* undid strange merge

* undid strange merge

* added support for OME-TIFFs with images of multiple resolutions

* added support for OME-TIFFs with images of multiple resolutions

* renamed conversion notebook

* removed unused imports

* fixed channel extraction if a channel has no name

* added example ome_tiff to the Example Dataset

* added example dataset blurb

* updated example dataset

* updated ex dataset commit id

* pycodestyle

* dataset updated

* dataset revision set to main

Co-authored-by: alex-l-kong <31424707+alex-l-kong@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Give feature_0 and feature_1 files more informative names
3 participants