fixing merge with skip connections #432
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…-lab/PyChunkedGraph into forrestc-merge-skip-connection-fix
sdorkenw
pushed a commit
that referenced
this pull request
Jan 3, 2023
* feat: add debug functions * fix: refactor and fix incorrect bounding l2 children due to skips, and speedups * code cleanup * decide if unique on number of IDs involved * sort IDs for faster reads * test pyfqmr * fix: log L2 IDs being remeshed * undo meshgen changes, handled in another pr * ingest faster automatic enqueuing (#428) * fix: improved auto queuing * feat: faster tracker worker with preloaded imports * Add public neurons (#426) * adding public info file * adding mesh manifest public neuron * using config for AUTH_TOKEN * adding more endpoints for public neurons * fixing AUTH_TOKEN * adding oldest timestamp * removing node id * removing auth required before/after request * trying to add reset auth * removing unused reset auth * pinning zmesh back * adding compiled req feature * trying to fix tests * compiled new protobuf files * new chunkMapping proto files * modifiying input reqs * removing unused chunkMapping files * improve mesh worker logging * feat: add graph versioning * feat: add debug functions * fix: refactor and fix incorrect bounding l2 children due to skips, and speedups * code cleanup * decide if unique on number of IDs involved * sort IDs for faster reads * test pyfqmr * fix: log L2 IDs being remeshed * undo meshgen changes, handled in another pr * improve mesh worker logging * feat: add graph versioning * ensure correct version in frontend * fix: valid version takes precedence over whitelist * fix: add to cache after checks pass * fix: retain error message * fixing whitelist logging * fixing merge with skip connections (#432) * fixing merge with skip connections * fixing merge with skip connections * fix: mistaken change * remove hardcoded credentials from tests Co-authored-by: Forrest Collman <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I think this solves a bug with doing merges that include skip connections, we don't want to be reassigning parents of lower level ids in the new parents run, so when including those skip connection edges, we need to remap any edges discovered in this way from the lower IDs to their appropriate parent at the current level of the hierarchy.