Skip to content

Commit

Permalink
Merge branch 'master' into correlate
Browse files Browse the repository at this point in the history
  • Loading branch information
Dahlia-Chehata committed Jun 25, 2020
2 parents c9a7084 + 60c620d commit e5b69ca
Show file tree
Hide file tree
Showing 73 changed files with 8,578 additions and 1,472 deletions.
2 changes: 1 addition & 1 deletion cupy/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '8.0.0b3'
__version__ = '8.0.0b4'
10 changes: 10 additions & 0 deletions cupy/core/_cub_reduction.pxd
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
from cupy.core._carray cimport shape_t
from cupy.core.core cimport ndarray


cdef bint _try_to_call_cub_reduction(
self, list in_args, list out_args, const shape_t& a_shape,
stream, optimize_context, tuple key,
map_expr, reduce_expr, post_map_expr, reduce_type, type_map,
tuple reduce_axis, tuple out_axis, const shape_t& out_shape,
ndarray ret)
Loading

0 comments on commit e5b69ca

Please sign in to comment.