Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert previous changes to vendored code #512

Merged
merged 1 commit into from
May 26, 2023

Conversation

DimitriPapadopoulos
Copy link
Contributor

No description provided.

@FrancescAlted
Copy link
Member

Uh, the bitshuffle codec here is actually a copy of the upstream. Frankly, for future updates in upstream, I'd prefer keeping this code in sync.

@DimitriPapadopoulos
Copy link
Contributor Author

Indeed, I will revert all previous changes. That said, perhaps the block below should be kept in this file, in addition to the Blosc block:

/*
 * Bitshuffle - Filter for improving compression of typed binary data.
 *
 * Author: Kiyoshi Masui <[email protected]>
 * Website: http://www.github.com/kiyo-masui/bitshuffle
 * Created: 2014
 *
 * See LICENSE file for details about copyright and rights to use.
 *
 */

The rationale is both to warn that the code is vendored, and to comply with the licence:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

@FrancescAlted
Copy link
Member

Indeed, I will revert all previous changes. That said, perhaps the block below should be kept in this file, in addition to the Blosc block:

/*
 * Bitshuffle - Filter for improving compression of typed binary data.
 *
 * Author: Kiyoshi Masui <[email protected]>
 * Website: http://www.github.com/kiyo-masui/bitshuffle
 * Created: 2014
 *
 * See LICENSE file for details about copyright and rights to use.
 *
 */

The rationale is both to warn that the code is vendored, and to comply with the licence:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

Agreed!

@DimitriPapadopoulos
Copy link
Contributor Author

Most of 3rd party code lives under internal-complibs.

Are these 3 macros the only piece of code borrowed from kiyo-masui/bitshuffle? Is there vendored code elsewhere too?

Mainly 3 macros from file src/bitshuffle_core.c from version 0.5.1 of:
	https://github.com/kiyo-masui/bitshuffle
@DimitriPapadopoulos DimitriPapadopoulos changed the title Macros with multiple statements should be enclosed in a do - while loop Revert previous changes to vendored code May 23, 2023
@DimitriPapadopoulos
Copy link
Contributor Author

The relevant part of the code have been reverted to its previous state.

@FrancescAlted
Copy link
Member

Most of 3rd party code lives under internal-complibs.

Are these 3 macros the only piece of code borrowed from kiyo-masui/bitshuffle? Is there vendored code elsewhere too?

No, all the bitshuffle code is from the bitshuffle project (actually, Kiyo helped us in integrating it better in C-Blosc).

@DimitriPapadopoulos
Copy link
Contributor Author

It would be clearer if files could be just copied over from kiyo-masui/bitshuffle, but kiyo-masui/bitshuffle#11 seems to imply it's not straightforward.

@FrancescAlted
Copy link
Member

LGTM. Thanks @DimitriPapadopoulos !

@FrancescAlted FrancescAlted merged commit 2eab185 into Blosc:main May 26, 2023
@DimitriPapadopoulos DimitriPapadopoulos deleted the macros branch May 27, 2023 18:14
@DimitriPapadopoulos
Copy link
Contributor Author

Should I revert changes to other files? In most bitshuffle-*.[hc] files, I changed header inclusion stuff, but in a few files, I modified macros.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants