Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
P
pypocketfft
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 4
    • Issues 4
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 3
    • Merge Requests 3
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards

Planned maintenance on Wednesday, 2021-01-20, 17:00-18:00. Expect some interruptions during that time

  • Martin Reinecke
  • pypocketfft
  • Merge Requests
  • !42

Open
Opened Nov 23, 2020 by Martin Reinecke@mtrMaintainer
  • Report abuse
Report abuse

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b "small_fixes" "origin/small_fixes"

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "small_fixes"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

two bug fixes (should not have caused any problems yet)

  • Overview 3
  • Commits 2
  • Changes 2

This fixes two problems:

  • the requested size in aligned_alloc must be a multiple of the alignment, which we didn't enforce. This apparently hasn't caused any problems so far, but better safe than sorry.
  • r2r_fftpack used the wrong flag for the direction of the underlying halfcomplex transform. This is only a concern in cases where real2hermitian!=forward, and this scenario was not yet used, at least not from scipy.

@g-peterbell: I guess this should go into scipy at some point, but it's probably not urgent. What do you think?

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: mtr/pypocketfft!42
Source branch: small_fixes