Skip to content

[FIX] CHECK_CUDA macros in debug builds #1687

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

Merged
rapids-bot merged 3 commits into from
Jun 28, 2021
Merged

[FIX] CHECK_CUDA macros in debug builds #1687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d811ee8
fix CHECK_CUDA macros in debug builds
trxcllnt Jun 24, 2021
4654ce8
fix more names
trxcllnt Jun 24, 2021
ac412b4
fix find-replace typo
trxcllnt Jun 24, 2021
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
8 changes: 6 additions & 2 deletions cpp/src/traversal/mg/common_utils.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,15 @@

#pragma once

#include <raft/integer_utils.h>
#include "../traversal_common.cuh"

#include <rmm/thrust_rmm_allocator.h>
#include <thrust/host_vector.h>
#include <cub/cub.cuh>
#include "../traversal_common.cuh"

#include <raft/cudart_utils.h>
#include <raft/integer_utils.h>
#include <raft/handle.hpp>

namespace cugraph {

Expand Down
20 changes: 10 additions & 10 deletions cpp/src/utilities/graph_utils.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ void axpy(size_t n, T a, T *x, T *y)
thrust::device_pointer_cast(y),
thrust::device_pointer_cast(y),
axpy_functor<T>(a));
CHECK_CUDA(stream);
CHECK_CUDA(stream_view.value());
}

// norm
Expand All @@ -119,7 +119,7 @@ T nrm2(size_t n, T *x)
square<T>(),
init,
thrust::plus<T>()));
CHECK_CUDA(stream);
CHECK_CUDA(stream_view.value());
return result;
}

Expand All @@ -130,7 +130,7 @@ T nrm1(size_t n, T *x)
T result = thrust::reduce(rmm::exec_policy(stream_view),
thrust::device_pointer_cast(x),
thrust::device_pointer_cast(x + n));
CHECK_CUDA(stream);
CHECK_CUDA(stream_view.value());
return result;
}

Expand All @@ -144,7 +144,7 @@ void scal(size_t n, T val, T *x)
thrust::make_constant_iterator(val),
thrust::device_pointer_cast(x),
thrust::multiplies<T>());
CHECK_CUDA(stream);
CHECK_CUDA(stream_view.value());
}

template <typename T>
Expand All @@ -157,7 +157,7 @@ void addv(size_t n, T val, T *x)
thrust::make_constant_iterator(val),
thrust::device_pointer_cast(x),
thrust::plus<T>());
CHECK_CUDA(stream);
CHECK_CUDA(stream_view.value());
}

template <typename T>
Expand All @@ -180,7 +180,7 @@ void scatter(size_t n, T *src, T *dst, M *map)
thrust::device_pointer_cast(src + n),
thrust::device_pointer_cast(map),
thrust::device_pointer_cast(dst));
CHECK_CUDA(stream);
CHECK_CUDA(stream_view.value());
}

template <typename T>
Expand All @@ -205,7 +205,7 @@ void copy(size_t n, T *x, T *res)
thrust::device_ptr<T> res_ptr(res);
rmm::cuda_stream_view stream_view;
thrust::copy_n(rmm::exec_policy(stream_view), dev_ptr, n, res_ptr);
CHECK_CUDA(stream);
CHECK_CUDA(stream_view.value());
}

template <typename T>
Expand All @@ -230,7 +230,7 @@ void update_dangling_nodes(size_t n, T *dangling_nodes, T damping_factor)
thrust::device_pointer_cast(dangling_nodes),
dangling_functor<T>(1.0 - damping_factor),
is_zero<T>());
CHECK_CUDA(stream);
CHECK_CUDA(stream_view.value());
}

// google matrix kernels
Expand Down Expand Up @@ -342,11 +342,11 @@ void HT_matrix_csc_coo(const IndexType n,
nblocks.z = min((n + nthreads.z - 1) / nthreads.z, CUDA_MAX_BLOCKS); // 1;
equi_prob3<IndexType, ValueType>
<<<nblocks, nthreads, 0, stream_view.value()>>>(n, e, csrPtr, csrInd, val, degree.data());
CHECK_CUDA(stream.value());
CHECK_CUDA(stream_view.value());

ValueType a = 0.0;
fill(n, bookmark, a);
CHECK_CUDA(stream);
CHECK_CUDA(stream_view.value());

nthreads.x = min(n, CUDA_MAX_KERNEL_THREADS);
nthreads.y = 1;
Expand Down