Skip to content

Commit

Permalink
Merge branch 'branch-24.10' into my_new_branch
Browse files Browse the repository at this point in the history
  • Loading branch information
jakirkham authored Aug 29, 2024
2 parents 1d66490 + 9b41aef commit ba6cbab
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cpp/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ ConfigureTest(SAMPLING_POST_PROCESSING_TEST sampling/sampling_post_processing_te

###################################################################################################
# - NEGATIVE SAMPLING tests --------------------------------------------------------------------
ConfigureTest(NEGATIVE_SAMPLING_TEST sampling/negative_sampling.cpp)
ConfigureTest(NEGATIVE_SAMPLING_TEST sampling/negative_sampling.cpp PERCENT 100)

###################################################################################################
# - Renumber tests --------------------------------------------------------------------------------
Expand Down
12 changes: 7 additions & 5 deletions python/cugraph/cugraph/structure/hypergraph.py
Original file line number Diff line number Diff line change
Expand Up @@ -580,14 +580,16 @@ 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.as_column(0, length=size, dtype=np.int32),
mask=None,
return cudf.core.column.CategoricalColumn(
data=None,
size=size,
dtype=cudf.CategoricalDtype(
categories=cudf.core.column.as_column([val], dtype="str"), ordered=False
),
mask=None,
offset=0,
null_count=0,
ordered=False,
children=(cudf.core.column.as_column(0, length=size, dtype=np.int32),),
)


Expand Down

0 comments on commit ba6cbab

Please sign in to comment.