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

Fixing BUG, get_next_chunk() should use the blocking function device_read() #12584

Merged
merged 8 commits into from
Jan 20, 2023
Merged

Fixing BUG, get_next_chunk() should use the blocking function device_read() #12584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
66e85d4
get_next_chunk(): use the blocking function device_read()
madsbk Jan 20, 2023
846a642
CI: adding DATA_CHUNK_SOURCE_TEST to the KvikIO tests
madsbk Jan 20, 2023
192bca4
style
madsbk Jan 20, 2023
371401f
remove debug
madsbk Jan 20, 2023
e9fba9e
Merge branch 'branch-23.02' of github.com:rapidsai/cudf into get_next…
madsbk Jan 20, 2023
abc4c1b
Merge branch 'branch-23.02' of github.com:rapidsai/cudf into get_next…
madsbk Jan 20, 2023
2c848b9
CI: KvikIO test DATA_CHUNK_SOURCE_TEST everywhere
madsbk Jan 20, 2023
86c8588
style
madsbk Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2018-2022, NVIDIA CORPORATION.
# Copyright (c) 2018-2023, NVIDIA CORPORATION.
##############################################
# cuDF GPU build and test script for CI #
##############################################
Expand Down Expand Up @@ -169,7 +169,7 @@ if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
done

# Test libcudf (csv, orc, and parquet) with `LIBCUDF_CUFILE_POLICY=KVIKIO`
for test_name in "CSV_TEST" "ORC_TEST" "PARQUET_TEST"; do
for test_name in "CSV_TEST" "ORC_TEST" "PARQUET_TEST" "DATA_CHUNK_SOURCE_TEST"; do
Copy link
Member

@ajschmidt8 ajschmidt8 Jan 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is no longer used since we've switched to GitHub Actions.

We will be opening PRs to remove all of these dead files from the repositories after the 23.02 release.

The file below is where we test the C++ now. These changes should be moved to there

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, added it to test_cpp.sh. When #12574 get merged, we don't need this anymore.

gt="$WORKSPACE/cpp/build/gtests/$test_name"
echo "Running GoogleTest $test_name (LIBCUDF_CUFILE_POLICY=KVIKIO)"
LIBCUDF_CUFILE_POLICY=KVIKIO ${gt} --gtest_output=xml:"$WORKSPACE/test-results/"
Expand Down Expand Up @@ -232,7 +232,7 @@ else
done

# Test libcudf (csv, orc, and parquet) with `LIBCUDF_CUFILE_POLICY=KVIKIO`
for test_name in "CSV_TEST" "ORC_TEST" "PARQUET_TEST"; do
for test_name in "CSV_TEST" "ORC_TEST" "PARQUET_TEST" "DATA_CHUNK_SOURCE_TEST"; do
gt="$CONDA_PREFIX/bin/gtests/libcudf/$test_name"
echo "Running GoogleTest $test_name (LIBCUDF_CUFILE_POLICY=KVIKIO)"
LIBCUDF_CUFILE_POLICY=KVIKIO ${gt} --gtest_output=xml:"$WORKSPACE/test-results/"
Expand Down
4 changes: 2 additions & 2 deletions ci/test_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2022, NVIDIA CORPORATION.
# Copyright (c) 2022-2023, NVIDIA CORPORATION.

set -euo pipefail

Expand Down Expand Up @@ -71,7 +71,7 @@ done

rapids-logger "Run gtests with kvikio"
# Test libcudf (csv, orc, and parquet) with `LIBCUDF_CUFILE_POLICY=KVIKIO`
for test_name in "CSV_TEST" "ORC_TEST" "PARQUET_TEST"; do
for test_name in "CSV_TEST" "ORC_TEST" "PARQUET_TEST" "DATA_CHUNK_SOURCE_TEST"; do
gt="$CONDA_PREFIX/bin/gtests/libcudf/${test_name}"
echo "Running gtest $test_name (LIBCUDF_CUFILE_POLICY=KVIKIO)"
LIBCUDF_CUFILE_POLICY=KVIKIO ${gt} --gtest_output=xml:${RAPIDS_TESTS_DIR}
Expand Down
3 changes: 1 addition & 2 deletions cpp/src/io/text/data_chunk_source_factories.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ class datasource_chunk_reader : public data_chunk_reader {
auto chunk = rmm::device_uvector<char>(read_size, stream);

if (_source->supports_device_read() && _source->is_device_read_preferred(read_size)) {
_source->device_read_async(
_offset, read_size, reinterpret_cast<uint8_t*>(chunk.data()), stream);
_source->device_read(_offset, read_size, reinterpret_cast<uint8_t*>(chunk.data()), stream);
} else {
auto& h_ticket = _tickets[_next_ticket_idx];

Expand Down