From 6a2ef49da2c33ac8b8d670ca708c8f6a8881fbc1 Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Wed, 24 Jan 2024 15:09:11 -0600 Subject: [PATCH 1/2] Revert "Improve native UDF example in README" This reverts commit 014e3f54970cfa7bc2532b29ba8d563166323fda. Signed-off-by: Jason Lowe --- .../UDF-Examples/RAPIDS-accelerated-UDFs/README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/examples/UDF-Examples/RAPIDS-accelerated-UDFs/README.md b/examples/UDF-Examples/RAPIDS-accelerated-UDFs/README.md index 01b2ab607..29caa2d9d 100644 --- a/examples/UDF-Examples/RAPIDS-accelerated-UDFs/README.md +++ b/examples/UDF-Examples/RAPIDS-accelerated-UDFs/README.md @@ -192,10 +192,11 @@ schema = StructType([ StructField("c2", IntegerType()), ]) data = [ - ("a b c d",1), - ("",2), - (None,3), - ("the quick brown fox jumped over the lazy dog",3), + ("s1",1), + ("s2",2), + ("s1",3), + ("s2",3), + ("s1",3), ] df = spark.createDataFrame( SparkContext.getOrCreate().parallelize(data, numSlices=2), @@ -203,6 +204,6 @@ df = spark.createDataFrame( df.createOrReplaceTempView("tab") spark.sql("CREATE TEMPORARY FUNCTION {} AS '{}'".format("wordcount", "com.nvidia.spark.rapids.udf.hive.StringWordCount")) -spark.sql("select c1, wordcount(c1) from tab").show() -spark.sql("select c1, wordcount(c1) from tab").explain() +spark.sql("select wordcount(c1) from tab group by c1").show() +spark.sql("select wordcount(c1) from tab group by c1").explain() ``` From da207a05d1d5211237fb4d8a1c2bfdef19c59555 Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Wed, 24 Jan 2024 15:09:19 -0600 Subject: [PATCH 2/2] Revert "Update RAPIDS accelerated native UDFs example to use static CUDA runtime" This reverts commit 35c5fca7795627f2e7a656909445703bde715dbf. Signed-off-by: Jason Lowe --- .../RAPIDS-accelerated-UDFs/src/main/cpp/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/UDF-Examples/RAPIDS-accelerated-UDFs/src/main/cpp/CMakeLists.txt b/examples/UDF-Examples/RAPIDS-accelerated-UDFs/src/main/cpp/CMakeLists.txt index bf827f490..c5a03390b 100755 --- a/examples/UDF-Examples/RAPIDS-accelerated-UDFs/src/main/cpp/CMakeLists.txt +++ b/examples/UDF-Examples/RAPIDS-accelerated-UDFs/src/main/cpp/CMakeLists.txt @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2021-2024, NVIDIA CORPORATION. +# Copyright (c) 2021-2022, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -81,7 +81,7 @@ set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -w --expt-extended-lambda --expt-relax # - cudf ------------------------------------------------------------------------------------------- # Ensure CUDA runtime is dynamic despite statically linking Arrow in libcudf -set(CUDA_USE_STATIC_CUDA_RUNTIME ON) +set(CUDA_USE_STATIC_CUDA_RUNTIME OFF) rapids_cpm_init() rapids_cpm_find(cudf 23.12.00 @@ -94,7 +94,7 @@ rapids_cpm_find(cudf 23.12.00 "BUILD_BENCHMARKS OFF" "CUDF_USE_ARROW_STATIC ON" "JITIFY_USE_CACHE ON" - "CUDA_STATIC_RUNTIME ${CUDA_USE_STATIC_CUDA_RUNTIME}" + "CUDA_STATIC_RUNTIME OFF" "DISABLE_DEPRECATION_WARNING ON" "AUTO_DETECT_CUDA_ARCHITECTURES OFF" )