Skip to content

Additions to DenseMatrixBase and MutableDenseMatrix #143

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

Merged
merged 2 commits into from
Jul 30, 2017

Conversation

ShikharJ
Copy link
Member

@ShikharJ ShikharJ commented May 17, 2017

Relevant: #17

@ShikharJ ShikharJ force-pushed the DenseMatrix branch 3 times, most recently from 9f7f7dc to cd46608 Compare June 10, 2017 18:50
@ShikharJ
Copy link
Member Author

@isuruf Though I have updated the symengine_version.txt to the latest commit, the above methods are still not visible in SymEngine.py. Please advise.

@isuruf
Copy link
Member

isuruf commented Jun 11, 2017

It's using the correct version of symengine. Something is wrong with your code here.

@@ -671,6 +671,14 @@ cdef extern from "<symengine/matrix.h>" namespace "SymEngine":
const DenseMatrix &x, DenseMatrix &result) nogil except +
void diff "SymEngine::sdiff"(const DenseMatrix &A,
RCP[const Basic] &x, DenseMatrix &result) nogil except +
void row_join(const DenseMatrix &A, const DenseMatrix &B, DenseMatrix &C) nogil
Copy link
Member

Choose a reason for hiding this comment

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

This should be declared in the class itself without the first parameter. See add_matrix

Copy link
Member Author

Choose a reason for hiding this comment

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

But add_matrix by default has only two parameters. Changing the declarations similarly has no effect as well.

@ShikharJ
Copy link
Member Author

@isuruf There doesn't seem to be any effect with changing the declarations. What do you suggest we do?

@ShikharJ
Copy link
Member Author

ShikharJ commented Jun 20, 2017

@isuruf Can you also take a look here. I'd like to finish this up before the release.

@isuruf
Copy link
Member

isuruf commented Jun 20, 2017

This can't go in the release, since it's using functionality of symengine not yet released. I'll have a look about what can do.

@ShikharJ ShikharJ force-pushed the DenseMatrix branch 3 times, most recently from cbca8e1 to 22999fd Compare July 14, 2017 23:55
@ShikharJ
Copy link
Member Author

@isuruf Anything on this? I'd like to finish this up.

…exchange_dense, dot and cross functions from SymEngine
@ShikharJ
Copy link
Member Author

Ping @isuruf.

@isuruf
Copy link
Member

isuruf commented Jul 23, 2017

@@ -2826,6 +2842,8 @@ cdef class DenseMatrixBase(MatrixBase):
def tolist(self):
return self[:]

_mat = tolist
Copy link
Member

Choose a reason for hiding this comment

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

This is really inefficient. _mat method should just return self.

void row_add_row_dense(DenseMatrix &A, unsigned i, unsigned j, RCP[const Basic] &c) nogil
void column_exchange_dense(DenseMatrix &A, unsigned i, unsigned j) nogil
void dot(const DenseMatrix &A, const DenseMatrix &B, DenseMatrix &C) nogil
void cross(const DenseMatrix &A, const DenseMatrix &B, DenseMatrix &C) nogil
Copy link
Member Author

Choose a reason for hiding this comment

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

@isuruf Can you point out what is wrong with the declarations here?

Copy link
Member

Choose a reason for hiding this comment

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

They are not declared in class DenseMatrix. They should be declared outside the class.

@ShikharJ
Copy link
Member Author

Can you review this once @isuruf?

@isuruf
Copy link
Member

isuruf commented Jul 26, 2017

@ShikharJ
Copy link
Member Author

@isuruf The tests pass now, can you review this please?

@ShikharJ
Copy link
Member Author

Ping @isuruf.

@isuruf isuruf merged commit cf2d943 into symengine:master Jul 30, 2017
@ShikharJ ShikharJ deleted the DenseMatrix branch July 30, 2017 12:10
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