Skip to content

Commit b96f496

Browse files
committed
small fixes
1 parent 76c006c commit b96f496

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

CUDA/template/GB_jit_kernel_cuda_colscale.cu

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ __global__ void GB_cuda_colscale_kernel
4343
{
4444
if (!GBb_A (Ab, p)) continue ;
4545
// the pth entry in A is A(i,j) where i = p%avlen and j = p/avlen
46-
GB_Aj_TYPE col_idx = p / avlen ;
46+
int64_t col_idx = p / avlen ;
4747
// int64_t row_idx = p % avlen ;
4848
GB_DECLAREB (djj) ;
4949
GB_GETB (djj, Dx, col_idx, ) ;
@@ -54,11 +54,11 @@ __global__ void GB_cuda_colscale_kernel
5454
}
5555

5656
#else
57-
const GB_Aj_TYPE anvec = A->nvec ;
57+
const int64_t anvec = A->nvec ;
5858
// Copy A->p, A->h to C->p, C->h here instead of using
5959
// GB_dup_worker on the CPU, so A->p, A->h stay on the GPU
6060
// if they were already there
61-
for (GB_Aj_TYPE kA = tid ; kA < anvec ; kA += nthreads)
61+
for (int64_t kA = tid ; kA < anvec ; kA += nthreads)
6262
{
6363
Cp [kA] = Ap [kA] ;
6464
#if ( GB_A_IS_HYPER )
@@ -80,8 +80,8 @@ __global__ void GB_cuda_colscale_kernel
8080
for (int64_t pdelta = threadIdx.x ; pdelta < my_chunk_size ; pdelta += blockDim.x)
8181
{
8282
int64_t p_final ;
83-
GB_Aj_TYPE k = GB_cuda_ek_slice_entry (&p_final, pdelta, pfirst, Ap, anvec_sub1, kfirst, slope) ;
84-
GB_Aj_TYPE j = GBh_A (Ah, k) ;
83+
int64_t k = GB_cuda_ek_slice_entry (&p_final, pdelta, pfirst, Ap, anvec_sub1, kfirst, slope) ;
84+
int64_t j = GBh_A (Ah, k) ;
8585

8686
GB_DECLAREB (djj) ;
8787
GB_GETB (djj, Dx, j, ) ;

Source/mxm/GB_colscale.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ GrB_Info GB_colscale // C = A*D, column scale with diagonal D
180180

181181
// Do not dup A->p, A->h into C yet; if we use CUDA, we'll do it on the
182182
// GPU
183+
// FIXME: Add flags to GB_dup_worker for which arrays to copy
183184
int64_t *tmp_Ap = A->p ;
184185
int64_t *tmp_Ah = A->h ;
185186
A->p = NULL ;

Source/mxm/GB_rowscale.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ GrB_Info GB_rowscale // C = D*B, row scale with diagonal D
169169
//----------------------------------------------------------------------
170170

171171
// Do not dup B->i into C yet; if we use CUDA, we'll do it on the GPU
172+
// FIXME: Add flags to GB_dup_worker for which arrays to copy
172173
int64_t *tmp_Bi = B->i ;
173174
B->i = NULL ;
174175
GB_OK (GB_dup_worker (&C, C_iso, B, false, ztype)) ;

0 commit comments

Comments
 (0)