Skip to content

Commit

Permalink
Merge branch 'branch-25.02' into tid-overflow
Browse files Browse the repository at this point in the history
  • Loading branch information
davidwendt committed Dec 10, 2024
2 parents 5d58e2f + 3468e92 commit 3547734
Show file tree
Hide file tree
Showing 55 changed files with 532 additions and 1,263 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:
OTEL_SERVICE_NAME: 'pr-cudf'
steps:
- name: Telemetry setup
if: ${{ vars.TELEMETRY_ENABLED == 'true' }}
uses: rapidsai/shared-actions/telemetry-dispatch-stash-base-env-vars@main
changed-files:
secrets: inherit
Expand Down Expand Up @@ -329,7 +330,7 @@ jobs:
telemetry-summarize:
runs-on: ubuntu-latest
needs: pr-builder
if: always()
if: ${{ vars.TELEMETRY_ENABLED == 'true' && !cancelled() }}
continue-on-error: true
steps:
- name: Load stashed telemetry env vars
Expand Down
4 changes: 4 additions & 0 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -928,6 +928,10 @@ if(TARGET CUDA::cuFile${_cufile_suffix})
target_compile_definitions(cudf PRIVATE CUDF_CUFILE_FOUND)
endif()

# Remove this after upgrading to a CCCL that has a proper CMake option. See
# https://github.com/NVIDIA/cccl/pull/2844
target_compile_definitions(cudf PRIVATE THRUST_FORCE_32_BIT_OFFSET_TYPE=1)

# Compile stringified JIT sources first
add_dependencies(cudf jitify_preprocess_run)

Expand Down
8 changes: 4 additions & 4 deletions cpp/benchmarks/stream_compaction/apply_boolean_mask.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ void apply_boolean_mask_benchmark(nvbench::state& state, nvbench::type_list<Data
data_profile profile = data_profile_builder().cardinality(0).no_validity().distribution(
input_type, distribution_id::UNIFORM, 0, 20);

auto source_table =
create_random_table(cycle_dtypes({input_type}, n_cols), row_count{n_rows}, profile);
auto source_table = create_random_table(
cycle_dtypes({input_type, cudf::type_id::STRING}, n_cols), row_count{n_rows}, profile);

profile.set_bool_probability_true(percent_true / 100.0);
profile.set_null_probability(std::nullopt); // no null mask
Expand All @@ -85,6 +85,6 @@ using data_type = nvbench::type_list<int32_t, int64_t, double, cudf::string_view
NVBENCH_BENCH_TYPES(apply_boolean_mask_benchmark, NVBENCH_TYPE_AXES(data_type))
.set_name("apply_boolean_mask")
.set_type_axes_names({"type"})
.add_int64_axis("columns", {1, 4})
.add_int64_axis("columns", {1, 4, 9})
.add_int64_axis("rows", {100'000, 1'000'000, 10'000'000})
.add_int64_axis("hits_%", {10, 50, 100});
.add_int64_axis("hits_%", {10, 20, 50, 80, 90, 100});
5 changes: 0 additions & 5 deletions cpp/cmake/thirdparty/patches/cccl_override.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
"packages" : {
"CCCL" : {
"patches" : [
{
"file" : "${current_json_dir}/thrust_disable_64bit_dispatching.diff",
"issue" : "Remove 64bit dispatching as not needed by libcudf and results in compiling twice as many kernels [https://github.com/rapidsai/cudf/pull/11437]",
"fixed_in" : ""
},
{
"file" : "${current_json_dir}/thrust_faster_sort_compile_times.diff",
"issue" : "Improve Thrust sort compile times by not unrolling loops for inlined comparators [https://github.com/rapidsai/cudf/pull/10577]",
Expand Down
22 changes: 0 additions & 22 deletions cpp/cmake/thirdparty/patches/thrust_disable_64bit_dispatching.diff

This file was deleted.

Loading

0 comments on commit 3547734

Please sign in to comment.