Merge branch 'branch-23.04' into fix-stringudf-chained-ops

rapidsai · Mar 9, 2023 · e6ae995 · e6ae995
2 parents c9ff968 + ea62e0e
commit e6ae995
Show file tree

Hide file tree

Showing 78 changed files with 3,296 additions and 1,032 deletions.
diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh
@@ -34,7 +34,7 @@ pushd notebooks
 
 # Add notebooks that should be skipped here
 # (space-separated list of filenames without paths)
-SKIPNBS=""
+SKIPNBS="performance_comparisons.ipynb"
 
 EXITCODE=0
 trap "EXITCODE=1" ERR

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -28,7 +28,7 @@ dependencies:
 - doxygen=1.8.20
 - fastavro>=0.22.9
 - fsspec>=0.6.0
-- gcc_linux-64=9.*
+- gcc_linux-64=11.*
 - hypothesis
 - ipython
 - libarrow=10
@@ -50,7 +50,7 @@ dependencies:
 - pandoc<=2.0.0
 - pip
 - pre-commit
-- protobuf=4.21
+- protobuf>=4.21.6,<4.22
 - ptxcompiler
 - pyarrow=10
 - pydata-sphinx-theme

diff --git a/conda/recipes/cudf/conda_build_config.yaml b/conda/recipes/cudf/conda_build_config.yaml
@@ -1,8 +1,8 @@
 c_compiler_version:
-  - 9
+  - 11
 
 cxx_compiler_version:
-  - 9
+  - 11
 
 sysroot_version:
   - "2.17"

diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml
@@ -18,18 +18,20 @@ build:
   number: {{ GIT_DESCRIBE_NUMBER }}
   string: cuda_{{ cuda_major }}_py{{ py_version }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
   script_env:
-    - PARALLEL_LEVEL
-    - CMAKE_GENERATOR
+    - AWS_ACCESS_KEY_ID
+    - AWS_SECRET_ACCESS_KEY
+    - AWS_SESSION_TOKEN
     - CMAKE_C_COMPILER_LAUNCHER
-    - CMAKE_CXX_COMPILER_LAUNCHER
     - CMAKE_CUDA_COMPILER_LAUNCHER
-    - SCCACHE_S3_KEY_PREFIX=cudf-aarch64 # [aarch64]
-    - SCCACHE_S3_KEY_PREFIX=cudf-linux64 # [linux64]
+    - CMAKE_CXX_COMPILER_LAUNCHER
+    - CMAKE_GENERATOR
+    - PARALLEL_LEVEL
     - SCCACHE_BUCKET
-    - SCCACHE_REGION
     - SCCACHE_IDLE_TIMEOUT
-    - AWS_ACCESS_KEY_ID
-    - AWS_SECRET_ACCESS_KEY
+    - SCCACHE_REGION
+    - SCCACHE_S3_KEY_PREFIX=cudf-aarch64 # [aarch64]
+    - SCCACHE_S3_KEY_PREFIX=cudf-linux64 # [linux64]
+    - SCCACHE_S3_USE_SSL
   ignore_run_exports:
     # libcudf's run_exports pinning is looser than we would like
     - libcudf
@@ -45,7 +47,7 @@ requirements:
     - ninja
     - sysroot_{{ target_platform }} {{ sysroot_version }}
   host:
-    - protobuf =4.21
+    - protobuf >=4.21.6,<4.22
     - python
     - cython >=0.29,<0.30
     - scikit-build >=0.13.1
@@ -57,7 +59,7 @@ requirements:
     - rmm ={{ minor_version }}
     - cudatoolkit ={{ cuda_version }}
   run:
-    - protobuf =4.21
+    - protobuf >=4.21.6,<4.22
     - python
     - typing_extensions
     - pandas >=1.0,<1.6.0dev0

diff --git a/conda/recipes/cudf_kafka/conda_build_config.yaml b/conda/recipes/cudf_kafka/conda_build_config.yaml
@@ -1,8 +1,8 @@
 c_compiler_version:
-  - 9
+  - 11
 
 cxx_compiler_version:
-  - 9
+  - 11
 
 sysroot_version:
   - "2.17"
diff --git a/conda/recipes/cudf_kafka/meta.yaml b/conda/recipes/cudf_kafka/meta.yaml
@@ -17,18 +17,20 @@ build:
   number: {{ GIT_DESCRIBE_NUMBER }}
   string: py{{ py_version }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
   script_env:
-    - PARALLEL_LEVEL
-    - CMAKE_GENERATOR
+    - AWS_ACCESS_KEY_ID
+    - AWS_SECRET_ACCESS_KEY
+    - AWS_SESSION_TOKEN
     - CMAKE_C_COMPILER_LAUNCHER
-    - CMAKE_CXX_COMPILER_LAUNCHER
     - CMAKE_CUDA_COMPILER_LAUNCHER
-    - SCCACHE_S3_KEY_PREFIX=cudf-kafka-aarch64 # [aarch64]
-    - SCCACHE_S3_KEY_PREFIX=cudf-kafka-linux64 # [linux64]
+    - CMAKE_CXX_COMPILER_LAUNCHER
+    - CMAKE_GENERATOR
+    - PARALLEL_LEVEL
     - SCCACHE_BUCKET
-    - SCCACHE_REGION
     - SCCACHE_IDLE_TIMEOUT
-    - AWS_ACCESS_KEY_ID
-    - AWS_SECRET_ACCESS_KEY
+    - SCCACHE_REGION
+    - SCCACHE_S3_KEY_PREFIX=cudf-kafka-aarch64 # [aarch64]
+    - SCCACHE_S3_KEY_PREFIX=cudf-kafka-linux64 # [linux64]
+    - SCCACHE_S3_USE_SSL
 
 requirements:
   build:

diff --git a/conda/recipes/custreamz/meta.yaml b/conda/recipes/custreamz/meta.yaml
@@ -17,18 +17,20 @@ build:
   number: {{ GIT_DESCRIBE_NUMBER }}
   string: py{{ py_version }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
   script_env:
-    - PARALLEL_LEVEL
-    - CMAKE_GENERATOR
+    - AWS_ACCESS_KEY_ID
+    - AWS_SECRET_ACCESS_KEY
+    - AWS_SESSION_TOKEN
     - CMAKE_C_COMPILER_LAUNCHER
-    - CMAKE_CXX_COMPILER_LAUNCHER
     - CMAKE_CUDA_COMPILER_LAUNCHER
-    - SCCACHE_S3_KEY_PREFIX=custreamz-aarch64 # [aarch64]
-    - SCCACHE_S3_KEY_PREFIX=custreamz-linux64 # [linux64]
+    - CMAKE_CXX_COMPILER_LAUNCHER
+    - CMAKE_GENERATOR
+    - PARALLEL_LEVEL
     - SCCACHE_BUCKET
-    - SCCACHE_REGION
     - SCCACHE_IDLE_TIMEOUT
-    - AWS_ACCESS_KEY_ID
-    - AWS_SECRET_ACCESS_KEY
+    - SCCACHE_REGION
+    - SCCACHE_S3_KEY_PREFIX=custreamz-aarch64 # [aarch64]
+    - SCCACHE_S3_KEY_PREFIX=custreamz-linux64 # [linux64]
+    - SCCACHE_S3_USE_SSL
 
 requirements:
   host:

diff --git a/conda/recipes/dask-cudf/meta.yaml b/conda/recipes/dask-cudf/meta.yaml
@@ -18,18 +18,20 @@ build:
   number: {{ GIT_DESCRIBE_NUMBER }}
   string: cuda_{{ cuda_major }}_py{{ py_version }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
   script_env:
-    - PARALLEL_LEVEL
-    - CMAKE_GENERATOR
+    - AWS_ACCESS_KEY_ID
+    - AWS_SECRET_ACCESS_KEY
+    - AWS_SESSION_TOKEN
     - CMAKE_C_COMPILER_LAUNCHER
-    - CMAKE_CXX_COMPILER_LAUNCHER
     - CMAKE_CUDA_COMPILER_LAUNCHER
-    - SCCACHE_S3_KEY_PREFIX=dask-cudf-aarch64 # [aarch64]
-    - SCCACHE_S3_KEY_PREFIX=dask-cudf-linux64 # [linux64]
+    - CMAKE_CXX_COMPILER_LAUNCHER
+    - CMAKE_GENERATOR
+    - PARALLEL_LEVEL
     - SCCACHE_BUCKET
-    - SCCACHE_REGION
     - SCCACHE_IDLE_TIMEOUT
-    - AWS_ACCESS_KEY_ID
-    - AWS_SECRET_ACCESS_KEY
+    - SCCACHE_REGION
+    - SCCACHE_S3_KEY_PREFIX=dask-cudf-aarch64 # [aarch64]
+    - SCCACHE_S3_KEY_PREFIX=dask-cudf-linux64 # [linux64]
+    - SCCACHE_S3_USE_SSL
 
 requirements:
   host:

diff --git a/conda/recipes/libcudf/conda_build_config.yaml b/conda/recipes/libcudf/conda_build_config.yaml
@@ -1,8 +1,8 @@
 c_compiler_version:
-  - 9
+  - 11
 
 cxx_compiler_version:
-  - 9
+  - 11
 
 cuda_compiler:
   - nvcc

diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml
@@ -15,19 +15,21 @@ source:
 
 build:
   script_env:
-    - PARALLEL_LEVEL
-    - CMAKE_GENERATOR
+    - AWS_ACCESS_KEY_ID
+    - AWS_SECRET_ACCESS_KEY
+    - AWS_SESSION_TOKEN
     - CMAKE_C_COMPILER_LAUNCHER
-    - CMAKE_CXX_COMPILER_LAUNCHER
     - CMAKE_CUDA_COMPILER_LAUNCHER
-    - SCCACHE_S3_KEY_PREFIX=libcudf-aarch64 # [aarch64]
-    - SCCACHE_S3_KEY_PREFIX=libcudf-linux64 # [linux64]
+    - CMAKE_CXX_COMPILER_LAUNCHER
+    - CMAKE_GENERATOR
+    - PARALLEL_LEVEL
+    - RAPIDS_ARTIFACTS_DIR
     - SCCACHE_BUCKET
-    - SCCACHE_REGION
     - SCCACHE_IDLE_TIMEOUT
-    - AWS_ACCESS_KEY_ID
-    - AWS_SECRET_ACCESS_KEY
-    - RAPIDS_ARTIFACTS_DIR
+    - SCCACHE_REGION
+    - SCCACHE_S3_KEY_PREFIX=libcudf-aarch64 # [aarch64]
+    - SCCACHE_S3_KEY_PREFIX=libcudf-linux64 # [linux64]
+    - SCCACHE_S3_USE_SSL
 
 requirements:
   build:

diff --git a/cpp/benchmarks/CMakeLists.txt b/cpp/benchmarks/CMakeLists.txt
@@ -252,7 +252,7 @@ ConfigureNVBench(ORC_WRITER_NVBENCH io/orc/orc_writer.cpp io/orc/orc_writer_chun
 
 # ##################################################################################################
 # * csv writer benchmark --------------------------------------------------------------------------
-ConfigureBench(CSV_WRITER_BENCH io/csv/csv_writer.cpp)
+ConfigureNVBench(CSV_WRITER_NVBENCH io/csv/csv_writer.cpp)
 
 # ##################################################################################################
 # * ast benchmark ---------------------------------------------------------------------------------