Feature/recursive members - #2118

Merged
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members
Aug 29, 2024
Merged

Feature/recursive members#2118
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members

Conversation

@TomAugspurger

@TomAugspurgerTomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
Contributor

(This currently depends on #2117. I'll rebase once that's merged to v3)

This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarchy. The default is unchanged (just list immediate children).

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.

Closes#2119

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)

Ensures that nested children are listed properly.
This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarhcy.
This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.
@TomAugspurger

TomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
ContributorAuthor

#2119 has some information on the failed hypothesis test. I think it's real.

Edit: 8bd52d0 hopefully fixes that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm pretty stumped by the failure at https://github.com/zarr-developers/zarr-python/actions/runs/10549846136/job/29225363145?pr=2118#step:6:374

The issue comes from a RuntimeError in numpy when doing something like

np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)

The actual array constructed by hypothesis is a bit different though. It's more like:

In [23]: np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f")[0]
Out[23]: np.complex128(nanj)

The dtype and repr appear to be the same, but apparently they're different internally. Not sure how yet.

Finally, something in the test runner appears to elevate the RuntimeWarning to an error:

# inside the test runarray([False])
(Pdb) np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)
array([False])
(Pdb) np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f") ==np.complex128(0)
***RuntimeWarning: invalidvalueencounteredinequal

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm partly giving up on that second hypothesis failure. It's possible that there's still a bug in Buffer.all_equal at

defall_equal(self, other: Any) ->bool:
returnbool((self._data==other).all())
not handling NaN like other values. But for this PR, we're able to work around it by filtering out that RuntimeWarning.

This should be ready for review now.

@jhammanjhamman mentioned this pull request Aug 26, 2024
6 tasks

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

Agreed that this is useful enough to justify this change.

# See https://github.com/zarr-developers/zarr-python/pull/2118#issuecomment-2310280899
# Uncomment the next line to reproduce the original failure.
# @reproduce_failure('6.111.2', b'AXicY2FgZGRAB/8/eLmF7qr/C5EDADZUBRM=')
@pytest.mark.filterwarnings("ignore::RuntimeWarning")

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@dcherian - would you mind looking into this?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

It's a minefield 😬 The deepest I got was hypothesis.extra.numpy:ArrayStrategy.set_element. Something about the sequence of operations and the data passed into the ndarray made it "weird", such that array == np.complex128(0.0) raised an InvalidComparision warning. I'm not sure how to interpret the bytes at #2118 (comment).

@jhamman
jhamman requested a review from d-v-bAugust 26, 2024 20:22
@d-v-b

Copy link
Copy Markdown
Contributor

this looks good to me! my one question is whether there would be any utility in using an integer to limit the recursion depth to a desired number of hierarchy levels, while preserving the option to traverse the entire group. e.g., the value of 1 would denote gathering immediate sub-arrays and sub-groups, 2 would recurse once, and -1 would gather the whole hierarchy. I did this over in pydantic-zarr and it has worked well so far. Without this functionality, we are basically forcing users with very deep zarr hierarchies to choose between expensive IO (recursive=True) and writing their own semi-recursive implementations (manually calling members N times).

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I was wondering about a limit-style argument too. I'll go ahead and implement that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I opted to implement this as a max_depth: int | None keyword, which replaces recursive=True. By setting max_depth=-1 or max_depth=None you get the same behavior as recursive=True. A positive integer considers just that depth. The default of max_depth=0 is the same as the existing behavior on main of just considering immediate children.

@d-v-b

Copy link
Copy Markdown
Contributor

thanks @TomAugspurger! what's the reasoning for specifying the same behavior with two distinct values -- max_depth=-1 and max_depth=None? Personally I would be fine with XOR on these options, and it would make things marginally simpler. But maybe there's an advantage to your current approach that I'm not considering.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Purely for user convenience. Neither max_depth=-1 nor max_depth=None sounded obviously more natural to express "no depth".

If I had to choose, I'd say max_depth=None. Do you have a preference?

@d-v-b

Copy link
Copy Markdown
Contributor

If I had to choose, I'd say max_depth=None. Do you have a preference?

I like this too!

@d-v-bd-v-b left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this looks good, pre-commit is red but I don't think that failure is related to content in the PR. If you're all done here @TomAugspurger then I am happy to merge

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Yeah, this should be all set.

The pre-commit errors are at #2131, I think from a new version of NumPy. I'll look into them today.

@d-v-b
d-v-b merged commit 0095ee6 into zarr-developers:v3Aug 29, 2024
@TomAugspurger
TomAugspurger deleted the feature/recursive-members branch August 29, 2024 15:05
Sign up for freeto 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.

Flaky test / buggy handling of large datetimes

3 participants

@TomAugspurger@d-v-b@jhamman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Feature/recursive members - #2118

Merged
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members
Aug 29, 2024
Merged

Feature/recursive members#2118
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members

Conversation

@TomAugspurger

@TomAugspurgerTomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
Contributor

(This currently depends on #2117. I'll rebase once that's merged to v3)

This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarchy. The default is unchanged (just list immediate children).

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.

Closes#2119

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)

Ensures that nested children are listed properly.
This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarhcy.
This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.
@TomAugspurger

TomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
ContributorAuthor

#2119 has some information on the failed hypothesis test. I think it's real.

Edit: 8bd52d0 hopefully fixes that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm pretty stumped by the failure at https://github.com/zarr-developers/zarr-python/actions/runs/10549846136/job/29225363145?pr=2118#step:6:374

The issue comes from a RuntimeError in numpy when doing something like

np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)

The actual array constructed by hypothesis is a bit different though. It's more like:

In [23]: np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f")[0]
Out[23]: np.complex128(nanj)

The dtype and repr appear to be the same, but apparently they're different internally. Not sure how yet.

Finally, something in the test runner appears to elevate the RuntimeWarning to an error:

# inside the test runarray([False])
(Pdb) np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)
array([False])
(Pdb) np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f") ==np.complex128(0)
***RuntimeWarning: invalidvalueencounteredinequal

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm partly giving up on that second hypothesis failure. It's possible that there's still a bug in Buffer.all_equal at

defall_equal(self, other: Any) ->bool:
returnbool((self._data==other).all())
not handling NaN like other values. But for this PR, we're able to work around it by filtering out that RuntimeWarning.

This should be ready for review now.

@jhammanjhamman mentioned this pull request Aug 26, 2024
6 tasks

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

Agreed that this is useful enough to justify this change.

# See https://github.com/zarr-developers/zarr-python/pull/2118#issuecomment-2310280899
# Uncomment the next line to reproduce the original failure.
# @reproduce_failure('6.111.2', b'AXicY2FgZGRAB/8/eLmF7qr/C5EDADZUBRM=')
@pytest.mark.filterwarnings("ignore::RuntimeWarning")

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@dcherian - would you mind looking into this?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

It's a minefield 😬 The deepest I got was hypothesis.extra.numpy:ArrayStrategy.set_element. Something about the sequence of operations and the data passed into the ndarray made it "weird", such that array == np.complex128(0.0) raised an InvalidComparision warning. I'm not sure how to interpret the bytes at #2118 (comment).

@jhamman
jhamman requested a review from d-v-bAugust 26, 2024 20:22
@d-v-b

Copy link
Copy Markdown
Contributor

this looks good to me! my one question is whether there would be any utility in using an integer to limit the recursion depth to a desired number of hierarchy levels, while preserving the option to traverse the entire group. e.g., the value of 1 would denote gathering immediate sub-arrays and sub-groups, 2 would recurse once, and -1 would gather the whole hierarchy. I did this over in pydantic-zarr and it has worked well so far. Without this functionality, we are basically forcing users with very deep zarr hierarchies to choose between expensive IO (recursive=True) and writing their own semi-recursive implementations (manually calling members N times).

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I was wondering about a limit-style argument too. I'll go ahead and implement that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I opted to implement this as a max_depth: int | None keyword, which replaces recursive=True. By setting max_depth=-1 or max_depth=None you get the same behavior as recursive=True. A positive integer considers just that depth. The default of max_depth=0 is the same as the existing behavior on main of just considering immediate children.

@d-v-b

Copy link
Copy Markdown
Contributor

thanks @TomAugspurger! what's the reasoning for specifying the same behavior with two distinct values -- max_depth=-1 and max_depth=None? Personally I would be fine with XOR on these options, and it would make things marginally simpler. But maybe there's an advantage to your current approach that I'm not considering.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Purely for user convenience. Neither max_depth=-1 nor max_depth=None sounded obviously more natural to express "no depth".

If I had to choose, I'd say max_depth=None. Do you have a preference?

@d-v-b

Copy link
Copy Markdown
Contributor

If I had to choose, I'd say max_depth=None. Do you have a preference?

I like this too!

@d-v-bd-v-b left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this looks good, pre-commit is red but I don't think that failure is related to content in the PR. If you're all done here @TomAugspurger then I am happy to merge

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Yeah, this should be all set.

The pre-commit errors are at #2131, I think from a new version of NumPy. I'll look into them today.

@d-v-b
d-v-b merged commit 0095ee6 into zarr-developers:v3Aug 29, 2024
@TomAugspurger
TomAugspurger deleted the feature/recursive-members branch August 29, 2024 15:05
Sign up for freeto 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.

Flaky test / buggy handling of large datetimes

3 participants

@TomAugspurger@d-v-b@jhamman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Feature/recursive members - #2118

Merged
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members
Aug 29, 2024
Merged

Feature/recursive members#2118
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members

Conversation

@TomAugspurger

@TomAugspurgerTomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
Contributor

(This currently depends on #2117. I'll rebase once that's merged to v3)

This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarchy. The default is unchanged (just list immediate children).

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.

Closes#2119

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)

Ensures that nested children are listed properly.
This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarhcy.
This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.
@TomAugspurger

TomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
ContributorAuthor

#2119 has some information on the failed hypothesis test. I think it's real.

Edit: 8bd52d0 hopefully fixes that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm pretty stumped by the failure at https://github.com/zarr-developers/zarr-python/actions/runs/10549846136/job/29225363145?pr=2118#step:6:374

The issue comes from a RuntimeError in numpy when doing something like

np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)

The actual array constructed by hypothesis is a bit different though. It's more like:

In [23]: np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f")[0]
Out[23]: np.complex128(nanj)

The dtype and repr appear to be the same, but apparently they're different internally. Not sure how yet.

Finally, something in the test runner appears to elevate the RuntimeWarning to an error:

# inside the test runarray([False])
(Pdb) np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)
array([False])
(Pdb) np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f") ==np.complex128(0)
***RuntimeWarning: invalidvalueencounteredinequal

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm partly giving up on that second hypothesis failure. It's possible that there's still a bug in Buffer.all_equal at

defall_equal(self, other: Any) ->bool:
returnbool((self._data==other).all())
not handling NaN like other values. But for this PR, we're able to work around it by filtering out that RuntimeWarning.

This should be ready for review now.

@jhammanjhamman mentioned this pull request Aug 26, 2024
6 tasks

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

Agreed that this is useful enough to justify this change.

# See https://github.com/zarr-developers/zarr-python/pull/2118#issuecomment-2310280899
# Uncomment the next line to reproduce the original failure.
# @reproduce_failure('6.111.2', b'AXicY2FgZGRAB/8/eLmF7qr/C5EDADZUBRM=')
@pytest.mark.filterwarnings("ignore::RuntimeWarning")

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@dcherian - would you mind looking into this?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

It's a minefield 😬 The deepest I got was hypothesis.extra.numpy:ArrayStrategy.set_element. Something about the sequence of operations and the data passed into the ndarray made it "weird", such that array == np.complex128(0.0) raised an InvalidComparision warning. I'm not sure how to interpret the bytes at #2118 (comment).

@jhamman
jhamman requested a review from d-v-bAugust 26, 2024 20:22
@d-v-b

Copy link
Copy Markdown
Contributor

this looks good to me! my one question is whether there would be any utility in using an integer to limit the recursion depth to a desired number of hierarchy levels, while preserving the option to traverse the entire group. e.g., the value of 1 would denote gathering immediate sub-arrays and sub-groups, 2 would recurse once, and -1 would gather the whole hierarchy. I did this over in pydantic-zarr and it has worked well so far. Without this functionality, we are basically forcing users with very deep zarr hierarchies to choose between expensive IO (recursive=True) and writing their own semi-recursive implementations (manually calling members N times).

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I was wondering about a limit-style argument too. I'll go ahead and implement that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I opted to implement this as a max_depth: int | None keyword, which replaces recursive=True. By setting max_depth=-1 or max_depth=None you get the same behavior as recursive=True. A positive integer considers just that depth. The default of max_depth=0 is the same as the existing behavior on main of just considering immediate children.

@d-v-b

Copy link
Copy Markdown
Contributor

thanks @TomAugspurger! what's the reasoning for specifying the same behavior with two distinct values -- max_depth=-1 and max_depth=None? Personally I would be fine with XOR on these options, and it would make things marginally simpler. But maybe there's an advantage to your current approach that I'm not considering.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Purely for user convenience. Neither max_depth=-1 nor max_depth=None sounded obviously more natural to express "no depth".

If I had to choose, I'd say max_depth=None. Do you have a preference?

@d-v-b

Copy link
Copy Markdown
Contributor

If I had to choose, I'd say max_depth=None. Do you have a preference?

I like this too!

@d-v-bd-v-b left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this looks good, pre-commit is red but I don't think that failure is related to content in the PR. If you're all done here @TomAugspurger then I am happy to merge

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Yeah, this should be all set.

The pre-commit errors are at #2131, I think from a new version of NumPy. I'll look into them today.

@d-v-b
d-v-b merged commit 0095ee6 into zarr-developers:v3Aug 29, 2024
@TomAugspurger
TomAugspurger deleted the feature/recursive-members branch August 29, 2024 15:05
Sign up for freeto 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.

Flaky test / buggy handling of large datetimes

3 participants

@TomAugspurger@d-v-b@jhamman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Feature/recursive members - #2118

Merged
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members
Aug 29, 2024
Merged

Feature/recursive members#2118
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members

Conversation

@TomAugspurger

@TomAugspurgerTomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
Contributor

(This currently depends on #2117. I'll rebase once that's merged to v3)

This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarchy. The default is unchanged (just list immediate children).

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.

Closes#2119

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)

Ensures that nested children are listed properly.
This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarhcy.
This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.
@TomAugspurger

TomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
ContributorAuthor

#2119 has some information on the failed hypothesis test. I think it's real.

Edit: 8bd52d0 hopefully fixes that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm pretty stumped by the failure at https://github.com/zarr-developers/zarr-python/actions/runs/10549846136/job/29225363145?pr=2118#step:6:374

The issue comes from a RuntimeError in numpy when doing something like

np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)

The actual array constructed by hypothesis is a bit different though. It's more like:

In [23]: np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f")[0]
Out[23]: np.complex128(nanj)

The dtype and repr appear to be the same, but apparently they're different internally. Not sure how yet.

Finally, something in the test runner appears to elevate the RuntimeWarning to an error:

# inside the test runarray([False])
(Pdb) np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)
array([False])
(Pdb) np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f") ==np.complex128(0)
***RuntimeWarning: invalidvalueencounteredinequal

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm partly giving up on that second hypothesis failure. It's possible that there's still a bug in Buffer.all_equal at

defall_equal(self, other: Any) ->bool:
returnbool((self._data==other).all())
not handling NaN like other values. But for this PR, we're able to work around it by filtering out that RuntimeWarning.

This should be ready for review now.

@jhammanjhamman mentioned this pull request Aug 26, 2024
6 tasks

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

Agreed that this is useful enough to justify this change.

# See https://github.com/zarr-developers/zarr-python/pull/2118#issuecomment-2310280899
# Uncomment the next line to reproduce the original failure.
# @reproduce_failure('6.111.2', b'AXicY2FgZGRAB/8/eLmF7qr/C5EDADZUBRM=')
@pytest.mark.filterwarnings("ignore::RuntimeWarning")

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@dcherian - would you mind looking into this?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

It's a minefield 😬 The deepest I got was hypothesis.extra.numpy:ArrayStrategy.set_element. Something about the sequence of operations and the data passed into the ndarray made it "weird", such that array == np.complex128(0.0) raised an InvalidComparision warning. I'm not sure how to interpret the bytes at #2118 (comment).

@jhamman
jhamman requested a review from d-v-bAugust 26, 2024 20:22
@d-v-b

Copy link
Copy Markdown
Contributor

this looks good to me! my one question is whether there would be any utility in using an integer to limit the recursion depth to a desired number of hierarchy levels, while preserving the option to traverse the entire group. e.g., the value of 1 would denote gathering immediate sub-arrays and sub-groups, 2 would recurse once, and -1 would gather the whole hierarchy. I did this over in pydantic-zarr and it has worked well so far. Without this functionality, we are basically forcing users with very deep zarr hierarchies to choose between expensive IO (recursive=True) and writing their own semi-recursive implementations (manually calling members N times).

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I was wondering about a limit-style argument too. I'll go ahead and implement that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I opted to implement this as a max_depth: int | None keyword, which replaces recursive=True. By setting max_depth=-1 or max_depth=None you get the same behavior as recursive=True. A positive integer considers just that depth. The default of max_depth=0 is the same as the existing behavior on main of just considering immediate children.

@d-v-b

Copy link
Copy Markdown
Contributor

thanks @TomAugspurger! what's the reasoning for specifying the same behavior with two distinct values -- max_depth=-1 and max_depth=None? Personally I would be fine with XOR on these options, and it would make things marginally simpler. But maybe there's an advantage to your current approach that I'm not considering.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Purely for user convenience. Neither max_depth=-1 nor max_depth=None sounded obviously more natural to express "no depth".

If I had to choose, I'd say max_depth=None. Do you have a preference?

@d-v-b

Copy link
Copy Markdown
Contributor

If I had to choose, I'd say max_depth=None. Do you have a preference?

I like this too!

@d-v-bd-v-b left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this looks good, pre-commit is red but I don't think that failure is related to content in the PR. If you're all done here @TomAugspurger then I am happy to merge

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Yeah, this should be all set.

The pre-commit errors are at #2131, I think from a new version of NumPy. I'll look into them today.

@d-v-b
d-v-b merged commit 0095ee6 into zarr-developers:v3Aug 29, 2024
@TomAugspurger
TomAugspurger deleted the feature/recursive-members branch August 29, 2024 15:05
Sign up for freeto 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.

Flaky test / buggy handling of large datetimes

3 participants

@TomAugspurger@d-v-b@jhamman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Feature/recursive members - #2118

Merged
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members
Aug 29, 2024
Merged

Feature/recursive members#2118
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members

Conversation

@TomAugspurger

@TomAugspurgerTomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
Contributor

(This currently depends on #2117. I'll rebase once that's merged to v3)

This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarchy. The default is unchanged (just list immediate children).

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.

Closes#2119

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)

Ensures that nested children are listed properly.
This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarhcy.
This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.
@TomAugspurger

TomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
ContributorAuthor

#2119 has some information on the failed hypothesis test. I think it's real.

Edit: 8bd52d0 hopefully fixes that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm pretty stumped by the failure at https://github.com/zarr-developers/zarr-python/actions/runs/10549846136/job/29225363145?pr=2118#step:6:374

The issue comes from a RuntimeError in numpy when doing something like

np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)

The actual array constructed by hypothesis is a bit different though. It's more like:

In [23]: np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f")[0]
Out[23]: np.complex128(nanj)

The dtype and repr appear to be the same, but apparently they're different internally. Not sure how yet.

Finally, something in the test runner appears to elevate the RuntimeWarning to an error:

# inside the test runarray([False])
(Pdb) np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)
array([False])
(Pdb) np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f") ==np.complex128(0)
***RuntimeWarning: invalidvalueencounteredinequal

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm partly giving up on that second hypothesis failure. It's possible that there's still a bug in Buffer.all_equal at

defall_equal(self, other: Any) ->bool:
returnbool((self._data==other).all())
not handling NaN like other values. But for this PR, we're able to work around it by filtering out that RuntimeWarning.

This should be ready for review now.

@jhammanjhamman mentioned this pull request Aug 26, 2024
6 tasks

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

Agreed that this is useful enough to justify this change.

# See https://github.com/zarr-developers/zarr-python/pull/2118#issuecomment-2310280899
# Uncomment the next line to reproduce the original failure.
# @reproduce_failure('6.111.2', b'AXicY2FgZGRAB/8/eLmF7qr/C5EDADZUBRM=')
@pytest.mark.filterwarnings("ignore::RuntimeWarning")

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@dcherian - would you mind looking into this?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

It's a minefield 😬 The deepest I got was hypothesis.extra.numpy:ArrayStrategy.set_element. Something about the sequence of operations and the data passed into the ndarray made it "weird", such that array == np.complex128(0.0) raised an InvalidComparision warning. I'm not sure how to interpret the bytes at #2118 (comment).

@jhamman
jhamman requested a review from d-v-bAugust 26, 2024 20:22
@d-v-b

Copy link
Copy Markdown
Contributor

this looks good to me! my one question is whether there would be any utility in using an integer to limit the recursion depth to a desired number of hierarchy levels, while preserving the option to traverse the entire group. e.g., the value of 1 would denote gathering immediate sub-arrays and sub-groups, 2 would recurse once, and -1 would gather the whole hierarchy. I did this over in pydantic-zarr and it has worked well so far. Without this functionality, we are basically forcing users with very deep zarr hierarchies to choose between expensive IO (recursive=True) and writing their own semi-recursive implementations (manually calling members N times).

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I was wondering about a limit-style argument too. I'll go ahead and implement that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I opted to implement this as a max_depth: int | None keyword, which replaces recursive=True. By setting max_depth=-1 or max_depth=None you get the same behavior as recursive=True. A positive integer considers just that depth. The default of max_depth=0 is the same as the existing behavior on main of just considering immediate children.

@d-v-b

Copy link
Copy Markdown
Contributor

thanks @TomAugspurger! what's the reasoning for specifying the same behavior with two distinct values -- max_depth=-1 and max_depth=None? Personally I would be fine with XOR on these options, and it would make things marginally simpler. But maybe there's an advantage to your current approach that I'm not considering.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Purely for user convenience. Neither max_depth=-1 nor max_depth=None sounded obviously more natural to express "no depth".

If I had to choose, I'd say max_depth=None. Do you have a preference?

@d-v-b

Copy link
Copy Markdown
Contributor

If I had to choose, I'd say max_depth=None. Do you have a preference?

I like this too!

@d-v-bd-v-b left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this looks good, pre-commit is red but I don't think that failure is related to content in the PR. If you're all done here @TomAugspurger then I am happy to merge

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Yeah, this should be all set.

The pre-commit errors are at #2131, I think from a new version of NumPy. I'll look into them today.

@d-v-b
d-v-b merged commit 0095ee6 into zarr-developers:v3Aug 29, 2024
@TomAugspurger
TomAugspurger deleted the feature/recursive-members branch August 29, 2024 15:05
Sign up for freeto 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.

Flaky test / buggy handling of large datetimes

3 participants

@TomAugspurger@d-v-b@jhamman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Feature/recursive members - #2118

Merged
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members
Aug 29, 2024
Merged

Feature/recursive members#2118
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members

Conversation

@TomAugspurger

@TomAugspurgerTomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
Contributor

(This currently depends on #2117. I'll rebase once that's merged to v3)

This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarchy. The default is unchanged (just list immediate children).

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.

Closes#2119

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)

Ensures that nested children are listed properly.
This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarhcy.
This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.
@TomAugspurger

TomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
ContributorAuthor

#2119 has some information on the failed hypothesis test. I think it's real.

Edit: 8bd52d0 hopefully fixes that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm pretty stumped by the failure at https://github.com/zarr-developers/zarr-python/actions/runs/10549846136/job/29225363145?pr=2118#step:6:374

The issue comes from a RuntimeError in numpy when doing something like

np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)

The actual array constructed by hypothesis is a bit different though. It's more like:

In [23]: np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f")[0]
Out[23]: np.complex128(nanj)

The dtype and repr appear to be the same, but apparently they're different internally. Not sure how yet.

Finally, something in the test runner appears to elevate the RuntimeWarning to an error:

# inside the test runarray([False])
(Pdb) np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)
array([False])
(Pdb) np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f") ==np.complex128(0)
***RuntimeWarning: invalidvalueencounteredinequal

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm partly giving up on that second hypothesis failure. It's possible that there's still a bug in Buffer.all_equal at

defall_equal(self, other: Any) ->bool:
returnbool((self._data==other).all())
not handling NaN like other values. But for this PR, we're able to work around it by filtering out that RuntimeWarning.

This should be ready for review now.

@jhammanjhamman mentioned this pull request Aug 26, 2024
6 tasks

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

Agreed that this is useful enough to justify this change.

# See https://github.com/zarr-developers/zarr-python/pull/2118#issuecomment-2310280899
# Uncomment the next line to reproduce the original failure.
# @reproduce_failure('6.111.2', b'AXicY2FgZGRAB/8/eLmF7qr/C5EDADZUBRM=')
@pytest.mark.filterwarnings("ignore::RuntimeWarning")

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@dcherian - would you mind looking into this?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

It's a minefield 😬 The deepest I got was hypothesis.extra.numpy:ArrayStrategy.set_element. Something about the sequence of operations and the data passed into the ndarray made it "weird", such that array == np.complex128(0.0) raised an InvalidComparision warning. I'm not sure how to interpret the bytes at #2118 (comment).

@jhamman
jhamman requested a review from d-v-bAugust 26, 2024 20:22
@d-v-b

Copy link
Copy Markdown
Contributor

this looks good to me! my one question is whether there would be any utility in using an integer to limit the recursion depth to a desired number of hierarchy levels, while preserving the option to traverse the entire group. e.g., the value of 1 would denote gathering immediate sub-arrays and sub-groups, 2 would recurse once, and -1 would gather the whole hierarchy. I did this over in pydantic-zarr and it has worked well so far. Without this functionality, we are basically forcing users with very deep zarr hierarchies to choose between expensive IO (recursive=True) and writing their own semi-recursive implementations (manually calling members N times).

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I was wondering about a limit-style argument too. I'll go ahead and implement that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I opted to implement this as a max_depth: int | None keyword, which replaces recursive=True. By setting max_depth=-1 or max_depth=None you get the same behavior as recursive=True. A positive integer considers just that depth. The default of max_depth=0 is the same as the existing behavior on main of just considering immediate children.

@d-v-b

Copy link
Copy Markdown
Contributor

thanks @TomAugspurger! what's the reasoning for specifying the same behavior with two distinct values -- max_depth=-1 and max_depth=None? Personally I would be fine with XOR on these options, and it would make things marginally simpler. But maybe there's an advantage to your current approach that I'm not considering.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Purely for user convenience. Neither max_depth=-1 nor max_depth=None sounded obviously more natural to express "no depth".

If I had to choose, I'd say max_depth=None. Do you have a preference?

@d-v-b

Copy link
Copy Markdown
Contributor

If I had to choose, I'd say max_depth=None. Do you have a preference?

I like this too!

@d-v-bd-v-b left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this looks good, pre-commit is red but I don't think that failure is related to content in the PR. If you're all done here @TomAugspurger then I am happy to merge

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Yeah, this should be all set.

The pre-commit errors are at #2131, I think from a new version of NumPy. I'll look into them today.

@d-v-b
d-v-b merged commit 0095ee6 into zarr-developers:v3Aug 29, 2024
@TomAugspurger
TomAugspurger deleted the feature/recursive-members branch August 29, 2024 15:05
Sign up for freeto 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.

Flaky test / buggy handling of large datetimes

3 participants

@TomAugspurger@d-v-b@jhamman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Feature/recursive members - #2118

Merged
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members
Aug 29, 2024
Merged

Feature/recursive members#2118
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members

Conversation

@TomAugspurger

@TomAugspurgerTomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
Contributor

(This currently depends on #2117. I'll rebase once that's merged to v3)

This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarchy. The default is unchanged (just list immediate children).

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.

Closes#2119

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)

Ensures that nested children are listed properly.
This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarhcy.
This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.
@TomAugspurger

TomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
ContributorAuthor

#2119 has some information on the failed hypothesis test. I think it's real.

Edit: 8bd52d0 hopefully fixes that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm pretty stumped by the failure at https://github.com/zarr-developers/zarr-python/actions/runs/10549846136/job/29225363145?pr=2118#step:6:374

The issue comes from a RuntimeError in numpy when doing something like

np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)

The actual array constructed by hypothesis is a bit different though. It's more like:

In [23]: np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f")[0]
Out[23]: np.complex128(nanj)

The dtype and repr appear to be the same, but apparently they're different internally. Not sure how yet.

Finally, something in the test runner appears to elevate the RuntimeWarning to an error:

# inside the test runarray([False])
(Pdb) np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)
array([False])
(Pdb) np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f") ==np.complex128(0)
***RuntimeWarning: invalidvalueencounteredinequal

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm partly giving up on that second hypothesis failure. It's possible that there's still a bug in Buffer.all_equal at

defall_equal(self, other: Any) ->bool:
returnbool((self._data==other).all())
not handling NaN like other values. But for this PR, we're able to work around it by filtering out that RuntimeWarning.

This should be ready for review now.

@jhammanjhamman mentioned this pull request Aug 26, 2024
6 tasks

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

Agreed that this is useful enough to justify this change.

# See https://github.com/zarr-developers/zarr-python/pull/2118#issuecomment-2310280899
# Uncomment the next line to reproduce the original failure.
# @reproduce_failure('6.111.2', b'AXicY2FgZGRAB/8/eLmF7qr/C5EDADZUBRM=')
@pytest.mark.filterwarnings("ignore::RuntimeWarning")

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@dcherian - would you mind looking into this?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

It's a minefield 😬 The deepest I got was hypothesis.extra.numpy:ArrayStrategy.set_element. Something about the sequence of operations and the data passed into the ndarray made it "weird", such that array == np.complex128(0.0) raised an InvalidComparision warning. I'm not sure how to interpret the bytes at #2118 (comment).

@jhamman
jhamman requested a review from d-v-bAugust 26, 2024 20:22
@d-v-b

Copy link
Copy Markdown
Contributor

this looks good to me! my one question is whether there would be any utility in using an integer to limit the recursion depth to a desired number of hierarchy levels, while preserving the option to traverse the entire group. e.g., the value of 1 would denote gathering immediate sub-arrays and sub-groups, 2 would recurse once, and -1 would gather the whole hierarchy. I did this over in pydantic-zarr and it has worked well so far. Without this functionality, we are basically forcing users with very deep zarr hierarchies to choose between expensive IO (recursive=True) and writing their own semi-recursive implementations (manually calling members N times).

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I was wondering about a limit-style argument too. I'll go ahead and implement that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I opted to implement this as a max_depth: int | None keyword, which replaces recursive=True. By setting max_depth=-1 or max_depth=None you get the same behavior as recursive=True. A positive integer considers just that depth. The default of max_depth=0 is the same as the existing behavior on main of just considering immediate children.

@d-v-b

Copy link
Copy Markdown
Contributor

thanks @TomAugspurger! what's the reasoning for specifying the same behavior with two distinct values -- max_depth=-1 and max_depth=None? Personally I would be fine with XOR on these options, and it would make things marginally simpler. But maybe there's an advantage to your current approach that I'm not considering.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Purely for user convenience. Neither max_depth=-1 nor max_depth=None sounded obviously more natural to express "no depth".

If I had to choose, I'd say max_depth=None. Do you have a preference?

@d-v-b

Copy link
Copy Markdown
Contributor

If I had to choose, I'd say max_depth=None. Do you have a preference?

I like this too!

@d-v-bd-v-b left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this looks good, pre-commit is red but I don't think that failure is related to content in the PR. If you're all done here @TomAugspurger then I am happy to merge

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Yeah, this should be all set.

The pre-commit errors are at #2131, I think from a new version of NumPy. I'll look into them today.

@d-v-b
d-v-b merged commit 0095ee6 into zarr-developers:v3Aug 29, 2024
@TomAugspurger
TomAugspurger deleted the feature/recursive-members branch August 29, 2024 15:05
Sign up for freeto 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.

Flaky test / buggy handling of large datetimes

3 participants

@TomAugspurger@d-v-b@jhamman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Feature/recursive members - #2118

Merged
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members
Aug 29, 2024
Merged

Feature/recursive members#2118
d-v-b merged 11 commits into
zarr-developers:v3from
TomAugspurger:feature/recursive-members

Conversation

@TomAugspurger

@TomAugspurgerTomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
Contributor

(This currently depends on #2117. I'll rebase once that's merged to v3)

This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarchy. The default is unchanged (just list immediate children).

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.

Closes#2119

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)

Ensures that nested children are listed properly.
This PR adds a recursive=True flag to Group.members, for recursively
listing the members of some hierarhcy.
This is useful for Consolidated Metadata, which needs to recursively
inspect children. IMO, it's useful (and simple) enough to include
in the public API.
@TomAugspurger

TomAugspurger commented Aug 25, 2024

Copy link
Copy Markdown
ContributorAuthor

#2119 has some information on the failed hypothesis test. I think it's real.

Edit: 8bd52d0 hopefully fixes that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm pretty stumped by the failure at https://github.com/zarr-developers/zarr-python/actions/runs/10549846136/job/29225363145?pr=2118#step:6:374

The issue comes from a RuntimeError in numpy when doing something like

np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)

The actual array constructed by hypothesis is a bit different though. It's more like:

In [23]: np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f")[0]
Out[23]: np.complex128(nanj)

The dtype and repr appear to be the same, but apparently they're different internally. Not sure how yet.

Finally, something in the test runner appears to elevate the RuntimeWarning to an error:

# inside the test runarray([False])
(Pdb) np.array([np.complex128(0.0, np.nan)]) ==np.complex128(0)
array([False])
(Pdb) np.ndarray((1,), np.dtype("complex128"), b"\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x7f\xbaUFJ\xf0\x7f") ==np.complex128(0)
***RuntimeWarning: invalidvalueencounteredinequal

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I'm partly giving up on that second hypothesis failure. It's possible that there's still a bug in Buffer.all_equal at

defall_equal(self, other: Any) ->bool:
returnbool((self._data==other).all())
not handling NaN like other values. But for this PR, we're able to work around it by filtering out that RuntimeWarning.

This should be ready for review now.

@jhammanjhamman mentioned this pull request Aug 26, 2024
6 tasks

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This includes a breaking change to Group.members and Group.nmembers. Previously, these were properties, while AsyncGroup.members / nmembers were functions. I've changed the sync versions to align with the async versions (which is needed to support this keyword).

Agreed that this is useful enough to justify this change.

# See https://github.com/zarr-developers/zarr-python/pull/2118#issuecomment-2310280899
# Uncomment the next line to reproduce the original failure.
# @reproduce_failure('6.111.2', b'AXicY2FgZGRAB/8/eLmF7qr/C5EDADZUBRM=')
@pytest.mark.filterwarnings("ignore::RuntimeWarning")

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@dcherian - would you mind looking into this?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

It's a minefield 😬 The deepest I got was hypothesis.extra.numpy:ArrayStrategy.set_element. Something about the sequence of operations and the data passed into the ndarray made it "weird", such that array == np.complex128(0.0) raised an InvalidComparision warning. I'm not sure how to interpret the bytes at #2118 (comment).

@jhamman
jhamman requested a review from d-v-bAugust 26, 2024 20:22
@d-v-b

Copy link
Copy Markdown
Contributor

this looks good to me! my one question is whether there would be any utility in using an integer to limit the recursion depth to a desired number of hierarchy levels, while preserving the option to traverse the entire group. e.g., the value of 1 would denote gathering immediate sub-arrays and sub-groups, 2 would recurse once, and -1 would gather the whole hierarchy. I did this over in pydantic-zarr and it has worked well so far. Without this functionality, we are basically forcing users with very deep zarr hierarchies to choose between expensive IO (recursive=True) and writing their own semi-recursive implementations (manually calling members N times).

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I was wondering about a limit-style argument too. I'll go ahead and implement that.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I opted to implement this as a max_depth: int | None keyword, which replaces recursive=True. By setting max_depth=-1 or max_depth=None you get the same behavior as recursive=True. A positive integer considers just that depth. The default of max_depth=0 is the same as the existing behavior on main of just considering immediate children.

@d-v-b

Copy link
Copy Markdown
Contributor

thanks @TomAugspurger! what's the reasoning for specifying the same behavior with two distinct values -- max_depth=-1 and max_depth=None? Personally I would be fine with XOR on these options, and it would make things marginally simpler. But maybe there's an advantage to your current approach that I'm not considering.

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Purely for user convenience. Neither max_depth=-1 nor max_depth=None sounded obviously more natural to express "no depth".

If I had to choose, I'd say max_depth=None. Do you have a preference?

@d-v-b

Copy link
Copy Markdown
Contributor

If I had to choose, I'd say max_depth=None. Do you have a preference?

I like this too!

@d-v-bd-v-b left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this looks good, pre-commit is red but I don't think that failure is related to content in the PR. If you're all done here @TomAugspurger then I am happy to merge

@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

Yeah, this should be all set.

The pre-commit errors are at #2131, I think from a new version of NumPy. I'll look into them today.

@d-v-b
d-v-b merged commit 0095ee6 into zarr-developers:v3Aug 29, 2024
@TomAugspurger
TomAugspurger deleted the feature/recursive-members branch August 29, 2024 15:05
Sign up for freeto 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.

Flaky test / buggy handling of large datetimes

3 participants

@TomAugspurger@d-v-b@jhamman