From 04cf2961ceca7e4b0b45307710a73e6dc9d0864e Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 14 Dec 2023 09:17:43 -0600 Subject: [PATCH 1/3] Drop Pascal GPU support. --- CONTRIBUTING.md | 2 +- README.md | 2 +- python/cudf/cudf/utils/gpu_utils.py | 23 ++++++++++++----------- python/custreamz/README.md | 6 +++--- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c3006ebd93e..e7f7a20e307 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -79,7 +79,7 @@ CUDA/GPU: * CUDA 11.5+ * NVIDIA driver 450.80.02+ -* Pascal architecture or better +* Volta architecture or better (Compute Capability >=7.0) You can obtain CUDA from [https://developer.nvidia.com/cuda-downloads](https://developer.nvidia.com/cuda-downloads). diff --git a/README.md b/README.md index 2a2fa84f33a..996e5ff4800 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ print(tips_df.groupby("size").tip_percentage.mean()) * CUDA 11.2+ * NVIDIA driver 450.80.02+ -* Pascal architecture or better (Compute Capability >=6.0) +* Volta architecture or better (Compute Capability >=7.0) ### Conda diff --git a/python/cudf/cudf/utils/gpu_utils.py b/python/cudf/cudf/utils/gpu_utils.py index ab3adc1651a..daaad32391c 100644 --- a/python/cudf/cudf/utils/gpu_utils.py +++ b/python/cudf/cudf/utils/gpu_utils.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020-2022, NVIDIA CORPORATION. +# Copyright (c) 2020-2023, NVIDIA CORPORATION. def validate_setup(): @@ -70,23 +70,24 @@ def validate_setup(): cudaDeviceAttr.cudaDevAttrComputeCapabilityMajor, 0 ) - if major_version < 6: - # A GPU with NVIDIA Pascal™ architecture or newer is required. + if major_version < 7: + # A GPU with NVIDIA Volta™ architecture or newer is required. # Reference: https://developer.nvidia.com/cuda-gpus - # Hardware Generation Compute Capability - # Ampere 8.x - # Turing 7.5 - # Volta 7.0, 7.2 - # Pascal 6.x + # Hardware Generation Compute Capability + # Hopper 9.x + # Ampere 8.x + # Turing 7.5 + # Volta 7.0, 7.2 + # Pascal 6.x # Maxwell 5.x - # Kepler 3.x - # Fermi 2.x + # Kepler 3.x + # Fermi 2.x device_name = deviceGetName(0) minor_version = getDeviceAttribute( cudaDeviceAttr.cudaDevAttrComputeCapabilityMinor, 0 ) warnings.warn( - "A GPU with NVIDIA Pascal™ (Compute Capability 6.0) " + "A GPU with NVIDIA Volta™ (Compute Capability 7.0) " "or newer architecture is required.\n" f"Detected GPU 0: {device_name}\n" f"Detected Compute Capability: {major_version}.{minor_version}" diff --git a/python/custreamz/README.md b/python/custreamz/README.md index 88657ec0d50..1509dac9e61 100644 --- a/python/custreamz/README.md +++ b/python/custreamz/README.md @@ -14,8 +14,8 @@ from custreamz import kafka # Full list of configurations can be found at: https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md kafka_configs = { - "metadata.broker.list": "localhost:9092", - "group.id": "custreamz-client", + "metadata.broker.list": "localhost:9092", + "group.id": "custreamz-client", } # Create a reusable Kafka Consumer client; "datasource" @@ -50,7 +50,7 @@ Please see the [Demo Docker Repository](https://hub.docker.com/r/rapidsai/rapids * CUDA 11.0+ * NVIDIA driver 450.80.02+ -* Pascal architecture or better (Compute Capability >=6.0) +* Volta architecture or better (Compute Capability >=7.0) ### Conda From 63ba7e98eb6bcf529567e90fc3f62c8b78304346 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 14 Dec 2023 13:43:31 -0600 Subject: [PATCH 2/3] Remove workaround for nvcomp 2.4.0 ZSTD on Pascal architectures. --- cpp/src/io/comp/nvcomp_adapter.cpp | 10 ---------- cpp/tests/io/comp/decomp_test.cpp | 2 -- 2 files changed, 12 deletions(-) diff --git a/cpp/src/io/comp/nvcomp_adapter.cpp b/cpp/src/io/comp/nvcomp_adapter.cpp index 1a2c90eb52e..ec71b5a2d94 100644 --- a/cpp/src/io/comp/nvcomp_adapter.cpp +++ b/cpp/src/io/comp/nvcomp_adapter.cpp @@ -48,11 +48,6 @@ #define NVCOMP_ZSTD_DECOMP_IS_STABLE(MAJOR, MINOR, PATCH) \ (MAJOR > 2 or (MAJOR == 2 and MINOR > 3) or (MAJOR == 2 and MINOR == 3 and PATCH >= 2)) -// Issue https://github.com/NVIDIA/spark-rapids/issues/6614 impacts nvCOMP 2.4.0 ZSTD decompression -// on compute 6.x -#define NVCOMP_ZSTD_IS_DISABLED_ON_PASCAL(MAJOR, MINOR, PATCH) \ - (MAJOR == 2 and MINOR == 4 and PATCH == 0) - namespace cudf::io::nvcomp { // Dispatcher for nvcompBatchedDecompressGetTempSizeEx @@ -551,11 +546,6 @@ std::optional is_zstd_decomp_disabled(feature_status_parameters con "`LIBCUDF_NVCOMP_POLICY` environment variable."; } - if (NVCOMP_ZSTD_IS_DISABLED_ON_PASCAL( - params.lib_major_version, params.lib_minor_version, params.lib_patch_version) and - params.compute_capability_major == 6) { - return "Zstandard decompression is disabled on Pascal GPUs"; - } return std::nullopt; } diff --git a/cpp/tests/io/comp/decomp_test.cpp b/cpp/tests/io/comp/decomp_test.cpp index 35176c70d84..c3394ba238c 100644 --- a/cpp/tests/io/comp/decomp_test.cpp +++ b/cpp/tests/io/comp/decomp_test.cpp @@ -213,8 +213,6 @@ TEST_F(NvcompConfigTest, Decompression) EXPECT_TRUE(decomp_disabled(compression_type::ZSTD, {2, 2, 0, true, true, 7})); // stable integrations enabled required EXPECT_TRUE(decomp_disabled(compression_type::ZSTD, {2, 4, 0, false, false, 7})); - // 2.4.0 disabled on Pascal - EXPECT_TRUE(decomp_disabled(compression_type::ZSTD, {2, 4, 0, true, true, 6})); EXPECT_FALSE(decomp_disabled(compression_type::SNAPPY, {2, 4, 0, true, true, 7})); EXPECT_FALSE(decomp_disabled(compression_type::SNAPPY, {2, 3, 0, false, true, 7})); From c4d1c5b9fd79900e9bd4c37ee2bfee6bcb80ff46 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 2 Jan 2024 14:03:33 -0600 Subject: [PATCH 3/3] Update copyrights. --- cpp/src/io/comp/nvcomp_adapter.cpp | 2 +- cpp/tests/io/comp/decomp_test.cpp | 2 +- python/cudf/cudf/utils/gpu_utils.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp/src/io/comp/nvcomp_adapter.cpp b/cpp/src/io/comp/nvcomp_adapter.cpp index ec71b5a2d94..40ed7677603 100644 --- a/cpp/src/io/comp/nvcomp_adapter.cpp +++ b/cpp/src/io/comp/nvcomp_adapter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023, NVIDIA CORPORATION. + * Copyright (c) 2022-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/cpp/tests/io/comp/decomp_test.cpp b/cpp/tests/io/comp/decomp_test.cpp index c3394ba238c..7bff730afe6 100644 --- a/cpp/tests/io/comp/decomp_test.cpp +++ b/cpp/tests/io/comp/decomp_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2023, NVIDIA CORPORATION. + * Copyright (c) 2019-2024, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/python/cudf/cudf/utils/gpu_utils.py b/python/cudf/cudf/utils/gpu_utils.py index daaad32391c..10a2f700cbd 100644 --- a/python/cudf/cudf/utils/gpu_utils.py +++ b/python/cudf/cudf/utils/gpu_utils.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020-2023, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. def validate_setup():