Skip to content

Commit

Permalink
Merge branch 'branch-25.02' into remove-legacy-dataframe
Browse files Browse the repository at this point in the history
  • Loading branch information
rjzamora authored Dec 18, 2024
2 parents e70a392 + 5160989 commit 7d64e46
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
# Please keep pr-builder as the top job here
pr-builder:
needs:
- check-nightly-ci
- changed-files
- checks
- conda-cpp-build
Expand Down Expand Up @@ -54,6 +55,18 @@ jobs:
- name: Telemetry setup
if: ${{ vars.TELEMETRY_ENABLED == 'true' }}
uses: rapidsai/shared-actions/telemetry-dispatch-stash-base-env-vars@main
check-nightly-ci:
# Switch to ubuntu-latest once it defaults to a version of Ubuntu that
# provides at least Python 3.11 (see
# https://docs.python.org/3/library/datetime.html#datetime.date.fromisoformat)
runs-on: ubuntu-24.04
env:
RAPIDS_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Check if nightly CI is passing
uses: rapidsai/shared-actions/check_nightly_success/dispatch@main
with:
repo: cudf
changed-files:
secrets: inherit
needs: telemetry-setup
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/io/parquet/reader_impl_preprocess.cu
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ void decode_page_headers(pass_intermediate_data& pass,
{
CUDF_FUNC_RANGE();

auto iter = thrust::make_counting_iterator(0);
auto iter = thrust::counting_iterator<size_t>(0);
rmm::device_uvector<size_t> chunk_page_counts(pass.chunks.size() + 1, stream);
thrust::transform_exclusive_scan(
rmm::exec_policy_nosync(stream),
Expand All @@ -562,7 +562,7 @@ void decode_page_headers(pass_intermediate_data& pass,
return static_cast<size_t>(
i >= num_chunks ? 0 : chunks[i].num_data_pages + chunks[i].num_dict_pages);
}),
0,
size_t{0},
thrust::plus<size_t>{});
rmm::device_uvector<chunk_page_info> d_chunk_page_info(pass.chunks.size(), stream);
thrust::for_each(rmm::exec_policy_nosync(stream),
Expand Down

0 comments on commit 7d64e46

Please sign in to comment.