c-blosc upgrade 1.18.1 -> 1.21.0 - #283

Merged
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade
Aug 18, 2021
Merged

c-blosc upgrade 1.18.1 -> 1.21.0#283
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade

Conversation

@olly-writes-code

Copy link
Copy Markdown

c-blosc submodule upgrade 1.18.1 -> 1.21.0 to fix issue #269

TODO:

  • Unit tests and/or doctests in docstrings
  • tox -e py39 passes locally
  • Docstrings and API docs for any new/modified user-facing classes and functions
  • Changes documented in docs/release.rst
  • tox -e docs passes locally
  • GitHub Actions CI passes
  • Test coverage to 100% (Coveralls passes)

@olly-writes-code

Copy link
Copy Markdown
Author

When trying to run on my local machine I got the following error

 c-blosc/blosc/blosc.c:31:12: fatal error: 'snappy-c.h' file not found
#include "snappy-c.h"
^~~~~~~~~~~~ `

@olly-writes-code

Copy link
Copy Markdown
Author

This fixes the file not found snappy issue when compiling c-blosc 6df653b

IDK - how this will play with other machines.

Comment threadsetup.py
if os.path.isdir(d)]
define_macros += [('HAVE_LZ4', 1),
('HAVE_SNAPPY', 1),
# ('HAVE_SNAPPY', 1),

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.

Yeah I don't think we want to skip using Snappy. Did this move somewhere else? Is there a path we need to update?

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.

Hmm...looks like they dropped Snappy

Blosc/c-blosc#295

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.

Suggested change
# ('HAVE_SNAPPY', 1),
('HAVE_SNAPPY', 0), # Blosc 1.19.0+ dropped Snappy

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I'll make this change and see if installation still succeeds

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Confirming that it did not work with the above change #283 (comment) . I get the same error #283 (comment)

@jakirkhamjakirkhamJul 29, 2021

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.

Just to confirm, that's with 0 and not 1, correct? If so, that's really weird

Could you please try None as well?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

yep set to 0. Yeah I can try None too.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Yep same issue with None. I can dig into how the macro passes information to the c-blosc build process

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Oh it seems like @joshmoore started on this very same PR but stopped because of a call #259

Do we want to proceed with this change or go down another path?

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.

@kindjacket: explaining the #259 / #274 decisions -- we discussed that on that call that spending our time on the pure python implementation was probably a bigger win. However, as you can see in my #274, that turned out to be more work than (I) expected.

At this point, I'm inclined to say we temporarily drop snappy in order to get M1 fixed and then re-evaluate once that's working with the options being continue on the #274 path, or to first work on getting snappy working with c-block 1.21+.

@zarr-developers/core-devs : any objections?

@joshmoore

Copy link
Copy Markdown
Member

@kindjacket : looks like we have a 👍 from @jakirkham as well (#268), any thoughts on getting this ready to merge?

@pep8speaks

pep8speaks commented Aug 18, 2021

Copy link
Copy Markdown

Hello @kindjacket! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2021-08-18 09:31:52 UTC

@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from a33735c to cacaf05CompareAugust 18, 2021 08:07
@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from cacaf05 to fbe4d36CompareAugust 18, 2021 08:12
@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

whew Starting to look greenish.

Edit: CondaHTTPError: HTTP 502 BAD GATEWAY for url <https://conda.anaconda.org/conda-forge/noarch/current_repodata.json> looks like those that aren't may be unrelated. I'm trying to restart them into greenness.

@jakirkham

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy (somehow 🤔)

@joshmoore

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy

Good point. I didn't realize at first that it was an ordered list etc. etc. so I thought deletion was the appropriate way forward. I'll resurrect.

@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

Any thoughts on version number with the drop of snappy? 0.9.0 I assume.

@joshmoore

Copy link
Copy Markdown
Member

I'm taking that at least as no objections.

@joshmoore
joshmoore merged commit 4ea793d into zarr-developers:masterAug 18, 2021
@jakirkhamjakirkham mentioned this pull request Aug 18, 2021
@jakirkham

Copy link
Copy Markdown
Member

Thanks Josh! 😄

Sorry had to drop 😴 Though happy to trust your judgement on versions 🙂

Raised issue ( #285 ) about readding Snappy

@joshmoore

Copy link
Copy Markdown
Member

np.

A heads up that while testing zarr-developers/zarr-python#773 I'm pretty sure that this PR changed the checksum of chunks in the zarr_implementations test.

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.

4 participants

@olly-writes-code@joshmoore@pep8speaks@jakirkham
, '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

c-blosc upgrade 1.18.1 -> 1.21.0 - #283

Merged
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade
Aug 18, 2021
Merged

c-blosc upgrade 1.18.1 -> 1.21.0#283
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade

Conversation

@olly-writes-code

Copy link
Copy Markdown

c-blosc submodule upgrade 1.18.1 -> 1.21.0 to fix issue #269

TODO:

  • Unit tests and/or doctests in docstrings
  • tox -e py39 passes locally
  • Docstrings and API docs for any new/modified user-facing classes and functions
  • Changes documented in docs/release.rst
  • tox -e docs passes locally
  • GitHub Actions CI passes
  • Test coverage to 100% (Coveralls passes)

@olly-writes-code

Copy link
Copy Markdown
Author

When trying to run on my local machine I got the following error

 c-blosc/blosc/blosc.c:31:12: fatal error: 'snappy-c.h' file not found
#include "snappy-c.h"
^~~~~~~~~~~~ `

@olly-writes-code

Copy link
Copy Markdown
Author

This fixes the file not found snappy issue when compiling c-blosc 6df653b

IDK - how this will play with other machines.

Comment threadsetup.py
if os.path.isdir(d)]
define_macros += [('HAVE_LZ4', 1),
('HAVE_SNAPPY', 1),
# ('HAVE_SNAPPY', 1),

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.

Yeah I don't think we want to skip using Snappy. Did this move somewhere else? Is there a path we need to update?

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.

Hmm...looks like they dropped Snappy

Blosc/c-blosc#295

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.

Suggested change
# ('HAVE_SNAPPY', 1),
('HAVE_SNAPPY', 0), # Blosc 1.19.0+ dropped Snappy

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I'll make this change and see if installation still succeeds

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Confirming that it did not work with the above change #283 (comment) . I get the same error #283 (comment)

@jakirkhamjakirkhamJul 29, 2021

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.

Just to confirm, that's with 0 and not 1, correct? If so, that's really weird

Could you please try None as well?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

yep set to 0. Yeah I can try None too.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Yep same issue with None. I can dig into how the macro passes information to the c-blosc build process

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Oh it seems like @joshmoore started on this very same PR but stopped because of a call #259

Do we want to proceed with this change or go down another path?

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.

@kindjacket: explaining the #259 / #274 decisions -- we discussed that on that call that spending our time on the pure python implementation was probably a bigger win. However, as you can see in my #274, that turned out to be more work than (I) expected.

At this point, I'm inclined to say we temporarily drop snappy in order to get M1 fixed and then re-evaluate once that's working with the options being continue on the #274 path, or to first work on getting snappy working with c-block 1.21+.

@zarr-developers/core-devs : any objections?

@joshmoore

Copy link
Copy Markdown
Member

@kindjacket : looks like we have a 👍 from @jakirkham as well (#268), any thoughts on getting this ready to merge?

@pep8speaks

pep8speaks commented Aug 18, 2021

Copy link
Copy Markdown

Hello @kindjacket! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2021-08-18 09:31:52 UTC

@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from a33735c to cacaf05CompareAugust 18, 2021 08:07
@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from cacaf05 to fbe4d36CompareAugust 18, 2021 08:12
@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

whew Starting to look greenish.

Edit: CondaHTTPError: HTTP 502 BAD GATEWAY for url <https://conda.anaconda.org/conda-forge/noarch/current_repodata.json> looks like those that aren't may be unrelated. I'm trying to restart them into greenness.

@jakirkham

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy (somehow 🤔)

@joshmoore

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy

Good point. I didn't realize at first that it was an ordered list etc. etc. so I thought deletion was the appropriate way forward. I'll resurrect.

@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

Any thoughts on version number with the drop of snappy? 0.9.0 I assume.

@joshmoore

Copy link
Copy Markdown
Member

I'm taking that at least as no objections.

@joshmoore
joshmoore merged commit 4ea793d into zarr-developers:masterAug 18, 2021
@jakirkhamjakirkham mentioned this pull request Aug 18, 2021
@jakirkham

Copy link
Copy Markdown
Member

Thanks Josh! 😄

Sorry had to drop 😴 Though happy to trust your judgement on versions 🙂

Raised issue ( #285 ) about readding Snappy

@joshmoore

Copy link
Copy Markdown
Member

np.

A heads up that while testing zarr-developers/zarr-python#773 I'm pretty sure that this PR changed the checksum of chunks in the zarr_implementations test.

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.

4 participants

@olly-writes-code@joshmoore@pep8speaks@jakirkham
, '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

c-blosc upgrade 1.18.1 -> 1.21.0 - #283

Merged
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade
Aug 18, 2021
Merged

c-blosc upgrade 1.18.1 -> 1.21.0#283
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade

Conversation

@olly-writes-code

Copy link
Copy Markdown

c-blosc submodule upgrade 1.18.1 -> 1.21.0 to fix issue #269

TODO:

  • Unit tests and/or doctests in docstrings
  • tox -e py39 passes locally
  • Docstrings and API docs for any new/modified user-facing classes and functions
  • Changes documented in docs/release.rst
  • tox -e docs passes locally
  • GitHub Actions CI passes
  • Test coverage to 100% (Coveralls passes)

@olly-writes-code

Copy link
Copy Markdown
Author

When trying to run on my local machine I got the following error

 c-blosc/blosc/blosc.c:31:12: fatal error: 'snappy-c.h' file not found
#include "snappy-c.h"
^~~~~~~~~~~~ `

@olly-writes-code

Copy link
Copy Markdown
Author

This fixes the file not found snappy issue when compiling c-blosc 6df653b

IDK - how this will play with other machines.

Comment threadsetup.py
if os.path.isdir(d)]
define_macros += [('HAVE_LZ4', 1),
('HAVE_SNAPPY', 1),
# ('HAVE_SNAPPY', 1),

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.

Yeah I don't think we want to skip using Snappy. Did this move somewhere else? Is there a path we need to update?

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.

Hmm...looks like they dropped Snappy

Blosc/c-blosc#295

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.

Suggested change
# ('HAVE_SNAPPY', 1),
('HAVE_SNAPPY', 0), # Blosc 1.19.0+ dropped Snappy

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I'll make this change and see if installation still succeeds

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Confirming that it did not work with the above change #283 (comment) . I get the same error #283 (comment)

@jakirkhamjakirkhamJul 29, 2021

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.

Just to confirm, that's with 0 and not 1, correct? If so, that's really weird

Could you please try None as well?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

yep set to 0. Yeah I can try None too.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Yep same issue with None. I can dig into how the macro passes information to the c-blosc build process

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Oh it seems like @joshmoore started on this very same PR but stopped because of a call #259

Do we want to proceed with this change or go down another path?

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.

@kindjacket: explaining the #259 / #274 decisions -- we discussed that on that call that spending our time on the pure python implementation was probably a bigger win. However, as you can see in my #274, that turned out to be more work than (I) expected.

At this point, I'm inclined to say we temporarily drop snappy in order to get M1 fixed and then re-evaluate once that's working with the options being continue on the #274 path, or to first work on getting snappy working with c-block 1.21+.

@zarr-developers/core-devs : any objections?

@joshmoore

Copy link
Copy Markdown
Member

@kindjacket : looks like we have a 👍 from @jakirkham as well (#268), any thoughts on getting this ready to merge?

@pep8speaks

pep8speaks commented Aug 18, 2021

Copy link
Copy Markdown

Hello @kindjacket! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2021-08-18 09:31:52 UTC

@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from a33735c to cacaf05CompareAugust 18, 2021 08:07
@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from cacaf05 to fbe4d36CompareAugust 18, 2021 08:12
@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

whew Starting to look greenish.

Edit: CondaHTTPError: HTTP 502 BAD GATEWAY for url <https://conda.anaconda.org/conda-forge/noarch/current_repodata.json> looks like those that aren't may be unrelated. I'm trying to restart them into greenness.

@jakirkham

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy (somehow 🤔)

@joshmoore

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy

Good point. I didn't realize at first that it was an ordered list etc. etc. so I thought deletion was the appropriate way forward. I'll resurrect.

@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

Any thoughts on version number with the drop of snappy? 0.9.0 I assume.

@joshmoore

Copy link
Copy Markdown
Member

I'm taking that at least as no objections.

@joshmoore
joshmoore merged commit 4ea793d into zarr-developers:masterAug 18, 2021
@jakirkhamjakirkham mentioned this pull request Aug 18, 2021
@jakirkham

Copy link
Copy Markdown
Member

Thanks Josh! 😄

Sorry had to drop 😴 Though happy to trust your judgement on versions 🙂

Raised issue ( #285 ) about readding Snappy

@joshmoore

Copy link
Copy Markdown
Member

np.

A heads up that while testing zarr-developers/zarr-python#773 I'm pretty sure that this PR changed the checksum of chunks in the zarr_implementations test.

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.

4 participants

@olly-writes-code@joshmoore@pep8speaks@jakirkham
, '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

c-blosc upgrade 1.18.1 -> 1.21.0 - #283

Merged
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade
Aug 18, 2021
Merged

c-blosc upgrade 1.18.1 -> 1.21.0#283
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade

Conversation

@olly-writes-code

Copy link
Copy Markdown

c-blosc submodule upgrade 1.18.1 -> 1.21.0 to fix issue #269

TODO:

  • Unit tests and/or doctests in docstrings
  • tox -e py39 passes locally
  • Docstrings and API docs for any new/modified user-facing classes and functions
  • Changes documented in docs/release.rst
  • tox -e docs passes locally
  • GitHub Actions CI passes
  • Test coverage to 100% (Coveralls passes)

@olly-writes-code

Copy link
Copy Markdown
Author

When trying to run on my local machine I got the following error

 c-blosc/blosc/blosc.c:31:12: fatal error: 'snappy-c.h' file not found
#include "snappy-c.h"
^~~~~~~~~~~~ `

@olly-writes-code

Copy link
Copy Markdown
Author

This fixes the file not found snappy issue when compiling c-blosc 6df653b

IDK - how this will play with other machines.

Comment threadsetup.py
if os.path.isdir(d)]
define_macros += [('HAVE_LZ4', 1),
('HAVE_SNAPPY', 1),
# ('HAVE_SNAPPY', 1),

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.

Yeah I don't think we want to skip using Snappy. Did this move somewhere else? Is there a path we need to update?

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.

Hmm...looks like they dropped Snappy

Blosc/c-blosc#295

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.

Suggested change
# ('HAVE_SNAPPY', 1),
('HAVE_SNAPPY', 0), # Blosc 1.19.0+ dropped Snappy

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I'll make this change and see if installation still succeeds

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Confirming that it did not work with the above change #283 (comment) . I get the same error #283 (comment)

@jakirkhamjakirkhamJul 29, 2021

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.

Just to confirm, that's with 0 and not 1, correct? If so, that's really weird

Could you please try None as well?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

yep set to 0. Yeah I can try None too.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Yep same issue with None. I can dig into how the macro passes information to the c-blosc build process

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Oh it seems like @joshmoore started on this very same PR but stopped because of a call #259

Do we want to proceed with this change or go down another path?

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.

@kindjacket: explaining the #259 / #274 decisions -- we discussed that on that call that spending our time on the pure python implementation was probably a bigger win. However, as you can see in my #274, that turned out to be more work than (I) expected.

At this point, I'm inclined to say we temporarily drop snappy in order to get M1 fixed and then re-evaluate once that's working with the options being continue on the #274 path, or to first work on getting snappy working with c-block 1.21+.

@zarr-developers/core-devs : any objections?

@joshmoore

Copy link
Copy Markdown
Member

@kindjacket : looks like we have a 👍 from @jakirkham as well (#268), any thoughts on getting this ready to merge?

@pep8speaks

pep8speaks commented Aug 18, 2021

Copy link
Copy Markdown

Hello @kindjacket! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2021-08-18 09:31:52 UTC

@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from a33735c to cacaf05CompareAugust 18, 2021 08:07
@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from cacaf05 to fbe4d36CompareAugust 18, 2021 08:12
@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

whew Starting to look greenish.

Edit: CondaHTTPError: HTTP 502 BAD GATEWAY for url <https://conda.anaconda.org/conda-forge/noarch/current_repodata.json> looks like those that aren't may be unrelated. I'm trying to restart them into greenness.

@jakirkham

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy (somehow 🤔)

@joshmoore

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy

Good point. I didn't realize at first that it was an ordered list etc. etc. so I thought deletion was the appropriate way forward. I'll resurrect.

@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

Any thoughts on version number with the drop of snappy? 0.9.0 I assume.

@joshmoore

Copy link
Copy Markdown
Member

I'm taking that at least as no objections.

@joshmoore
joshmoore merged commit 4ea793d into zarr-developers:masterAug 18, 2021
@jakirkhamjakirkham mentioned this pull request Aug 18, 2021
@jakirkham

Copy link
Copy Markdown
Member

Thanks Josh! 😄

Sorry had to drop 😴 Though happy to trust your judgement on versions 🙂

Raised issue ( #285 ) about readding Snappy

@joshmoore

Copy link
Copy Markdown
Member

np.

A heads up that while testing zarr-developers/zarr-python#773 I'm pretty sure that this PR changed the checksum of chunks in the zarr_implementations test.

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.

4 participants

@olly-writes-code@joshmoore@pep8speaks@jakirkham
, '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

c-blosc upgrade 1.18.1 -> 1.21.0 - #283

Merged
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade
Aug 18, 2021
Merged

c-blosc upgrade 1.18.1 -> 1.21.0#283
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade

Conversation

@olly-writes-code

Copy link
Copy Markdown

c-blosc submodule upgrade 1.18.1 -> 1.21.0 to fix issue #269

TODO:

  • Unit tests and/or doctests in docstrings
  • tox -e py39 passes locally
  • Docstrings and API docs for any new/modified user-facing classes and functions
  • Changes documented in docs/release.rst
  • tox -e docs passes locally
  • GitHub Actions CI passes
  • Test coverage to 100% (Coveralls passes)

@olly-writes-code

Copy link
Copy Markdown
Author

When trying to run on my local machine I got the following error

 c-blosc/blosc/blosc.c:31:12: fatal error: 'snappy-c.h' file not found
#include "snappy-c.h"
^~~~~~~~~~~~ `

@olly-writes-code

Copy link
Copy Markdown
Author

This fixes the file not found snappy issue when compiling c-blosc 6df653b

IDK - how this will play with other machines.

Comment threadsetup.py
if os.path.isdir(d)]
define_macros += [('HAVE_LZ4', 1),
('HAVE_SNAPPY', 1),
# ('HAVE_SNAPPY', 1),

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.

Yeah I don't think we want to skip using Snappy. Did this move somewhere else? Is there a path we need to update?

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.

Hmm...looks like they dropped Snappy

Blosc/c-blosc#295

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.

Suggested change
# ('HAVE_SNAPPY', 1),
('HAVE_SNAPPY', 0), # Blosc 1.19.0+ dropped Snappy

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I'll make this change and see if installation still succeeds

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Confirming that it did not work with the above change #283 (comment) . I get the same error #283 (comment)

@jakirkhamjakirkhamJul 29, 2021

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.

Just to confirm, that's with 0 and not 1, correct? If so, that's really weird

Could you please try None as well?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

yep set to 0. Yeah I can try None too.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Yep same issue with None. I can dig into how the macro passes information to the c-blosc build process

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Oh it seems like @joshmoore started on this very same PR but stopped because of a call #259

Do we want to proceed with this change or go down another path?

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.

@kindjacket: explaining the #259 / #274 decisions -- we discussed that on that call that spending our time on the pure python implementation was probably a bigger win. However, as you can see in my #274, that turned out to be more work than (I) expected.

At this point, I'm inclined to say we temporarily drop snappy in order to get M1 fixed and then re-evaluate once that's working with the options being continue on the #274 path, or to first work on getting snappy working with c-block 1.21+.

@zarr-developers/core-devs : any objections?

@joshmoore

Copy link
Copy Markdown
Member

@kindjacket : looks like we have a 👍 from @jakirkham as well (#268), any thoughts on getting this ready to merge?

@pep8speaks

pep8speaks commented Aug 18, 2021

Copy link
Copy Markdown

Hello @kindjacket! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2021-08-18 09:31:52 UTC

@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from a33735c to cacaf05CompareAugust 18, 2021 08:07
@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from cacaf05 to fbe4d36CompareAugust 18, 2021 08:12
@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

whew Starting to look greenish.

Edit: CondaHTTPError: HTTP 502 BAD GATEWAY for url <https://conda.anaconda.org/conda-forge/noarch/current_repodata.json> looks like those that aren't may be unrelated. I'm trying to restart them into greenness.

@jakirkham

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy (somehow 🤔)

@joshmoore

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy

Good point. I didn't realize at first that it was an ordered list etc. etc. so I thought deletion was the appropriate way forward. I'll resurrect.

@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

Any thoughts on version number with the drop of snappy? 0.9.0 I assume.

@joshmoore

Copy link
Copy Markdown
Member

I'm taking that at least as no objections.

@joshmoore
joshmoore merged commit 4ea793d into zarr-developers:masterAug 18, 2021
@jakirkhamjakirkham mentioned this pull request Aug 18, 2021
@jakirkham

Copy link
Copy Markdown
Member

Thanks Josh! 😄

Sorry had to drop 😴 Though happy to trust your judgement on versions 🙂

Raised issue ( #285 ) about readding Snappy

@joshmoore

Copy link
Copy Markdown
Member

np.

A heads up that while testing zarr-developers/zarr-python#773 I'm pretty sure that this PR changed the checksum of chunks in the zarr_implementations test.

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.

4 participants

@olly-writes-code@joshmoore@pep8speaks@jakirkham
, '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

c-blosc upgrade 1.18.1 -> 1.21.0 - #283

Merged
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade
Aug 18, 2021
Merged

c-blosc upgrade 1.18.1 -> 1.21.0#283
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade

Conversation

@olly-writes-code

Copy link
Copy Markdown

c-blosc submodule upgrade 1.18.1 -> 1.21.0 to fix issue #269

TODO:

  • Unit tests and/or doctests in docstrings
  • tox -e py39 passes locally
  • Docstrings and API docs for any new/modified user-facing classes and functions
  • Changes documented in docs/release.rst
  • tox -e docs passes locally
  • GitHub Actions CI passes
  • Test coverage to 100% (Coveralls passes)

@olly-writes-code

Copy link
Copy Markdown
Author

When trying to run on my local machine I got the following error

 c-blosc/blosc/blosc.c:31:12: fatal error: 'snappy-c.h' file not found
#include "snappy-c.h"
^~~~~~~~~~~~ `

@olly-writes-code

Copy link
Copy Markdown
Author

This fixes the file not found snappy issue when compiling c-blosc 6df653b

IDK - how this will play with other machines.

Comment threadsetup.py
if os.path.isdir(d)]
define_macros += [('HAVE_LZ4', 1),
('HAVE_SNAPPY', 1),
# ('HAVE_SNAPPY', 1),

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.

Yeah I don't think we want to skip using Snappy. Did this move somewhere else? Is there a path we need to update?

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.

Hmm...looks like they dropped Snappy

Blosc/c-blosc#295

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.

Suggested change
# ('HAVE_SNAPPY', 1),
('HAVE_SNAPPY', 0), # Blosc 1.19.0+ dropped Snappy

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I'll make this change and see if installation still succeeds

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Confirming that it did not work with the above change #283 (comment) . I get the same error #283 (comment)

@jakirkhamjakirkhamJul 29, 2021

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.

Just to confirm, that's with 0 and not 1, correct? If so, that's really weird

Could you please try None as well?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

yep set to 0. Yeah I can try None too.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Yep same issue with None. I can dig into how the macro passes information to the c-blosc build process

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Oh it seems like @joshmoore started on this very same PR but stopped because of a call #259

Do we want to proceed with this change or go down another path?

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.

@kindjacket: explaining the #259 / #274 decisions -- we discussed that on that call that spending our time on the pure python implementation was probably a bigger win. However, as you can see in my #274, that turned out to be more work than (I) expected.

At this point, I'm inclined to say we temporarily drop snappy in order to get M1 fixed and then re-evaluate once that's working with the options being continue on the #274 path, or to first work on getting snappy working with c-block 1.21+.

@zarr-developers/core-devs : any objections?

@joshmoore

Copy link
Copy Markdown
Member

@kindjacket : looks like we have a 👍 from @jakirkham as well (#268), any thoughts on getting this ready to merge?

@pep8speaks

pep8speaks commented Aug 18, 2021

Copy link
Copy Markdown

Hello @kindjacket! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2021-08-18 09:31:52 UTC

@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from a33735c to cacaf05CompareAugust 18, 2021 08:07
@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from cacaf05 to fbe4d36CompareAugust 18, 2021 08:12
@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

whew Starting to look greenish.

Edit: CondaHTTPError: HTTP 502 BAD GATEWAY for url <https://conda.anaconda.org/conda-forge/noarch/current_repodata.json> looks like those that aren't may be unrelated. I'm trying to restart them into greenness.

@jakirkham

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy (somehow 🤔)

@joshmoore

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy

Good point. I didn't realize at first that it was an ordered list etc. etc. so I thought deletion was the appropriate way forward. I'll resurrect.

@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

Any thoughts on version number with the drop of snappy? 0.9.0 I assume.

@joshmoore

Copy link
Copy Markdown
Member

I'm taking that at least as no objections.

@joshmoore
joshmoore merged commit 4ea793d into zarr-developers:masterAug 18, 2021
@jakirkhamjakirkham mentioned this pull request Aug 18, 2021
@jakirkham

Copy link
Copy Markdown
Member

Thanks Josh! 😄

Sorry had to drop 😴 Though happy to trust your judgement on versions 🙂

Raised issue ( #285 ) about readding Snappy

@joshmoore

Copy link
Copy Markdown
Member

np.

A heads up that while testing zarr-developers/zarr-python#773 I'm pretty sure that this PR changed the checksum of chunks in the zarr_implementations test.

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.

4 participants

@olly-writes-code@joshmoore@pep8speaks@jakirkham
, '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

c-blosc upgrade 1.18.1 -> 1.21.0 - #283

Merged
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade
Aug 18, 2021
Merged

c-blosc upgrade 1.18.1 -> 1.21.0#283
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade

Conversation

@olly-writes-code

Copy link
Copy Markdown

c-blosc submodule upgrade 1.18.1 -> 1.21.0 to fix issue #269

TODO:

  • Unit tests and/or doctests in docstrings
  • tox -e py39 passes locally
  • Docstrings and API docs for any new/modified user-facing classes and functions
  • Changes documented in docs/release.rst
  • tox -e docs passes locally
  • GitHub Actions CI passes
  • Test coverage to 100% (Coveralls passes)

@olly-writes-code

Copy link
Copy Markdown
Author

When trying to run on my local machine I got the following error

 c-blosc/blosc/blosc.c:31:12: fatal error: 'snappy-c.h' file not found
#include "snappy-c.h"
^~~~~~~~~~~~ `

@olly-writes-code

Copy link
Copy Markdown
Author

This fixes the file not found snappy issue when compiling c-blosc 6df653b

IDK - how this will play with other machines.

Comment threadsetup.py
if os.path.isdir(d)]
define_macros += [('HAVE_LZ4', 1),
('HAVE_SNAPPY', 1),
# ('HAVE_SNAPPY', 1),

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.

Yeah I don't think we want to skip using Snappy. Did this move somewhere else? Is there a path we need to update?

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.

Hmm...looks like they dropped Snappy

Blosc/c-blosc#295

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.

Suggested change
# ('HAVE_SNAPPY', 1),
('HAVE_SNAPPY', 0), # Blosc 1.19.0+ dropped Snappy

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I'll make this change and see if installation still succeeds

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Confirming that it did not work with the above change #283 (comment) . I get the same error #283 (comment)

@jakirkhamjakirkhamJul 29, 2021

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.

Just to confirm, that's with 0 and not 1, correct? If so, that's really weird

Could you please try None as well?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

yep set to 0. Yeah I can try None too.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Yep same issue with None. I can dig into how the macro passes information to the c-blosc build process

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Oh it seems like @joshmoore started on this very same PR but stopped because of a call #259

Do we want to proceed with this change or go down another path?

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.

@kindjacket: explaining the #259 / #274 decisions -- we discussed that on that call that spending our time on the pure python implementation was probably a bigger win. However, as you can see in my #274, that turned out to be more work than (I) expected.

At this point, I'm inclined to say we temporarily drop snappy in order to get M1 fixed and then re-evaluate once that's working with the options being continue on the #274 path, or to first work on getting snappy working with c-block 1.21+.

@zarr-developers/core-devs : any objections?

@joshmoore

Copy link
Copy Markdown
Member

@kindjacket : looks like we have a 👍 from @jakirkham as well (#268), any thoughts on getting this ready to merge?

@pep8speaks

pep8speaks commented Aug 18, 2021

Copy link
Copy Markdown

Hello @kindjacket! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2021-08-18 09:31:52 UTC

@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from a33735c to cacaf05CompareAugust 18, 2021 08:07
@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from cacaf05 to fbe4d36CompareAugust 18, 2021 08:12
@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

whew Starting to look greenish.

Edit: CondaHTTPError: HTTP 502 BAD GATEWAY for url <https://conda.anaconda.org/conda-forge/noarch/current_repodata.json> looks like those that aren't may be unrelated. I'm trying to restart them into greenness.

@jakirkham

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy (somehow 🤔)

@joshmoore

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy

Good point. I didn't realize at first that it was an ordered list etc. etc. so I thought deletion was the appropriate way forward. I'll resurrect.

@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

Any thoughts on version number with the drop of snappy? 0.9.0 I assume.

@joshmoore

Copy link
Copy Markdown
Member

I'm taking that at least as no objections.

@joshmoore
joshmoore merged commit 4ea793d into zarr-developers:masterAug 18, 2021
@jakirkhamjakirkham mentioned this pull request Aug 18, 2021
@jakirkham

Copy link
Copy Markdown
Member

Thanks Josh! 😄

Sorry had to drop 😴 Though happy to trust your judgement on versions 🙂

Raised issue ( #285 ) about readding Snappy

@joshmoore

Copy link
Copy Markdown
Member

np.

A heads up that while testing zarr-developers/zarr-python#773 I'm pretty sure that this PR changed the checksum of chunks in the zarr_implementations test.

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.

4 participants

@olly-writes-code@joshmoore@pep8speaks@jakirkham
, '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

c-blosc upgrade 1.18.1 -> 1.21.0 - #283

Merged
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade
Aug 18, 2021
Merged

c-blosc upgrade 1.18.1 -> 1.21.0#283
joshmoore merged 8 commits into
zarr-developers:masterfrom
olly-writes-code:issue_269_c_blosc_upgrade

Conversation

@olly-writes-code

Copy link
Copy Markdown

c-blosc submodule upgrade 1.18.1 -> 1.21.0 to fix issue #269

TODO:

  • Unit tests and/or doctests in docstrings
  • tox -e py39 passes locally
  • Docstrings and API docs for any new/modified user-facing classes and functions
  • Changes documented in docs/release.rst
  • tox -e docs passes locally
  • GitHub Actions CI passes
  • Test coverage to 100% (Coveralls passes)

@olly-writes-code

Copy link
Copy Markdown
Author

When trying to run on my local machine I got the following error

 c-blosc/blosc/blosc.c:31:12: fatal error: 'snappy-c.h' file not found
#include "snappy-c.h"
^~~~~~~~~~~~ `

@olly-writes-code

Copy link
Copy Markdown
Author

This fixes the file not found snappy issue when compiling c-blosc 6df653b

IDK - how this will play with other machines.

Comment threadsetup.py
if os.path.isdir(d)]
define_macros += [('HAVE_LZ4', 1),
('HAVE_SNAPPY', 1),
# ('HAVE_SNAPPY', 1),

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.

Yeah I don't think we want to skip using Snappy. Did this move somewhere else? Is there a path we need to update?

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.

Hmm...looks like they dropped Snappy

Blosc/c-blosc#295

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.

Suggested change
# ('HAVE_SNAPPY', 1),
('HAVE_SNAPPY', 0), # Blosc 1.19.0+ dropped Snappy

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I'll make this change and see if installation still succeeds

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Confirming that it did not work with the above change #283 (comment) . I get the same error #283 (comment)

@jakirkhamjakirkhamJul 29, 2021

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.

Just to confirm, that's with 0 and not 1, correct? If so, that's really weird

Could you please try None as well?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

yep set to 0. Yeah I can try None too.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Yep same issue with None. I can dig into how the macro passes information to the c-blosc build process

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Oh it seems like @joshmoore started on this very same PR but stopped because of a call #259

Do we want to proceed with this change or go down another path?

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.

@kindjacket: explaining the #259 / #274 decisions -- we discussed that on that call that spending our time on the pure python implementation was probably a bigger win. However, as you can see in my #274, that turned out to be more work than (I) expected.

At this point, I'm inclined to say we temporarily drop snappy in order to get M1 fixed and then re-evaluate once that's working with the options being continue on the #274 path, or to first work on getting snappy working with c-block 1.21+.

@zarr-developers/core-devs : any objections?

@joshmoore

Copy link
Copy Markdown
Member

@kindjacket : looks like we have a 👍 from @jakirkham as well (#268), any thoughts on getting this ready to merge?

@pep8speaks

pep8speaks commented Aug 18, 2021

Copy link
Copy Markdown

Hello @kindjacket! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2021-08-18 09:31:52 UTC

@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from a33735c to cacaf05CompareAugust 18, 2021 08:07
@joshmoore
joshmooreforce-pushed the issue_269_c_blosc_upgrade branch from cacaf05 to fbe4d36CompareAugust 18, 2021 08:12
@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

whew Starting to look greenish.

Edit: CondaHTTPError: HTTP 502 BAD GATEWAY for url <https://conda.anaconda.org/conda-forge/noarch/current_repodata.json> looks like those that aren't may be unrelated. I'm trying to restart them into greenness.

@jakirkham

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy (somehow 🤔)

@joshmoore

Copy link
Copy Markdown
Member

Actually can we leave the fixture data (instead of deleting it)? We will want this when we add back snappy

Good point. I didn't realize at first that it was an ordered list etc. etc. so I thought deletion was the appropriate way forward. I'll resurrect.

@joshmoore

joshmoore commented Aug 18, 2021

Copy link
Copy Markdown
Member

Any thoughts on version number with the drop of snappy? 0.9.0 I assume.

@joshmoore

Copy link
Copy Markdown
Member

I'm taking that at least as no objections.

@joshmoore
joshmoore merged commit 4ea793d into zarr-developers:masterAug 18, 2021
@jakirkhamjakirkham mentioned this pull request Aug 18, 2021
@jakirkham

Copy link
Copy Markdown
Member

Thanks Josh! 😄

Sorry had to drop 😴 Though happy to trust your judgement on versions 🙂

Raised issue ( #285 ) about readding Snappy

@joshmoore

Copy link
Copy Markdown
Member

np.

A heads up that while testing zarr-developers/zarr-python#773 I'm pretty sure that this PR changed the checksum of chunks in the zarr_implementations test.

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.

4 participants

@olly-writes-code@joshmoore@pep8speaks@jakirkham