From 1745ee3ba3b62a15f3eb04d59d6b023b44ce1c9e Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Tue, 1 Jun 2021 11:06:31 +1000 Subject: [PATCH 1/4] Updates for device_scalar changes --- cpp/src/components/weakly_connected_components.cu | 2 +- cpp/src/traversal/tsp.cu | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cpp/src/components/weakly_connected_components.cu b/cpp/src/components/weakly_connected_components.cu index 0688dc7408f..4c106c422bc 100644 --- a/cpp/src/components/weakly_connected_components.cu +++ b/cpp/src/components/weakly_connected_components.cu @@ -596,7 +596,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(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(Bucket::cur)).clear(); diff --git a/cpp/src/traversal/tsp.cu b/cpp/src/traversal/tsp.cu index a28ddbbaa3f..5f0b0e980ce 100644 --- a/cpp/src/traversal/tsp.cu +++ b/cpp/src/traversal/tsp.cu @@ -19,6 +19,7 @@ #include +#include "rmm/cuda_stream_view.hpp" #include "tsp.hpp" #include "tsp_solver.hpp" @@ -53,6 +54,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_), @@ -81,9 +84,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::max()}; - best_cost_scalar_.set_value(max, stream_); + best_cost_scalar_.set_value_async(max, stream_); } void TSP::get_initial_solution(int const batch) From 134258082dcc9ae86805cc600775519748a441b6 Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Tue, 1 Jun 2021 11:06:44 +1000 Subject: [PATCH 2/4] Fix narrowing conversion warning --- cpp/src/community/triangles_counting.cu | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cpp/src/community/triangles_counting.cu b/cpp/src/community/triangles_counting.cu index 31acb4859bd..4d6f8029a56 100644 --- a/cpp/src/community/triangles_counting.cu +++ b/cpp/src/community/triangles_counting.cu @@ -827,7 +827,8 @@ void TrianglesCount::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(m_shared_mem_per_block * 8 / shMinBlkXSM) < + static_cast(m_mat.N)) tcount_b2b(); else tcount_bsh(); From 070122c48743bd339c977c95eba83b9a465d2e83 Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Thu, 10 Jun 2021 08:50:13 +1000 Subject: [PATCH 3/4] Update cpp/src/traversal/tsp.cu Co-authored-by: Paul Taylor --- cpp/src/traversal/tsp.cu | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cpp/src/traversal/tsp.cu b/cpp/src/traversal/tsp.cu index 5f0b0e980ce..17183d48f3d 100644 --- a/cpp/src/traversal/tsp.cu +++ b/cpp/src/traversal/tsp.cu @@ -19,7 +19,8 @@ #include -#include "rmm/cuda_stream_view.hpp" +#include + #include "tsp.hpp" #include "tsp_solver.hpp" From fa9b367d9334b02b2f8f10918f0a9d5f7eecd651 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 11 Jun 2021 12:49:55 -0400 Subject: [PATCH 4/4] mv dask installation --- ci/gpu/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 7c9c353f23c..a74eefffc8b 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -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 @@ -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