Skip to content

Nintegrate rebased#1186

Closed
rocky wants to merge 12 commits intomasterfrom
nintegrate-rebased
Closed

Nintegrate rebased#1186
rocky wants to merge 12 commits intomasterfrom
nintegrate-rebased

Conversation

@rocky
Copy link
Copy Markdown
Member

@rocky rocky commented Mar 14, 2021

A rebase of #1160

There were also some commits squashed, small revisions to CHANGES.rst (e.g. make it consistent with prior formatting), some things that Python linting caught.

@MMatura I generally merged HEAD over what was in master, although in some cases it looked like master had advanced.

The thing I am most unsure about is that tagging difference between compiled code and compled functions. So please review.

@rocky rocky requested a review from mmatera March 14, 2021 14:52
@rocky rocky force-pushed the nintegrate-rebased branch from 4e61795 to c52c310 Compare March 14, 2021 14:54
Use what is in master.

Later as a separate commit, we'll see if we can get the tagging sorted better.
@mmatera
Copy link
Copy Markdown
Contributor

mmatera commented Mar 14, 2021

I merged master in #1160, and on the top of this, I pass black and pyflakes. Then I took some lines from this PR correcting some errors. Then I compared it with this one. So, from the original branch I would keep:

  • compilation.py, I tagged different llvmlite and Python non compiled code in the makeboxes as -CompileCode- and -PythonizedCode-. This is not in this branch.
  • I blacked functional.py
  • I keep some print warnings in numeric.py

@rocky
Copy link
Copy Markdown
Member Author

rocky commented Mar 14, 2021

@mmatera I am not sure I understand the details, but what to do is clearer:

Please close one of the PR's and merge into master the other.

One thing that keeps happening that confuses a lot of this is that there are changes outside of the stated intent. In particular Nintegrate incorporates compile function changes and this make tracking changes more difficult. Both PR's have updates to CHANGES.rst which go beyond what is in Nintegrate as well.

@mmatera
Copy link
Copy Markdown
Contributor

mmatera commented Mar 14, 2021

@mmatera I am not sure I understand the details, but what to do is clearer:

Please close one of the PR's and merge into master the other.

One thing that keeps happening that confuses a lot of this is that there are changes outside of the stated intent. In particular Nintegrate incorporates compile function changes and this make tracking changes more difficult. Both PR's have updates to CHANGES.rst which go beyond what is in Nintegrate as well.
Sorry about that. The problem is that many times, trying to implement a fix, a secondary issue appears, and then the thing starts to diverge.

@mmatera
Copy link
Copy Markdown
Contributor

mmatera commented Mar 14, 2021

Changes incorporated in #1160.

@mmatera mmatera closed this Mar 14, 2021
@rocky rocky deleted the nintegrate-rebased branch March 19, 2021 01:27
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