From b75a4b7d3a6ef5974e309ecdf780297e54e28da9 Mon Sep 17 00:00:00 2001 From: vuule Date: Wed, 18 Jan 2023 14:12:08 -0800 Subject: [PATCH 1/5] change default --- cpp/src/io/utilities/config_utils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/src/io/utilities/config_utils.cpp b/cpp/src/io/utilities/config_utils.cpp index 08b5914cb19..2d1da31a08f 100644 --- a/cpp/src/io/utilities/config_utils.cpp +++ b/cpp/src/io/utilities/config_utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021-2023, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ enum class usage_policy : uint8_t { OFF, GDS, ALWAYS, KVIKIO }; */ usage_policy get_env_policy() { - static auto const env_val = getenv_or("LIBCUDF_CUFILE_POLICY", "GDS"); + static auto const env_val = getenv_or("LIBCUDF_CUFILE_POLICY", "KVIKIO"); if (env_val == "OFF") return usage_policy::OFF; if (env_val == "GDS") return usage_policy::GDS; if (env_val == "ALWAYS") return usage_policy::ALWAYS; From 87d7fb14ec4d8e4173ded042a28ef7514cfe2a8c Mon Sep 17 00:00:00 2001 From: vuule Date: Wed, 18 Jan 2023 14:15:40 -0800 Subject: [PATCH 2/5] remove (now) redundant tests --- ci/gpu/build.sh | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index e1082872d71..2f0668f6d0c 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -167,13 +167,6 @@ if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then echo "Running GoogleTest $test_name" ${gt} --gtest_output=xml:"$WORKSPACE/test-results/" done - - # Test libcudf (csv, orc, and parquet) with `LIBCUDF_CUFILE_POLICY=KVIKIO` - for test_name in "CSV_TEST" "ORC_TEST" "PARQUET_TEST"; do - 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/" - done fi else #Project Flash @@ -231,13 +224,6 @@ else fi done - # Test libcudf (csv, orc, and parquet) with `LIBCUDF_CUFILE_POLICY=KVIKIO` - for test_name in "CSV_TEST" "ORC_TEST" "PARQUET_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/" - done - export LIB_BUILD_DIR="$WORKSPACE/ci/artifacts/cudf/cpu/libcudf_work/cpp/build" # Copy libcudf build time results echo "Checking for build time log $LIB_BUILD_DIR/ninja_log.xml" From e425a7a531e58a9ab8cb224aafb915e0d460d3ef Mon Sep 17 00:00:00 2001 From: vuule Date: Wed, 18 Jan 2023 14:16:10 -0800 Subject: [PATCH 3/5] docs --- docs/cudf/source/user_guide/io/io.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/cudf/source/user_guide/io/io.md b/docs/cudf/source/user_guide/io/io.md index 3a803953502..c62351925f0 100644 --- a/docs/cudf/source/user_guide/io/io.md +++ b/docs/cudf/source/user_guide/io/io.md @@ -102,7 +102,7 @@ There are four valid values for the environment variable: - "KVIKIO": Enable GDS through [KvikIO](https://github.com/rapidsai/kvikio). - "OFF": Completely disable GDS use. -If no value is set, behavior will be the same as the "GDS" option. +If no value is set, behavior will be the same as the "KVIKIO" option. This environment variable also affects how cuDF treats GDS errors. From 2e5f4113cb71d6fe46d4b88dd92ab2bcff5dc6e2 Mon Sep 17 00:00:00 2001 From: vuule Date: Wed, 18 Jan 2023 18:32:51 -0800 Subject: [PATCH 4/5] style --- ci/gpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 2f0668f6d0c..a33dc842a7f 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -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 # ############################################## From 50bdf1f883aeadc5ebec3aad334df9fa00d27043 Mon Sep 17 00:00:00 2001 From: vuule Date: Mon, 23 Jan 2023 11:22:33 -0800 Subject: [PATCH 5/5] test changes in new file --- ci/test_cpp.sh | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 368a78a2025..5b1e8aa398c 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -69,19 +69,6 @@ for gt in "$CONDA_PREFIX"/bin/gtests/{libcudf,libcudf_kafka}/* ; do fi 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" "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} - exitcode=$? - if (( ${exitcode} != 0 )); then - SUITEERROR=${exitcode} - echo "FAILED: GTest ${gt}" - fi -done - if [[ "${RAPIDS_BUILD_TYPE}" == "nightly" ]]; then rapids-logger "Memcheck gtests with rmm_mode=cuda" export GTEST_CUDF_RMM_MODE=cuda