Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Work around issues with cccl main #15552

Merged
merged 49 commits into from
May 28, 2024
Merged

Work around issues with cccl main #15552

merged 49 commits into from
May 28, 2024

Commits on Apr 17, 2024

  1. Always use cuda::proclaim_return_type with device lambdas 

    Co-authored-by: Bernhard Manfred Gruber <bgruber@nvidia.com>
    @miscco @bernhardmgruber
    miscco and bernhardmgruber committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    b74a236 View commit details
    Browse the repository at this point in the history

  2. Work around issue with thrust::pair that prevents CTAD

    @miscco
    miscco committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    942291c View commit details
    Browse the repository at this point in the history

  3. Apply suggestions from code review

    @bdice
    bdice authored Apr 17, 2024
    Configuration menu
    Copy the full SHA
    e172942 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Merge branch 'branch-24.06' into fix_cccl_compat

    @ttnghia
    ttnghia authored Apr 19, 2024
    Configuration menu
    Copy the full SHA
    83bc096 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Merge branch 'fix_cccl_compat' of github.com:miscco/cudf into miscco-… 

    …fix_cccl_compat
    @trxcllnt
    trxcllnt committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    32eab67 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'branch-24.06' of github.com:rapidsai/cudf into miscco-f… 

    …ix_cccl_compat
    @trxcllnt
    trxcllnt committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    dec2915 View commit details
    Browse the repository at this point in the history

  3. fix lint

    @trxcllnt
    trxcllnt committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    6ca0c2a View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. Merge branch 'branch-24.06' of github.com:rapidsai/cudf into miscco-f… 

    …ix_cccl_compat
    @trxcllnt
    trxcllnt committed May 8, 2024
    Configuration menu
    Copy the full SHA
    9b09a9e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'branch-24.06' into fix_cccl_compat

    @trxcllnt
    trxcllnt authored May 8, 2024
    Configuration menu
    Copy the full SHA
    c39db41 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix_cccl_compat' of github.com:miscco/cudf into miscco-… 

    …fix_cccl_compat
    @trxcllnt
    trxcllnt committed May 8, 2024
    Configuration menu
    Copy the full SHA
    4bda146 View commit details
    Browse the repository at this point in the history

  4. use std::min instead of cuda::std::min

    @trxcllnt
    trxcllnt committed May 8, 2024
    Configuration menu
    Copy the full SHA
    04f1990 View commit details
    Browse the repository at this point in the history

  5. use cuda::proclaim_return_type

    @trxcllnt
    trxcllnt committed May 8, 2024
    Configuration menu
    Copy the full SHA
    586f502 View commit details
    Browse the repository at this point in the history

  6. remove test for int16_t key type that's unsupported by cuda::atomic_ref

    @trxcllnt
    trxcllnt committed May 8, 2024
    Configuration menu
    Copy the full SHA
    3598c8f View commit details
    Browse the repository at this point in the history

  7. regenerate and add patches that apply to CCCL main

    @trxcllnt
    trxcllnt committed May 8, 2024
    Configuration menu
    Copy the full SHA
    69796d5 View commit details
    Browse the repository at this point in the history

  8. don't modify whitespace in patches

    @trxcllnt
    trxcllnt committed May 8, 2024
    Configuration menu
    Copy the full SHA
    8c43425 View commit details
    Browse the repository at this point in the history

  9. don't run clang-format on files in cpp/build/*

    @trxcllnt
    trxcllnt committed May 8, 2024
    Configuration menu
    Copy the full SHA
    991c789 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Merge branch 'branch-24.06' of github.com:rapidsai/cudf into fix/cccl… 

    …-2.5
    @trxcllnt
    trxcllnt committed May 9, 2024
    Configuration menu
    Copy the full SHA
    60aecd8 View commit details
    Browse the repository at this point in the history

  2. update devcontainer workflow to use NVIDIA/cccl#pull-request/1667

    @trxcllnt
    trxcllnt committed May 9, 2024
    Configuration menu
    Copy the full SHA
    9320968 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. Merge branch 'branch-24.06' into fix_cccl_compat

    @trxcllnt
    trxcllnt authored May 13, 2024
    Configuration menu
    Copy the full SHA
    69bf346 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Merge branch 'branch-24.06' into fix_cccl_compat

    @trxcllnt
    trxcllnt authored May 14, 2024
    Configuration menu
    Copy the full SHA
    6a758bf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'branch-24.06' into fix_cccl_compat

    @trxcllnt
    trxcllnt authored May 14, 2024
    Configuration menu
    Copy the full SHA
    bb67523 View commit details
    Browse the repository at this point in the history

  3. test rapids-cmake with CCCL 2.5

    @trxcllnt
    trxcllnt committed May 14, 2024
    Configuration menu
    Copy the full SHA
    4ff0c59 View commit details
    Browse the repository at this point in the history

  4. pass cuco::cuda_stream_ref

    @trxcllnt
    trxcllnt committed May 14, 2024
    Configuration menu
    Copy the full SHA
    f122905 View commit details
    Browse the repository at this point in the history

  5. revert changes to pr.yaml

    @trxcllnt
    trxcllnt committed May 14, 2024
    Configuration menu
    Copy the full SHA
    434600e View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Merge branch 'branch-24.06' into fix_cccl_compat

    @trxcllnt
    trxcllnt authored May 15, 2024
    Configuration menu
    Copy the full SHA
    75a1606 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'branch-24.06' into fix_cccl_compat

    @trxcllnt
    trxcllnt authored May 15, 2024
    Configuration menu
    Copy the full SHA
    9872c7c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'branch-24.06' into fix_cccl_compat

    @trxcllnt
    trxcllnt authored May 15, 2024
    Configuration menu
    Copy the full SHA
    d85c763 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Merge branch 'branch-24.06' into fix_cccl_compat

    @trxcllnt
    trxcllnt authored May 16, 2024
    Configuration menu
    Copy the full SHA
    7c1abf8 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Merge branch 'branch-24.06' into fix_cccl_compat

    @trxcllnt
    trxcllnt authored May 21, 2024
    Configuration menu
    Copy the full SHA
    b14899f View commit details
    Browse the repository at this point in the history

  2. Update cpp/src/join/distinct_hash_join.cu 

    Co-authored-by: Yunsong Wang <yunsongw@nvidia.com>
    @trxcllnt @PointKernel
    trxcllnt and PointKernel authored May 21, 2024
    Configuration menu
    Copy the full SHA
    ffdab59 View commit details
    Browse the repository at this point in the history

  3. fix lint

    @trxcllnt
    trxcllnt committed May 21, 2024
    Configuration menu
    Copy the full SHA
    57d9eea View commit details
    Browse the repository at this point in the history

  4. Merge branch 'branch-24.06' into fix_cccl_compat

    @trxcllnt
    trxcllnt authored May 21, 2024
    Configuration menu
    Copy the full SHA
    7b0e75e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'branch-24.06' into fix_cccl_compat

    @trxcllnt
    trxcllnt authored May 21, 2024
    Configuration menu
    Copy the full SHA
    9b5bc7a View commit details
    Browse the repository at this point in the history

  6. Apply suggestions from reviewers

    @trxcllnt
    trxcllnt committed May 21, 2024
    Configuration menu
    Copy the full SHA
    a011739 View commit details
    Browse the repository at this point in the history

  7. revert more thrust::pair changes

    @trxcllnt
    trxcllnt committed May 21, 2024
    Configuration menu
    Copy the full SHA
    78c1a89 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. fix lint

    @trxcllnt
    trxcllnt committed May 22, 2024
    Configuration menu
    Copy the full SHA
    68c5997 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'branch-24.06' into fix_cccl_compat

    @trxcllnt
    trxcllnt authored May 22, 2024
    Configuration menu
    Copy the full SHA
    a4e123a View commit details
    Browse the repository at this point in the history

  3. Apply suggestions from code review

    @trxcllnt
    trxcllnt authored May 22, 2024
    Configuration menu
    Copy the full SHA
    114db08 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. fix lint

    @trxcllnt
    trxcllnt committed May 23, 2024
    Configuration menu
    Copy the full SHA
    64264a7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'branch-24.06' of github.com:rapidsai/cudf into fix/cccl… 

    …-2.5
    @trxcllnt
    trxcllnt committed May 23, 2024
    Configuration menu
    Copy the full SHA
    48f22e2 View commit details
    Browse the repository at this point in the history

  3. include cuda/std/functional

    @trxcllnt
    trxcllnt committed May 23, 2024
    Configuration menu
    Copy the full SHA
    902f06b View commit details
    Browse the repository at this point in the history

  4. cuda::std::min -> std::min

    @trxcllnt
    trxcllnt committed May 23, 2024
    Configuration menu
    Copy the full SHA
    3b29345 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'branch-24.06' into fix_cccl_compat

    @trxcllnt
    trxcllnt authored May 23, 2024
    Configuration menu
    Copy the full SHA
    264dda7 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'branch-24.06' into fix_cccl_compat

    @trxcllnt
    trxcllnt authored May 23, 2024
    Configuration menu
    Copy the full SHA
    3fce393 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Merge branch 'branch-24.06' into fix_cccl_compat

    @trxcllnt
    trxcllnt authored May 24, 2024
    Configuration menu
    Copy the full SHA
    d19d41d View commit details
    Browse the repository at this point in the history

  2. fix orc tests

    @trxcllnt
    trxcllnt committed May 24, 2024
    Configuration menu
    Copy the full SHA
    422538e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'branch-24.06' of github.com:rapidsai/cudf into fix/cccl… 

    …-2.5
    @trxcllnt
    trxcllnt committed May 24, 2024
    Configuration menu
    Copy the full SHA
    774520c View commit details
    Browse the repository at this point in the history

  4. compute and compare num_blocks instead of num_streams

    @trxcllnt
    trxcllnt committed May 24, 2024
    Configuration menu
    Copy the full SHA
    ef42695 View commit details
    Browse the repository at this point in the history

  5. revert changes to use rapids-cmake CCCL 2.5 branch

    @trxcllnt
    trxcllnt authored May 24, 2024
    Configuration menu
    Copy the full SHA
    d9a4947 View commit details
    Browse the repository at this point in the history