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

Force Siphash hashing #733

Closed
wants to merge 5 commits into from

Conversation

matthiasdiener
Copy link
Contributor

@matthiasdiener matthiasdiener commented Oct 15, 2024

Continuation of #719. Closes #718.

See also #432.

Checklist

  • Used a personal fork of the feedstock to propose changes
  • Bumped the build number (if the version is unchanged)
  • Reset the build number to 0 (if the version changed)
  • Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
  • Ensured the license file is being packaged.

gmarkall and others added 3 commits October 15, 2024 10:16
When cross-compiling, the hash function is forced to be FNV because the
configure script defines `HAVE_ALIGNED_REQUIRED` which is then used by
pyhash.h to change the default to FNV (see conda-forge#718)

This commit fixes the issue by specifying siphash24 to the configure
script when cross-compiling.
@matthiasdiener
Copy link
Contributor Author

@conda-forge-admin, please rerender

Comment on lines 280 to 282
# Force siphash24 (https://github.com/conda-forge/python-feedstock/issues/718):
_common_configure_args+=(--with-hash-algorithm=siphash24)

Copy link
Member

Choose a reason for hiding this comment

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

Let's remove this so that if upstream changes the default algorithm, we won't fall behind.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed in 8b77bac

@conda-forge-admin
Copy link
Contributor

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe/meta.yaml) and found it was in an excellent condition.

conda-forge-webservices[bot] and others added 2 commits October 15, 2024 15:41
Comment on lines +183 to -184
echo "ac_cv_aligned_required=no" >> config.site
if [[ "${target_platform}" == "osx-arm64" || "${target_platform}" == "linux-ppc64le" || "${target_platform}" == "linux-aarch64" ]]; then
echo "ac_cv_aligned_required=no" >> config.site
Copy link
Member

Choose a reason for hiding this comment

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

This doesn't change anything right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right, it is just trying to replicate a similar change in #719, which I think ended up adding ac_cv_aligned_required=no twice to config.site.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If you prefer, I can remove this change.

@matthiasdiener
Copy link
Contributor Author

Closing in favor of #737.

@matthiasdiener matthiasdiener deleted the siphash-v2 branch October 16, 2024 16:52
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.

Hash function is FNV on Python 3.10 and 3.11
4 participants