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

sparse: Add "order" and "out" arguments to todense() and toarray() #229

Merged
merged 8 commits into from
Jun 5, 2012
Merged

sparse: Add "order" and "out" arguments to todense() and toarray() #229

merged 8 commits into from
Jun 5, 2012

Commits on May 28, 2012

  1. ENH: 'order' keyword for toarray() on sparse types

    This adds an 'order' keyword to select the memory layout of the
    resulting array when using toarray() to create a dense array
    from a sparse matrix type. The default remains a C-contiguous
    array. Tests are also updated to test both the default and
    explicit 'C' and 'F' modes.
    
    Generated output of SWIG will follow in a separate commit, so
    that this one can be easily cherry-picked if what I generated
    is unsatisfactory.
    dwf committed May 28, 2012
    Configuration menu
    Copy the full SHA
    ea15fab View commit details
    Browse the repository at this point in the history
  2. ENH: 'order' keyword for todense() on sparse types

    This adds an 'order' keyword to select the memory layout of the
    resulting object when using todense() to create a numpy matrix
    object from a sparse matrix type, similarly to the previous
    change to toarray(). The default remains a C-contiguous
    matrix. Tests are also updated to test both the default and
    explicit 'C' and 'F' modes.
    
    Generated output of SWIG will follow in a separate commit, so
    that this one can be easily cherry-picked if what I generated
    is unsatisfactory.
    dwf committed May 28, 2012
    Configuration menu
    Copy the full SHA
    3099154 View commit details
    Browse the repository at this point in the history
  3. New SWIG wrapper for toarray()/todense() addition.

    This commit contains SWIG-generated code only.
    dwf committed May 28, 2012
    Configuration menu
    Copy the full SHA
    5febad9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ed8f27f View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2012

  1. ENH: Added an out= argument to sparse toarray().

    Mutually exclusive to the previously added 'order=' argument, this
    should serve the same crowd, i.e. people who occasionally need a dense
    copy of their sparse matrix but *really* can't afford to be allocating
    an array that size over and over again. Refactored a bit into the base
    class so as to not duplicate code between lil.py and coo.py.
    
    Tests included.
    dwf committed Jun 4, 2012
    Configuration menu
    Copy the full SHA
    5378661 View commit details
    Browse the repository at this point in the history
  2. ENH: Added an out= argument to sparse todense().

    This matches the new argument in the array version, toarray(). out is
    not required to be a numpy.matrix but is wrapped in one upon return.
    dwf committed Jun 4, 2012
    Configuration menu
    Copy the full SHA
    34c5eaa View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0ceeefa View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2012

  1. Configuration menu
    Copy the full SHA
    06cc844 View commit details
    Browse the repository at this point in the history