From 90ac8650010bb2d2e341f887fec02cf372941103 Mon Sep 17 00:00:00 2001 From: Chuck Hastings Date: Mon, 25 Apr 2022 13:45:50 -0400 Subject: [PATCH 1/3] cudf moved the default_hash into the cudf::detail namespace --- cpp/libcugraph_etl/include/hash/concurrent_unordered_map.cuh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/libcugraph_etl/include/hash/concurrent_unordered_map.cuh b/cpp/libcugraph_etl/include/hash/concurrent_unordered_map.cuh index 1f99c9bce2f..c48ee2fb792 100644 --- a/cpp/libcugraph_etl/include/hash/concurrent_unordered_map.cuh +++ b/cpp/libcugraph_etl/include/hash/concurrent_unordered_map.cuh @@ -118,7 +118,7 @@ union pair_packer()>> { */ template , + typename Hasher = cudf::detail::default_hash, typename Equality = equal_to, typename Allocator = default_allocator>> class concurrent_unordered_map { From 1722a3a0234f3fa8f035d22d9b56b80c9691d9c9 Mon Sep 17 00:00:00 2001 From: Chuck Hastings Date: Mon, 25 Apr 2022 17:18:32 -0400 Subject: [PATCH 2/3] Change from Joseph to address a python change in cudf --- python/cugraph/cugraph/structure/hypergraph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cugraph/cugraph/structure/hypergraph.py b/python/cugraph/cugraph/structure/hypergraph.py index 365c26da6be..2ac07472e78 100644 --- a/python/cugraph/cugraph/structure/hypergraph.py +++ b/python/cugraph/cugraph/structure/hypergraph.py @@ -503,7 +503,7 @@ def _create_direct_edges( def _str_scalar_to_category(size, val): return cudf.core.column.build_categorical_column( categories=cudf.core.column.as_column([val], dtype="str"), - codes=cudf.utils.utils.scalar_broadcast_to(0, size, dtype=np.int32), + codes=cudf.core.column.column.full(size, 0, dtype=np.int32) mask=None, size=size, offset=0, From 43e25db8171e5d8e972039a80be60ea1b342a2f0 Mon Sep 17 00:00:00 2001 From: Chuck Hastings Date: Mon, 25 Apr 2022 17:20:12 -0400 Subject: [PATCH 3/3] missing comma --- python/cugraph/cugraph/structure/hypergraph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cugraph/cugraph/structure/hypergraph.py b/python/cugraph/cugraph/structure/hypergraph.py index 2ac07472e78..705deb56028 100644 --- a/python/cugraph/cugraph/structure/hypergraph.py +++ b/python/cugraph/cugraph/structure/hypergraph.py @@ -503,7 +503,7 @@ def _create_direct_edges( def _str_scalar_to_category(size, val): return cudf.core.column.build_categorical_column( categories=cudf.core.column.as_column([val], dtype="str"), - codes=cudf.core.column.column.full(size, 0, dtype=np.int32) + codes=cudf.core.column.column.full(size, 0, dtype=np.int32), mask=None, size=size, offset=0,