diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7db8d9ab52f..4fab4ddc6bd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -145,7 +145,7 @@ repos: ^CHANGELOG.md$ ) - repo: https://github.com/rapidsai/dependency-file-generator - rev: v1.7.1 + rev: v1.8.0 hooks: - id: rapids-dependency-file-generator args: ["--clean"] 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/cpp/src/io/comp/nvcomp_adapter.cpp b/cpp/src/io/comp/nvcomp_adapter.cpp index 1a2c90eb52e..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. @@ -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..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. @@ -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})); diff --git a/dependencies.yaml b/dependencies.yaml index f5df9ff3aea..91ac8371308 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -215,9 +215,8 @@ dependencies: - output_types: conda matrices: - matrix: - cuda: "12.0" + cuda: "12.*" packages: - - cuda-version=12.0 - cuda-nvcc - matrix: arch: x86_64 @@ -229,6 +228,14 @@ dependencies: cuda: "11.8" packages: - nvcc_linux-aarch64=11.8 + - output_types: conda + matrices: + - matrix: + cuda: "12.0" + packages: + - cuda-version=12.0 + - matrix: # Fallback for CUDA 11 or no matrix + packages: build_cpp: common: - output_types: conda @@ -289,17 +296,12 @@ dependencies: specific: - output_types: [requirements, pyproject] matrices: - - matrix: {cuda: "12.2"} + - matrix: {cuda: "12.*"} packages: &build_python_packages_cu12 - &rmm_cu12 rmm-cu12==24.2.* - - {matrix: {cuda: "12.1"}, packages: *build_python_packages_cu12} - - {matrix: {cuda: "12.0"}, packages: *build_python_packages_cu12} - - matrix: {cuda: "11.8"} + - matrix: {cuda: "11.*"} packages: &build_python_packages_cu11 - &rmm_cu11 rmm-cu11==24.2.* - - {matrix: {cuda: "11.5"}, packages: *build_python_packages_cu11} - - {matrix: {cuda: "11.4"}, packages: *build_python_packages_cu11} - - {matrix: {cuda: "11.2"}, packages: *build_python_packages_cu11} - {matrix: null, packages: null } - output_types: pyproject matrices: @@ -336,18 +338,25 @@ dependencies: - output_types: conda matrices: - matrix: - cuda: "12.0" + cuda: "12.*" packages: - - cuda-version=12.0 - cuda-cudart-dev - cuda-nvrtc-dev - cuda-nvtx-dev - libcurand-dev + - matrix: # Fallback for CUDA 11 or no matrix + packages: + - cudatoolkit + - output_types: conda + matrices: + - matrix: + cuda: "12.0" + packages: + - cuda-version=12.0 - matrix: cuda: "11.8" packages: - cuda-version=11.8 - - cudatoolkit - cuda-nvtx=11.8 - libcurand-dev=10.3.0.86 - libcurand=10.3.0.86 @@ -383,7 +392,7 @@ dependencies: - output_types: conda matrices: - matrix: - cuda: "12.0" + cuda: "12.*" arch: x86_64 packages: - libcufile-dev @@ -500,43 +509,30 @@ dependencies: specific: - output_types: [conda, requirements, pyproject] matrices: - - matrix: {cuda: "12.2"} - packages: &run_cudf_packages_all_cu12 + - matrix: {cuda: "12.*"} + packages: - cuda-python>=12.0,<13.0a0 - - {matrix: {cuda: "12.1"}, packages: *run_cudf_packages_all_cu12} - - {matrix: {cuda: "12.0"}, packages: *run_cudf_packages_all_cu12} - - matrix: {cuda: "11.8"} + - matrix: {cuda: "11.*"} packages: &run_cudf_packages_all_cu11 - cuda-python>=11.7.1,<12.0a0 - - {matrix: {cuda: "11.5"}, packages: *run_cudf_packages_all_cu11} - - {matrix: {cuda: "11.4"}, packages: *run_cudf_packages_all_cu11} - - {matrix: {cuda: "11.2"}, packages: *run_cudf_packages_all_cu11} - {matrix: null, packages: *run_cudf_packages_all_cu11} - output_types: conda matrices: - - matrix: {cuda: "11.8"} - packages: &run_cudf_packages_conda_cu11 + - matrix: {cuda: "11.*"} + packages: - cubinlinker - ptxcompiler - - {matrix: {cuda: "11.5"}, packages: *run_cudf_packages_conda_cu11} - - {matrix: {cuda: "11.4"}, packages: *run_cudf_packages_conda_cu11} - - {matrix: {cuda: "11.2"}, packages: *run_cudf_packages_conda_cu11} - {matrix: null, packages: null} - output_types: [requirements, pyproject] matrices: - - matrix: {cuda: "12.2"} - packages: &run_cudf_packages_pip_cu12 + - matrix: {cuda: "12.*"} + packages: - rmm-cu12==24.2.* - - {matrix: {cuda: "12.1"}, packages: *run_cudf_packages_pip_cu12} - - {matrix: {cuda: "12.0"}, packages: *run_cudf_packages_pip_cu12} - - matrix: {cuda: "11.8"} - packages: &run_cudf_packages_pip_cu11 + - matrix: {cuda: "11.*"} + packages: - rmm-cu11==24.2.* - cubinlinker-cu11 - ptxcompiler-cu11 - - {matrix: {cuda: "11.5"}, packages: *run_cudf_packages_pip_cu11} - - {matrix: {cuda: "11.4"}, packages: *run_cudf_packages_pip_cu11} - - {matrix: {cuda: "11.2"}, packages: *run_cudf_packages_pip_cu11} - {matrix: null, packages: null} - output_types: pyproject matrices: @@ -566,13 +562,20 @@ dependencies: - *gtest - *gmock specific: + - output_types: conda + matrices: + - matrix: + cuda: "12.*" + packages: + - cuda-sanitizer-api + - matrix: # Fallback for CUDA 11 or no matrix + packages: - output_types: conda matrices: - matrix: cuda: "12.0" packages: - cuda-version=12.0 - - cuda-sanitizer-api - matrix: cuda: "11.8" packages: @@ -654,17 +657,12 @@ dependencies: specific: - output_types: [requirements, pyproject] matrices: - - matrix: {cuda: "12.2"} - packages: &cudf_packages_pip_cu12 + - matrix: {cuda: "12.*"} + packages: - cudf-cu12==24.2.* - - {matrix: {cuda: "12.1"}, packages: *cudf_packages_pip_cu12} - - {matrix: {cuda: "12.0"}, packages: *cudf_packages_pip_cu12} - - matrix: {cuda: "11.8"} - packages: &cudf_packages_pip_cu11 + - matrix: {cuda: "11.*"} + packages: - cudf-cu11==24.2.* - - {matrix: {cuda: "11.5"}, packages: *cudf_packages_pip_cu11} - - {matrix: {cuda: "11.4"}, packages: *cudf_packages_pip_cu11} - - {matrix: {cuda: "11.2"}, packages: *cudf_packages_pip_cu11} - {matrix: null, packages: [*cudf_conda]} depends_on_cudf_kafka: common: @@ -680,17 +678,12 @@ dependencies: specific: - output_types: [requirements, pyproject] matrices: - - matrix: {cuda: "12.2"} - packages: &cudf_kafka_packages_pip_cu12 + - matrix: {cuda: "12.*"} + packages: - cudf_kafka-cu12==24.2.* - - {matrix: {cuda: "12.1"}, packages: *cudf_kafka_packages_pip_cu12} - - {matrix: {cuda: "12.0"}, packages: *cudf_kafka_packages_pip_cu12} - - matrix: {cuda: "11.8"} - packages: &cudf_kafka_packages_pip_cu11 + - matrix: {cuda: "11.*"} + packages: - cudf_kafka-cu11==24.2.* - - {matrix: {cuda: "11.5"}, packages: *cudf_kafka_packages_pip_cu11} - - {matrix: {cuda: "11.4"}, packages: *cudf_kafka_packages_pip_cu11} - - {matrix: {cuda: "11.2"}, packages: *cudf_kafka_packages_pip_cu11} - {matrix: null, packages: [*cudf_kafka_conda]} depends_on_cupy: common: @@ -700,19 +693,12 @@ dependencies: specific: - output_types: [requirements, pyproject] matrices: - # All CUDA 12 versions - - matrix: {cuda: "12.2"} - packages: &cupy_packages_cu12 + - matrix: {cuda: "12.*"} + packages: - cupy-cuda12x>=12.0.0 - - {matrix: {cuda: "12.1"}, packages: *cupy_packages_cu12} - - {matrix: {cuda: "12.0"}, packages: *cupy_packages_cu12} - # All CUDA 11 versions - - matrix: {cuda: "11.8"} + - matrix: {cuda: "11.*"} packages: &cupy_packages_cu11 - cupy-cuda11x>=12.0.0 - - {matrix: {cuda: "11.5"}, packages: *cupy_packages_cu11} - - {matrix: {cuda: "11.4"}, packages: *cupy_packages_cu11} - - {matrix: {cuda: "11.2"}, packages: *cupy_packages_cu11} - {matrix: null, packages: *cupy_packages_cu11} test_python_pandas_cudf: common: diff --git a/python/cudf/cudf/utils/gpu_utils.py b/python/cudf/cudf/utils/gpu_utils.py index ab3adc1651a..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-2022, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, 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