From 04f9b25f94e9300b50c7538f91417578d22ee4d4 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Thu, 29 Feb 2024 09:13:44 +0200 Subject: [PATCH] conanfile.py: bump CCCL to v2.3.0 --- conanfile.py | 6 +++--- third_party/conan-recipes/cub/conandata.yml | 6 +++--- third_party/conan-recipes/cub/conanfile.py | 2 +- third_party/conan-recipes/libcudacxx/conandata.yml | 6 +++--- third_party/conan-recipes/libcudacxx/conanfile.py | 2 +- third_party/conan-recipes/thrust/conandata.yml | 6 +++--- third_party/conan-recipes/thrust/conanfile.py | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/conanfile.py b/conanfile.py index e0fa039b..e592bd74 100644 --- a/conanfile.py +++ b/conanfile.py @@ -128,9 +128,9 @@ def requirements(self): # Used by all modules via cupoch_utility self.requires("eigen/3.4.0-20230718@cupoch", transitive_headers=True, transitive_libs=True) self.requires("spdlog/1.13.0", transitive_headers=True, transitive_libs=True, force=True) - self.requires("thrust/2.2.0@cupoch", transitive_headers=True, transitive_libs=True, force=True) - self.requires("libcudacxx/2.2.0@cupoch", override=True) - self.requires("cub/2.2.0@cupoch", override=True) + self.requires("thrust/2.3.0@cupoch", transitive_headers=True, transitive_libs=True, force=True) + self.requires("libcudacxx/2.3.0@cupoch", override=True) + self.requires("cub/2.3.0@cupoch", override=True) self.requires("stdgpu/cci.20240211@cupoch", transitive_headers=True, transitive_libs=True) self.requires("dlpack/0.8") self.requires("jsoncpp/1.9.5") diff --git a/third_party/conan-recipes/cub/conandata.yml b/third_party/conan-recipes/cub/conandata.yml index 77d49759..866b0a9f 100644 --- a/third_party/conan-recipes/cub/conandata.yml +++ b/third_party/conan-recipes/cub/conandata.yml @@ -1,7 +1,7 @@ sources: - "2.2.0": - url: "https://github.com/NVIDIA/cccl/archive/refs/tags/v2.2.0.tar.gz" - sha256: "e27678a9d583f9994e591367e864425e722050a9ee1d721b2bd736b442b768d4" + "2.3.0": + url: "https://github.com/NVIDIA/cccl/archive/refs/tags/v2.3.0.tar.gz" + sha256: "922c9e72a7d6d91ef6a1421f2545a947529a179d307853be1b1615c02241c271" "1.17.2": url: "https://github.com/NVIDIA/cub/archive/refs/tags/1.17.2.tar.gz" sha256: "1013a595794548c359f22c07e1f8c620b97e3a577f7e8496d9407f74566a3e2a" diff --git a/third_party/conan-recipes/cub/conanfile.py b/third_party/conan-recipes/cub/conanfile.py index dc76302d..ef34bbc2 100644 --- a/third_party/conan-recipes/cub/conanfile.py +++ b/third_party/conan-recipes/cub/conanfile.py @@ -12,7 +12,7 @@ class CubConan(ConanFile): name = "cub" - version = "2.2.0" + version = "2.3.0" description = "Cooperative primitives for CUDA C++" license = "BSD 3-Clause" url = "https://github.com/conan-io/conan-center-index" diff --git a/third_party/conan-recipes/libcudacxx/conandata.yml b/third_party/conan-recipes/libcudacxx/conandata.yml index dc2a97fe..61fa95f5 100644 --- a/third_party/conan-recipes/libcudacxx/conandata.yml +++ b/third_party/conan-recipes/libcudacxx/conandata.yml @@ -1,7 +1,7 @@ sources: - "2.2.0": - url: "https://github.com/NVIDIA/cccl/archive/refs/tags/v2.2.0.tar.gz" - sha256: "e27678a9d583f9994e591367e864425e722050a9ee1d721b2bd736b442b768d4" + "2.3.0": + url: "https://github.com/NVIDIA/cccl/archive/refs/tags/v2.3.0.tar.gz" + sha256: "922c9e72a7d6d91ef6a1421f2545a947529a179d307853be1b1615c02241c271" patches: "2.2.0": - patch_file: "patches/2.2.0-001-adjust-libcudacxx-config.cmake.patch" diff --git a/third_party/conan-recipes/libcudacxx/conanfile.py b/third_party/conan-recipes/libcudacxx/conanfile.py index 31154648..99959d17 100644 --- a/third_party/conan-recipes/libcudacxx/conanfile.py +++ b/third_party/conan-recipes/libcudacxx/conanfile.py @@ -12,7 +12,7 @@ class LibcudacxxConan(ConanFile): name = "libcudacxx" - version = "2.2.0" + version = "2.3.0" description = ("libcu++, the NVIDIA C++ Standard Library, is the C++ Standard Library for your entire system." " It provides a heterogeneous implementation of the C++ Standard Library that can be used in and between CPU and GPU code.") license = "Apache-2.0" diff --git a/third_party/conan-recipes/thrust/conandata.yml b/third_party/conan-recipes/thrust/conandata.yml index fb555e0d..13a100fa 100644 --- a/third_party/conan-recipes/thrust/conandata.yml +++ b/third_party/conan-recipes/thrust/conandata.yml @@ -1,7 +1,7 @@ sources: - "2.2.0": - url: "https://github.com/NVIDIA/cccl/archive/refs/tags/v2.2.0.tar.gz" - sha256: "e27678a9d583f9994e591367e864425e722050a9ee1d721b2bd736b442b768d4" + "2.3.0": + url: "https://github.com/NVIDIA/cccl/archive/refs/tags/v2.3.0.tar.gz" + sha256: "922c9e72a7d6d91ef6a1421f2545a947529a179d307853be1b1615c02241c271" "1.17.2": url: "https://github.com/thrust/thrust/archive/1.17.2.tar.gz" sha256: "d021e37f5aac30fd1b9737865399feb57db8e601ae2fc0af3cd41784435e9523" diff --git a/third_party/conan-recipes/thrust/conanfile.py b/third_party/conan-recipes/thrust/conanfile.py index 08d7ebdf..19ebf643 100644 --- a/third_party/conan-recipes/thrust/conanfile.py +++ b/third_party/conan-recipes/thrust/conanfile.py @@ -10,7 +10,7 @@ class ThrustConan(ConanFile): name = "thrust" - version = "2.2.0" + version = "2.3.0" license = "Apache-2.0" description = ( "Thrust is a parallel algorithms library which resembles "