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

Replacing normalize_sub_probs with a check; fixing consistency problems #77

Merged
merged 5 commits into from
Oct 30, 2024

Conversation

matsen
Copy link
Contributor

@matsen matsen commented Oct 30, 2024

normalize_sub_probs (making a CSP out of something not normalized) hasn't been necessary since we switched to netam SHM models. Here we replace that with a check.

@matsen matsen linked an issue Oct 30, 2024 that may be closed by this pull request
@matsen matsen requested a review from willdumm October 30, 2024 11:32
Copy link
Contributor

@willdumm willdumm left a comment

Choose a reason for hiding this comment

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

One question above, but looks good!

Copy link
Contributor Author

@matsen matsen left a comment

Choose a reason for hiding this comment

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

Whelp, this ended up being a little strange.

This makes sense:

        for nt_parent, mask, nt_rates, nt_csps, branch_length in zip(
            self.nt_parents,
            self.masks,
            self.nt_ratess,
            self.nt_cspss,
            self._branch_lengths,

OTOH, when we get a batch that also has a batch dimension but we just call it singular. I tried adding plural everywhere but it was just strange. PyTorch magic should make it feel like the batch dimension isn't there. But then why do plural ever?

Conclusion: enough already 🤷

@matsen matsen merged commit 24043f9 into main Oct 30, 2024
1 check passed
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.

More cleanup
2 participants