Skip to content

Maxlag2023#5

Draft
yinnonsanders wants to merge 9 commits intomainfrom
maxlag2023
Draft

Maxlag2023#5
yinnonsanders wants to merge 9 commits intomainfrom
maxlag2023

Conversation

@yinnonsanders
Copy link
Copy Markdown
Collaborator

No description provided.

HoniSanders and others added 8 commits May 22, 2023 09:38
still need to:
- fix correlatemode_parser and PyArray_CorrelatemodeConverter in core/src/multiarray/conversion_utils.c
- fix array_correlate and array_correlate2 in core/src/multiarray/multiarraymodule.c based on those fixes and based on maxlag PR
…e.c changes from maxlag branch, requiring changes to conversion_utils.c and ndarratypes.h
# Version 17 (NumPy 1.25) No actual change.
0x00000011 = ca1aebdad799358149567d9d93cbca09

# Version 18 (NumPy 1.24) Added PyArray_CorrelateLags.
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Update version when rebasing (now on version 2.0.0)

'PyDataMem_SetHandler': (304, MinVersion("1.22")),
'PyDataMem_GetHandler': (305, MinVersion("1.22")),
# End 1.22 API
'PyArray_CorrelateLags': (307, MinVersion("1.25")),
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Formatting, also fix version when rebasing.

Comment thread numpy/core/numeric.py
if type(lag) is int: # maxlag
lags = (-lag+1, lag, 1)
elif type(lag) is tuple: # minlag and maxlag
if len(lag) > 2:
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Add check for length of 3?

Comment thread numpy/core/numeric.py Outdated
# 0x00000011 - 1.25.x
C_API_VERSION = 0x00000011
# 0x00000012 - 1.26.x
C_API_VERSION = 0x00000012
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Fix version when rebasing.

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