Merge branch 'branch-23.04' into add_docs_build

.gitattributes

@@ -1,5 +1,4 @@
 python/cudf/cudf/_version.py export-subst
-python/strings_udf/strings_udf/_version.py export-subst
 python/cudf_kafka/cudf_kafka/_version.py export-subst
 python/custreamz/custreamz/_version.py export-subst
 python/dask_cudf/dask_cudf/_version.py export-subst

.gitignore

@@ -36,8 +36,6 @@ python/cudf_kafka/*/_lib/**/*.cpp
 python/cudf_kafka/*/_lib/**/*.h
 python/custreamz/*/_lib/**/*.cpp
 python/custreamz/*/_lib/**/*.h
-python/strings_udf/strings_udf/_lib/*.cpp
-python/strings_udf/strings_udf/*.ptx
 .Python
 env/
 develop-eggs/

build.sh

@@ -17,7 +17,7 @@ ARGS=$*
 # script, and that this script resides in the repo dir!
 REPODIR=$(cd $(dirname $0); pwd)
 
-VALIDARGS="clean libcudf cudf cudfjar dask_cudf benchmarks tests libcudf_kafka cudf_kafka custreamz strings_udf -v -g -n -l --allgpuarch --disable_nvtx --opensource_nvcomp  --show_depr_warn --ptds -h --build_metrics --incl_cache_stats"
+VALIDARGS="clean libcudf cudf cudfjar dask_cudf benchmarks tests libcudf_kafka cudf_kafka custreamz -v -g -n -l --allgpuarch --disable_nvtx --opensource_nvcomp  --show_depr_warn --ptds -h --build_metrics --incl_cache_stats"
 HELP="$0 [clean] [libcudf] [cudf] [cudfjar] [dask_cudf] [benchmarks] [tests] [libcudf_kafka] [cudf_kafka] [custreamz] [-v] [-g] [-n] [-h] [--cmake-args=\\\"<args>\\\"]
    clean                         - remove all existing build artifacts and configuration (start
                                    over)
@@ -337,14 +337,6 @@ if buildAll || hasArg cudf; then
     fi
 fi
 
-if buildAll || hasArg strings_udf; then
-
-    cd ${REPODIR}/python/strings_udf
-    python setup.py build_ext --inplace -- -DCMAKE_PREFIX_PATH=${INSTALL_PREFIX} -DCMAKE_LIBRARY_PATH=${LIBCUDF_BUILD_DIR} -DCMAKE_CUDA_ARCHITECTURES=${CUDF_CMAKE_CUDA_ARCHITECTURES} ${EXTRA_CMAKE_ARGS} -- -j${PARALLEL_LEVEL:-1}
-    if [[ ${INSTALL_TARGET} != "" ]]; then
-        python setup.py install --single-version-externally-managed --record=record.txt  -- -DCMAKE_PREFIX_PATH=${INSTALL_PREFIX} -DCMAKE_LIBRARY_PATH=${LIBCUDF_BUILD_DIR} ${EXTRA_CMAKE_ARGS} -- -j${PARALLEL_LEVEL:-1}
-    fi
-fi
 
 # Build and install the dask_cudf Python package
 if buildAll || hasArg dask_cudf; then

ci/build_python.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022, NVIDIA CORPORATION.
+# Copyright (c) 2022-2023, NVIDIA CORPORATION.
 
 set -euo pipefail
 
@@ -38,10 +38,5 @@ rapids-mamba-retry mambabuild \
   --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
   conda/recipes/custreamz
 
-rapids-mamba-retry mambabuild \
-  --no-test \
-  --channel "${CPP_CHANNEL}" \
-  --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
-  conda/recipes/strings_udf
 
 rapids-upload-conda-to-s3 python

ci/release/update-version.sh

@@ -40,8 +40,6 @@ sed_runner 's/'"VERSION ${CURRENT_SHORT_TAG}.*"'/'"VERSION ${NEXT_FULL_TAG}"'/g'
 # Python update
 sed_runner 's/'"cudf_version .*)"'/'"cudf_version ${NEXT_FULL_TAG})"'/g' python/cudf/CMakeLists.txt
 
-# Strings UDF update
-sed_runner 's/'"strings_udf_version .*)"'/'"strings_udf_version ${NEXT_FULL_TAG})"'/g' python/strings_udf/CMakeLists.txt
 
 # cpp libcudf_kafka update
 sed_runner 's/'"VERSION ${CURRENT_SHORT_TAG}.*"'/'"VERSION ${NEXT_FULL_TAG}"'/g' cpp/libcudf_kafka/CMakeLists.txt

ci/test_python_other.sh

@@ -44,41 +44,5 @@ pytest \
   custreamz
 popd
 
-set -e
-rapids-mamba-retry install \
-  --channel "${CPP_CHANNEL}" \
-  --channel "${PYTHON_CHANNEL}" \
-  strings_udf
-set +e
-
-rapids-logger "pytest strings_udf"
-pushd python/strings_udf/strings_udf
-pytest \
-  --cache-clear \
-  --junitxml="${RAPIDS_TESTS_DIR}/junit-strings-udf.xml" \
-  --numprocesses=8 \
-  --dist=loadscope \
-  --cov-config=.coveragerc \
-  --cov=strings_udf \
-  --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/strings-udf-coverage.xml" \
-  --cov-report=term \
-  tests
-popd
-
-rapids-logger "pytest cudf with strings_udf"
-pushd python/cudf/cudf
-pytest \
-  --cache-clear \
-  --ignore="benchmarks" \
-  --junitxml="${RAPIDS_TESTS_DIR}/junit-cudf-strings-udf.xml" \
-  --numprocesses=8 \
-  --dist=loadscope \
-  --cov-config=../.coveragerc \
-  --cov=cudf \
-  --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cudf-strings-udf-coverage.xml" \
-  --cov-report=term \
-  tests/test_udf_masked_ops.py
-popd
-
 rapids-logger "Test script exiting with value: $EXITCODE"
 exit ${EXITCODE}

conda/recipes/cudf/meta.yaml

@@ -72,6 +72,7 @@ requirements:
     - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
     - nvtx >=0.2.1
     - packaging
+    - ptxcompiler >=0.7.0
     - cachetools
     - cubinlinker  # CUDA enhanced compatibility.
     - cuda-python >=11.7.1,<12.0

cpp/include/cudf/io/parquet.hpp

@@ -494,7 +494,7 @@ class parquet_writer_options {
   // Maximum size of column chunk dictionary (in bytes)
   size_t _max_dictionary_size = default_max_dictionary_size;
   // Maximum number of rows in a page fragment
-  size_type _max_page_fragment_size = default_max_page_fragment_size;
+  std::optional<size_type> _max_page_fragment_size;
 
   /**
    * @brief Constructor from sink and table.
@@ -1076,7 +1076,7 @@ class chunked_parquet_writer_options {
   // Maximum size of column chunk dictionary (in bytes)
   size_t _max_dictionary_size = default_max_dictionary_size;
   // Maximum number of rows in a page fragment
-  size_type _max_page_fragment_size = default_max_page_fragment_size;
+  std::optional<size_type> _max_page_fragment_size;
 
   /**
    * @brief Constructor from sink.

cpp/src/groupby/sort/group_std.cu

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022, NVIDIA CORPORATION.
+ * Copyright (c) 2019-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.
@@ -99,9 +99,6 @@ struct var_functor {
     rmm::cuda_stream_view stream,
     rmm::mr::device_memory_resource* mr)
   {
-// Running this in debug build causes a runtime error:
-// `reduce_by_key failed on 2nd step: invalid device function`
-#if !defined(__CUDACC_DEBUG__)
     using ResultType = cudf::detail::target_type_t<T, aggregation::Kind::VARIANCE>;
 
     std::unique_ptr<column> result = make_numeric_column(data_type(type_to_id<ResultType>()),
@@ -141,9 +138,6 @@ struct var_functor {
                        });
 
     return result;
-#else
-    CUDF_FAIL("Groupby std/var supported in debug build");
-#endif
   }
 
   template <typename T, typename... Args>