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.

Sign up for GitHub

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

Jump to bottom

Shyrma reduce #481

Merged
merged 29 commits into from
Jul 10, 2020
Merged

Shyrma reduce #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0daf4d1
- start working on improving of cpu legacy code for reduce ops
shyrma May 12, 2020
fa59490
- further work on improving legacy loops
shyrma May 13, 2020
2c64b67
- still working on improving reduce ops
shyrma May 14, 2020
2002986
Merge branch 'master' into shyrma_reduce
shyrma May 14, 2020
fa00cd7
- further work on improving reduce ops
shyrma May 14, 2020
9cc5beb
- testing speed run of new reduce op
shyrma May 15, 2020
1fd45bc
- working on improvement of default loop for reduce op
shyrma May 18, 2020
30e348d
- update signatures of stuff which calls reduce ops
shyrma May 29, 2020
4730ea4
- make corrections in cuda reduce kernels
shyrma May 30, 2020
937231f
- change loop for default case in broadcast legacy ops
shyrma May 30, 2020
50151c0
Merge branch 'master' into shyrma_reduce
shyrma May 30, 2020
3f436e0
- comment some shape stuff
shyrma Jun 2, 2020
1594845
Merge branch 'master' into shyrma_reduce
shyrma Jun 2, 2020
df1a015
- comment unnecessary prints in RNGtests
shyrma Jun 2, 2020
57d2bfb
Merge branch 'master' into shyrma_reduce
shyrma Jun 9, 2020
3f1c6f1
- finish to resolve conflicts after master has been merged
shyrma Jun 9, 2020
2dac373
- get rid of some compilation mistakes of cuda stuff
shyrma Jun 9, 2020
316189c
- minor changes
shyrma Jun 12, 2020
bcb9549
- further search for bug causing crash on java test
shyrma Jun 13, 2020
47d7d75
- add scalar case in reduce_ ... exec stuff
shyrma Jun 13, 2020
4a74b08
Merge branch 'master' into shyrma_reduce
shyrma Jun 13, 2020
b0e0329
- minor corrections in NAtiveOps.cu
shyrma Jun 13, 2020
cd93189
- add switch to scalar case execReduceXD functions
shyrma Jun 14, 2020
5a54b12
- add support for vectors old shape in ConstantShapeHelper::createSha…
shyrma Jun 16, 2020
721fd6c
Merge branch 'master' into shyrma_reduce
shyrma Jun 16, 2020
a94442a
- correct cuda mirrorPad
shyrma Jun 17, 2020
e220aa1
- add support for vectors old shape in cuda createShapeInfoWithNoUnit…
shyrma Jun 17, 2020
22d9ca8
Merge branch 'master' into shyrma_reduce
shyrma Jun 17, 2020
2a32578
Merge branch 'master' into shyrma_reduce
raver119 Jul 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions libnd4j/include/array/NDArray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,17 +628,17 @@ namespace sd {
* keepDims - if true then put unities in place of reduced dimensions
*/

NDArray reduceAlongDimension(sd::reduce::FloatOps op, const std::vector<int>& dimensions, const bool keepDims = false, const bool supportOldShapes = false) const;
NDArray reduceAlongDimension(sd::reduce::FloatOps op, const std::initializer_list<int>& dimensions, const bool keepDims = false, const bool supportOldShapes = false) const;
NDArray reduceAlongDimension(sd::reduce::FloatOps op, const std::vector<int>& dimensions, const bool keepDims = false) const;
NDArray reduceAlongDimension(sd::reduce::FloatOps op, const std::initializer_list<int>& dimensions, const bool keepDims = false) const;

NDArray reduceAlongDimension(sd::reduce::SameOps op, const std::vector<int>& dimensions, const bool keepDims = false, const bool supportOldShapes = false) const;
NDArray reduceAlongDimension(sd::reduce::SameOps op, const std::initializer_list<int>& dimensions, const bool keepDims = false, const bool supportOldShapes = false) const;
NDArray reduceAlongDimension(sd::reduce::SameOps op, const std::vector<int>& dimensions, const bool keepDims = false) const;
NDArray reduceAlongDimension(sd::reduce::SameOps op, const std::initializer_list<int>& dimensions, const bool keepDims = false) const;

NDArray reduceAlongDimension(sd::reduce::BoolOps op, const std::vector<int>& dimensions, const bool keepDims = false, const bool supportOldShapes = false) const;
NDArray reduceAlongDimension(sd::reduce::BoolOps op, const std::initializer_list<int>& dimensions, const bool keepDims = false, const bool supportOldShapes = false) const;
NDArray reduceAlongDimension(sd::reduce::BoolOps op, const std::vector<int>& dimensions, const bool keepDims = false) const;
NDArray reduceAlongDimension(sd::reduce::BoolOps op, const std::initializer_list<int>& dimensions, const bool keepDims = false) const;

NDArray reduceAlongDimension(sd::reduce::LongOps op, const std::vector<int>& dimensions, const bool keepDims = false, const bool supportOldShapes = false) const;
NDArray reduceAlongDimension(sd::reduce::LongOps op, const std::initializer_list<int>& dimensions, const bool keepDims = false, const bool supportOldShapes = false) const;
NDArray reduceAlongDimension(sd::reduce::LongOps op, const std::vector<int>& dimensions, const bool keepDims = false) const;
NDArray reduceAlongDimension(sd::reduce::LongOps op, const std::initializer_list<int>& dimensions, const bool keepDims = false) const;

/**
* method reduces array by excluding its shapes along dimensions present in given dimensions vector
Expand All @@ -647,10 +647,10 @@ namespace sd {
* keepDims - if true then put unities in place of reduced dimensions
* extras - extra parameters
*/
void reduceAlongDimension(sd::reduce::FloatOps op, NDArray& target, const std::vector<int>& dimensions, const bool keepDims = false, const bool supportOldShapes = false, const bool checkTargetShape = true) const;
void reduceAlongDimension(sd::reduce::SameOps op, NDArray& target, const std::vector<int>& dimensions, const bool keepDims = false, const bool supportOldShapes = false, const bool checkTargetShape = true) const;
void reduceAlongDimension(sd::reduce::BoolOps op, NDArray& target, const std::vector<int>& dimensions, const bool keepDims = false, const bool supportOldShapes = false, const bool checkTargetShape = true) const;
void reduceAlongDimension(sd::reduce::LongOps op, NDArray& target, const std::vector<int>& dimensions, const bool keepDims = false, const bool supportOldShapes = false, const bool checkTargetShape = true) const;
void reduceAlongDimension(sd::reduce::FloatOps op, NDArray& target, const std::vector<int>& dimensions, const bool keepDims = false, const bool checkTargetShape = true) const;
void reduceAlongDimension(sd::reduce::SameOps op, NDArray& target, const std::vector<int>& dimensions, const bool keepDims = false, const bool checkTargetShape = true) const;
void reduceAlongDimension(sd::reduce::BoolOps op, NDArray& target, const std::vector<int>& dimensions, const bool keepDims = false, const bool checkTargetShape = true) const;
void reduceAlongDimension(sd::reduce::LongOps op, NDArray& target, const std::vector<int>& dimensions, const bool keepDims = false, const bool checkTargetShape = true) const;

/**
* return variance of array elements set
Expand Down
Loading