Skip to content

Update to changed rmm::device_scalar API #1637

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 5 commits into from
Jun 14, 2021
Merged

Update to changed rmm::device_scalar API #1637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1745ee3
Updates for device_scalar changes
harrism Jun 1, 2021
1342580
Fix narrowing conversion warning
harrism Jun 1, 2021
bc36d8e
Merge branch 'branch-21.08' into fea-device_scalar-refactor
harrism Jun 8, 2021
070122c
Update cpp/src/traversal/tsp.cu
harrism Jun 9, 2021
fa9b367
mv dask installation
ajschmidt8 Jun 11, 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: 4 additions & 4 deletions ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ gpuci_conda_retry install -y \
# gpuci_conda_retry remove --force rapids-build-env rapids-notebook-env
# gpuci_conda_retry install -y "your-pkg=1.0.0"

gpuci_logger "Install the master version of dask and distributed"
pip install "git+https://github.com/dask/distributed.git" --upgrade --no-deps
pip install "git+https://github.com/dask/dask.git" --upgrade --no-deps

gpuci_logger "Check versions"
python --version
$CC --version
Expand Down Expand Up @@ -108,6 +104,10 @@ else
echo "Installing $CONDA_FILE"
conda install -c ${CONDA_ARTIFACT_PATH} "$CONDA_FILE"

gpuci_logger "Install the master version of dask and distributed"
pip install "git+https://github.com/dask/distributed.git" --upgrade --no-deps
pip install "git+https://github.com/dask/dask.git" --upgrade --no-deps

echo "Build cugraph..."
$WORKSPACE/build.sh cugraph
fi
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/community/triangles_counting.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,8 @@ void TrianglesCount<IndexType>::count()
tcount_wrp();
else {
const int shMinBlkXSM = 6;
if (size_t{m_shared_mem_per_block * 8 / shMinBlkXSM} < (size_t)m_mat.N)
if (static_cast<size_t>(m_shared_mem_per_block * 8 / shMinBlkXSM) <
static_cast<size_t>(m_mat.N))
tcount_b2b();
else
tcount_bsh();
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/components/weakly_connected_components.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ void weakly_connected_components_impl(raft::handle_t const &handle,
edge_first,
edge_first + new_num_edge_inserts);
auto num_unique_edges = static_cast<size_t>(thrust::distance(edge_first, unique_edge_last));
num_edge_inserts.set_value(num_unique_edges, handle.get_stream_view());
num_edge_inserts.set_value_async(num_unique_edges, handle.get_stream_view());
}

vertex_frontier.get_bucket(static_cast<size_t>(Bucket::cur)).clear();
Expand Down
8 changes: 6 additions & 2 deletions cpp/src/traversal/tsp.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

#include <utilities/high_res_timer.hpp>

#include <rmm/cuda_stream_view.hpp>

#include "tsp.hpp"
#include "tsp_solver.hpp"

Expand Down Expand Up @@ -53,6 +55,8 @@ TSP::TSP(raft::handle_t const &handle,
warp_size_(handle_.get_device_properties().warpSize),
sm_count_(handle_.get_device_properties().multiProcessorCount),
restart_batch_(8192),
mylock_scalar_(stream_),
best_cost_scalar_(stream_),
neighbors_vec_((k_ + 1) * nodes_, stream_),
work_vec_(restart_batch_ * ((4 * nodes_ + 3 + warp_size_ - 1) / warp_size_ * warp_size_),
stream_),
Expand Down Expand Up @@ -81,9 +85,9 @@ void TSP::setup()

void TSP::reset_batch()
{
mylock_scalar_.set_value_zero(stream_);
mylock_scalar_.set_value_to_zero_async(stream_);
auto const max{std::numeric_limits<int>::max()};
best_cost_scalar_.set_value(max, stream_);
best_cost_scalar_.set_value_async(max, stream_);
}

void TSP::get_initial_solution(int const batch)
Expand Down