Skip to content

Commit

Permalink
Merge branch 'branch-25.02' into ci-graph
Browse files Browse the repository at this point in the history
  • Loading branch information
jameslamb authored Dec 4, 2024
2 parents be63a29 + 22a32c1 commit 4f600f3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions conda/recipes/cugraph/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ requirements:
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
{% if cuda_major == "11" %}
- cudatoolkit
- cuda-python >=11.7.1,<12.0a0,<=11.8.3
- cuda-python >=11.7.1,<12.0a0
{% else %}
- cuda-cudart
- cuda-python >=12.0,<13.0a0,<=12.6.0
- cuda-python >=12.0,<13.0a0
{% endif %}
- cudf ={{ minor_version }}
- cupy >=12.0.0
Expand Down
2 changes: 1 addition & 1 deletion cpp/libcugraph_etl/src/renumbering.cu
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ __global__ static void select_unrenumber_string(str_hash_value* idx_to_col_row,
}

struct struct_sort_descending {
__host__ __device__ bool operator()(str_hash_value& a, str_hash_value& b)
__host__ __device__ bool operator()(str_hash_value a, str_hash_value b)
{
return (a.count_ > b.count_);
}
Expand Down

0 comments on commit 4f600f3

Please sign in to comment.