[CCCL] 瘦身 + 补全: 移除 cudax/python/libcudacxx-tests 冗余文件, 新增 c2h 测试助手 + cmake 构建系统 + 8 个 CUDA thrust examples
变更摘要:
- 删除: cudax/ (783 files, 7.2M) — 实验性组件,竞赛不需要
- 删除: python/ (226 files, 2.0M) — Python 绑定,竞赛不需要
- 删除: libcudacxx/{test,benchmarks,codegen,cmake,share} (4432 files, 31M)
保留: libcudacxx/include/ (1463 headers, cuda::std 编译依赖)
- 新增: c2h/ (27 files) — CUB Catch2 测试辅助头文件,编译 243 个测试必需
- 新增: cmake/ (29 files) — CCCL 原生 CMake 构建系统
- 新增: thrust/examples/cuda/ (7 files) + cpp_integration/ (1 file)
async_reduce, custom_temporary_allocation, explicit_cuda_stream,
global_device_vector, range_view, unwrap_pointer, wrap_pointer, device
结果: cccl_upstream 从 74M→35M (瘦身 53%), 核心内容 100% 保留:
27/27 tuning headers, 78 benchmarks, 243 tests,
60 thrust examples, 18 CUB examples, 全部编译头文件
This commit is contained in:
@@ -1,128 +0,0 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// Part of CUDA Experimental in CUDA C++ Core Libraries,
|
||||
// under the Apache License v2.0 with LLVM Exceptions.
|
||||
// See https://llvm.org/LICENSE.txt for license information.
|
||||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
||||
// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#ifndef __ALGORITHM_COMMON__
|
||||
#define __ALGORITHM_COMMON__
|
||||
|
||||
#include <cuda/algorithm>
|
||||
#include <cuda/memory_pool>
|
||||
#include <cuda/memory_resource>
|
||||
#include <cuda/std/mdspan>
|
||||
|
||||
#include <cuda/experimental/container.cuh>
|
||||
#include <cuda/experimental/memory_resource.cuh>
|
||||
|
||||
#include <testing.cuh>
|
||||
#include <utility.cuh>
|
||||
|
||||
inline constexpr uint8_t fill_byte = 1;
|
||||
inline constexpr uint32_t buffer_size = 42;
|
||||
|
||||
inline int get_expected_value(uint8_t pattern_byte)
|
||||
{
|
||||
int result;
|
||||
memset(&result, pattern_byte, sizeof(int));
|
||||
return result;
|
||||
}
|
||||
|
||||
template <typename Result>
|
||||
void check_result_and_erase(cudax::stream_ref stream, Result&& result, uint8_t pattern_byte = fill_byte)
|
||||
{
|
||||
int expected = get_expected_value(pattern_byte);
|
||||
|
||||
stream.sync();
|
||||
for (int& i : result)
|
||||
{
|
||||
REQUIRE(i == expected);
|
||||
i = 0;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename Layout = cuda::std::layout_right, typename Extents>
|
||||
auto make_buffer_for_mdspan(Extents extents, char value = 0)
|
||||
{
|
||||
cuda::mr::legacy_pinned_memory_resource host_resource;
|
||||
auto mapping = typename Layout::template mapping<decltype(extents)>{extents};
|
||||
|
||||
cudax::uninitialized_buffer<int, cuda::mr::host_accessible> buffer(host_resource, mapping.required_span_size());
|
||||
|
||||
memset(buffer.data(), value, buffer.size_bytes());
|
||||
|
||||
return buffer;
|
||||
}
|
||||
|
||||
inline auto create_fake_strided_mdspan()
|
||||
{
|
||||
cuda::std::dextents<size_t, 3> dynamic_extents{1, 2, 3};
|
||||
cuda::std::array<size_t, 3> strides{12, 4, 1};
|
||||
#if _CCCL_CUDA_COMPILER(NVCC, <, 12, 6)
|
||||
auto map = cuda::std::layout_stride::mapping{dynamic_extents, strides};
|
||||
#else // ^^^ _CCCL_CUDA_COMPILER(NVCC, <, 12, 6) ^^^ / vvv _CCCL_CUDA_COMPILER(NVCC, >=, 12, 6) vvv
|
||||
cuda::std::layout_stride::mapping map{dynamic_extents, strides};
|
||||
#endif // ^^^ _CCCL_CUDA_COMPILER(NVCC, >=, 12, 6) ^^^
|
||||
return cuda::std::mdspan<int, decltype(dynamic_extents), cuda::std::layout_stride>(nullptr, map);
|
||||
};
|
||||
|
||||
namespace cuda::experimental
|
||||
{
|
||||
// Need a type that goes through all launch_transform steps, but is not a contiguous_range
|
||||
template <typename RelocatableValue = cuda::std::span<int>>
|
||||
struct weird_buffer
|
||||
{
|
||||
cuda::mr::legacy_pinned_memory_resource& resource;
|
||||
int* data;
|
||||
std::size_t size;
|
||||
|
||||
weird_buffer(::cuda::mr::legacy_pinned_memory_resource& res, std::size_t s)
|
||||
: resource(res)
|
||||
, data((int*) res.allocate_sync(s * sizeof(int)))
|
||||
, size(s)
|
||||
{
|
||||
memset(data, 0, size);
|
||||
}
|
||||
|
||||
~weird_buffer()
|
||||
{
|
||||
resource.deallocate_sync(data, size);
|
||||
}
|
||||
|
||||
weird_buffer(const weird_buffer&) = delete;
|
||||
weird_buffer(weird_buffer&&) = delete;
|
||||
|
||||
struct transform_result
|
||||
{
|
||||
int* data;
|
||||
std::size_t size;
|
||||
|
||||
RelocatableValue transformed_argument()
|
||||
{
|
||||
return *this;
|
||||
};
|
||||
|
||||
operator cuda::std::span<int>()
|
||||
{
|
||||
return {data, size};
|
||||
}
|
||||
|
||||
template <typename Extents>
|
||||
operator cuda::std::mdspan<int, Extents>()
|
||||
{
|
||||
return cuda::std::mdspan<int, Extents>{data};
|
||||
}
|
||||
};
|
||||
|
||||
[[nodiscard]] friend transform_result transform_launch_argument(cuda::stream_ref, const weird_buffer& self) noexcept
|
||||
{
|
||||
return {self.data, self.size};
|
||||
}
|
||||
};
|
||||
} // namespace cuda::experimental
|
||||
|
||||
#endif // __ALGORITHM_COMMON__
|
||||
@@ -1,187 +0,0 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// Part of CUDA Experimental in CUDA C++ Core Libraries,
|
||||
// under the Apache License v2.0 with LLVM Exceptions.
|
||||
// See https://llvm.org/LICENSE.txt for license information.
|
||||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
||||
// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "common.cuh"
|
||||
|
||||
C2H_TEST("1d Copy", "[data_manipulation]")
|
||||
{
|
||||
cuda::stream _stream{cuda::device_ref{0}};
|
||||
|
||||
SECTION("Device resource")
|
||||
{
|
||||
cuda::device_memory_pool_ref device_resource = cuda::device_default_memory_pool(cuda::device_ref{0});
|
||||
std::vector<int> host_vector(buffer_size);
|
||||
|
||||
{
|
||||
cuda::__uninitialized_async_buffer<int, cuda::mr::device_accessible> buffer(device_resource, _stream, buffer_size);
|
||||
cuda::fill_bytes(_stream, buffer, fill_byte);
|
||||
|
||||
cuda::copy_bytes(_stream, buffer, host_vector);
|
||||
check_result_and_erase(_stream, host_vector);
|
||||
|
||||
cuda::copy_bytes(_stream, std::move(buffer), host_vector);
|
||||
check_result_and_erase(_stream, host_vector);
|
||||
}
|
||||
{
|
||||
cuda::__uninitialized_async_buffer<int, cuda::mr::device_accessible> not_yet_const_buffer(
|
||||
device_resource, _stream, buffer_size);
|
||||
cuda::fill_bytes(_stream, not_yet_const_buffer, fill_byte);
|
||||
|
||||
const auto& const_buffer = not_yet_const_buffer;
|
||||
|
||||
cuda::copy_bytes(_stream, const_buffer, host_vector);
|
||||
check_result_and_erase(_stream, host_vector);
|
||||
|
||||
cuda::copy_bytes(_stream, const_buffer, cuda::std::span(host_vector));
|
||||
check_result_and_erase(_stream, host_vector);
|
||||
}
|
||||
}
|
||||
|
||||
SECTION("Host and managed resource")
|
||||
{
|
||||
cuda::mr::legacy_managed_memory_resource managed_resource;
|
||||
cuda::mr::legacy_pinned_memory_resource host_resource;
|
||||
|
||||
{
|
||||
cudax::uninitialized_buffer<int, cuda::mr::host_accessible> host_buffer(host_resource, buffer_size);
|
||||
cudax::uninitialized_buffer<int, cuda::mr::device_accessible> device_buffer(managed_resource, buffer_size);
|
||||
|
||||
cuda::fill_bytes(_stream, host_buffer, fill_byte);
|
||||
|
||||
cuda::copy_bytes(_stream, host_buffer, device_buffer);
|
||||
check_result_and_erase(_stream, device_buffer);
|
||||
|
||||
cuda::copy_bytes(_stream, cuda::std::span(host_buffer), device_buffer);
|
||||
check_result_and_erase(_stream, device_buffer);
|
||||
}
|
||||
|
||||
{
|
||||
cudax::uninitialized_buffer<int, cuda::mr::host_accessible> not_yet_const_host_buffer(host_resource, buffer_size);
|
||||
cudax::uninitialized_buffer<int, cuda::mr::device_accessible> device_buffer(managed_resource, buffer_size);
|
||||
cuda::fill_bytes(_stream, not_yet_const_host_buffer, fill_byte);
|
||||
|
||||
const auto& const_host_buffer = not_yet_const_host_buffer;
|
||||
|
||||
cuda::copy_bytes(_stream, const_host_buffer, device_buffer);
|
||||
check_result_and_erase(_stream, device_buffer);
|
||||
|
||||
cuda::copy_bytes(_stream, cuda::std::span(const_host_buffer), device_buffer);
|
||||
check_result_and_erase(_stream, device_buffer);
|
||||
}
|
||||
}
|
||||
SECTION("Launch transform")
|
||||
{
|
||||
cuda::mr::legacy_pinned_memory_resource host_resource;
|
||||
cudax::weird_buffer input(host_resource, buffer_size);
|
||||
cudax::weird_buffer output(host_resource, buffer_size);
|
||||
|
||||
memset(input.data, fill_byte, input.size * sizeof(int));
|
||||
|
||||
cuda::copy_bytes(_stream, input, output);
|
||||
check_result_and_erase(_stream, cuda::std::span(output.data, output.size));
|
||||
}
|
||||
|
||||
SECTION("Asymmetric size")
|
||||
{
|
||||
cuda::mr::legacy_pinned_memory_resource host_resource;
|
||||
cudax::uninitialized_buffer<int, cuda::mr::host_accessible> host_buffer(host_resource, 1);
|
||||
cuda::fill_bytes(_stream, host_buffer, fill_byte);
|
||||
|
||||
::std::vector<int> vec(buffer_size, 0xbeef);
|
||||
|
||||
cuda::copy_bytes(_stream, host_buffer, vec);
|
||||
_stream.sync();
|
||||
|
||||
REQUIRE(vec[0] == get_expected_value(fill_byte));
|
||||
REQUIRE(vec[1] == 0xbeef);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename SrcLayout = cuda::std::layout_right,
|
||||
typename DstLayout = SrcLayout,
|
||||
typename SrcExtents,
|
||||
typename DstExtents>
|
||||
void test_mdspan_copy_bytes(
|
||||
cudax::stream_ref stream, SrcExtents src_extents = SrcExtents(), DstExtents dst_extents = DstExtents())
|
||||
{
|
||||
auto src_buffer = make_buffer_for_mdspan<SrcLayout>(src_extents, 1);
|
||||
auto dst_buffer = make_buffer_for_mdspan<DstLayout>(dst_extents, 0);
|
||||
|
||||
cuda::std::mdspan<int, SrcExtents, SrcLayout> src(src_buffer.data(), src_extents);
|
||||
cuda::std::mdspan<int, DstExtents, DstLayout> dst(dst_buffer.data(), dst_extents);
|
||||
|
||||
for (int i = 0; i < static_cast<int>(src.extent(1)); i++)
|
||||
{
|
||||
src(0, i) = i;
|
||||
}
|
||||
|
||||
cuda::copy_bytes(stream, std::move(src), dst);
|
||||
stream.sync();
|
||||
|
||||
for (int i = 0; i < static_cast<int>(dst.extent(1)); i++)
|
||||
{
|
||||
CHECK(dst(0, i) == i);
|
||||
}
|
||||
}
|
||||
|
||||
C2H_TEST("Mdspan copy", "[data_manipulation]")
|
||||
{
|
||||
cuda::stream stream{cuda::device_ref{0}};
|
||||
|
||||
SECTION("Different extents")
|
||||
{
|
||||
auto static_extents = cuda::std::extents<size_t, 3, 4>();
|
||||
test_mdspan_copy_bytes(stream, static_extents, static_extents);
|
||||
test_mdspan_copy_bytes<cuda::std::layout_left>(stream, static_extents, static_extents);
|
||||
|
||||
auto dynamic_extents = cuda::std::dextents<size_t, 2>(3, 4);
|
||||
test_mdspan_copy_bytes(stream, dynamic_extents, dynamic_extents);
|
||||
test_mdspan_copy_bytes(stream, static_extents, dynamic_extents);
|
||||
test_mdspan_copy_bytes<cuda::std::layout_left>(stream, static_extents, dynamic_extents);
|
||||
|
||||
auto mixed_extents = cuda::std::extents<int, cuda::std::dynamic_extent, 4>(3);
|
||||
test_mdspan_copy_bytes(stream, dynamic_extents, mixed_extents);
|
||||
test_mdspan_copy_bytes(stream, mixed_extents, static_extents);
|
||||
test_mdspan_copy_bytes<cuda::std::layout_left>(stream, mixed_extents, static_extents);
|
||||
}
|
||||
|
||||
SECTION("Launch transform")
|
||||
{
|
||||
auto host_resource = cuda::mr::legacy_pinned_memory_resource{};
|
||||
auto mixed_extents =
|
||||
cuda::std::extents<size_t, 1024, cuda::std::dynamic_extent, 2, cuda::std::dynamic_extent>(1024, 2);
|
||||
[[maybe_unused]] auto static_extents = cuda::std::extents<size_t, 1024, 1024, 2, 2>();
|
||||
auto mdspan_buffer = make_buffer_for_mdspan(mixed_extents, 1);
|
||||
cuda::std::mdspan<int, decltype(mixed_extents)> mdspan(mdspan_buffer.data(), mixed_extents);
|
||||
cudax::weird_buffer<cuda::std::mdspan<int, decltype(static_extents)>> buffer{
|
||||
host_resource, mdspan.mapping().required_span_size()};
|
||||
|
||||
cuda::copy_bytes(stream, mdspan, buffer);
|
||||
stream.sync();
|
||||
REQUIRE(!memcmp(mdspan_buffer.data(), buffer.data, mdspan_buffer.size()));
|
||||
}
|
||||
}
|
||||
|
||||
C2H_TEST("Non exhaustive mdspan copy_bytes", "[data_manipulation]")
|
||||
{
|
||||
cuda::stream stream{cuda::device_ref{0}};
|
||||
{
|
||||
auto fake_strided_mdspan = create_fake_strided_mdspan();
|
||||
|
||||
try
|
||||
{
|
||||
cuda::copy_bytes(stream, fake_strided_mdspan, fake_strided_mdspan);
|
||||
}
|
||||
catch (const ::std::invalid_argument& e)
|
||||
{
|
||||
CHECK(e.what() == ::std::string("copy_bytes supports only exhaustive mdspans"));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,93 +0,0 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// Part of CUDA Experimental in CUDA C++ Core Libraries,
|
||||
// under the Apache License v2.0 with LLVM Exceptions.
|
||||
// See https://llvm.org/LICENSE.txt for license information.
|
||||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
||||
// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "common.cuh"
|
||||
|
||||
C2H_TEST("Fill", "[data_manipulation]")
|
||||
{
|
||||
cuda::stream _stream{cuda::device_ref{0}};
|
||||
SECTION("Host resource")
|
||||
{
|
||||
cuda::mr::legacy_pinned_memory_resource host_resource;
|
||||
cudax::uninitialized_buffer<int, cuda::mr::device_accessible> buffer(host_resource, buffer_size);
|
||||
|
||||
cuda::fill_bytes(_stream, buffer, fill_byte);
|
||||
|
||||
check_result_and_erase(_stream, cuda::std::span(buffer));
|
||||
}
|
||||
|
||||
SECTION("Device resource")
|
||||
{
|
||||
cuda::device_memory_pool_ref device_resource = cuda::device_default_memory_pool(cuda::device_ref{0});
|
||||
cudax::uninitialized_buffer<int, cuda::mr::device_accessible> buffer(device_resource, buffer_size);
|
||||
cuda::fill_bytes(_stream, buffer, fill_byte);
|
||||
|
||||
std::vector<int> host_vector(42);
|
||||
REQUIRE_CUDART(cudaMemcpyAsync(
|
||||
host_vector.data(), buffer.data(), buffer.size() * sizeof(int), cudaMemcpyDefault, _stream.get()));
|
||||
|
||||
check_result_and_erase(_stream, host_vector);
|
||||
}
|
||||
SECTION("Launch transform")
|
||||
{
|
||||
cuda::mr::legacy_pinned_memory_resource host_resource;
|
||||
cudax::weird_buffer buffer(host_resource, buffer_size);
|
||||
|
||||
cuda::fill_bytes(_stream, buffer, fill_byte);
|
||||
check_result_and_erase(_stream, cuda::std::span(buffer.data, buffer.size));
|
||||
}
|
||||
}
|
||||
|
||||
C2H_TEST("Mdspan Fill", "[data_manipulation]")
|
||||
{
|
||||
cuda::stream stream{cuda::device_ref{0}};
|
||||
{
|
||||
cuda::std::dextents<size_t, 3> dynamic_extents{1, 2, 3};
|
||||
auto buffer = make_buffer_for_mdspan(dynamic_extents, 0);
|
||||
cuda::std::mdspan<int, decltype(dynamic_extents)> dynamic_mdspan(buffer.data(), dynamic_extents);
|
||||
|
||||
cuda::fill_bytes(stream, dynamic_mdspan, fill_byte);
|
||||
check_result_and_erase(stream, cuda::std::span(buffer.data(), buffer.size()));
|
||||
}
|
||||
{
|
||||
cuda::std::extents<size_t, 2, cuda::std::dynamic_extent, 4> mixed_extents{1};
|
||||
auto buffer = make_buffer_for_mdspan(mixed_extents, 0);
|
||||
cuda::std::mdspan<int, decltype(mixed_extents)> mixed_mdspan(buffer.data(), mixed_extents);
|
||||
|
||||
cuda::fill_bytes(stream, cuda::std::move(mixed_mdspan), fill_byte);
|
||||
check_result_and_erase(stream, cuda::std::span(buffer.data(), buffer.size()));
|
||||
}
|
||||
{
|
||||
cuda::mr::legacy_pinned_memory_resource host_resource;
|
||||
using static_extents = cuda::std::extents<size_t, 2, 3, 4>;
|
||||
auto size = cuda::std::layout_left::mapping<static_extents>().required_span_size();
|
||||
cudax::weird_buffer<cuda::std::mdspan<int, static_extents>> buffer(host_resource, size);
|
||||
|
||||
cuda::fill_bytes(stream, buffer, fill_byte);
|
||||
check_result_and_erase(stream, cuda::std::span(buffer.data, buffer.size));
|
||||
}
|
||||
}
|
||||
|
||||
C2H_TEST("Non exhaustive mdspan fill_bytes", "[data_manipulation]")
|
||||
{
|
||||
cuda::stream stream{cuda::device_ref{0}};
|
||||
{
|
||||
auto fake_strided_mdspan = create_fake_strided_mdspan();
|
||||
|
||||
try
|
||||
{
|
||||
cuda::fill_bytes(stream, fake_strided_mdspan, fill_byte);
|
||||
}
|
||||
catch (const ::std::invalid_argument& e)
|
||||
{
|
||||
CHECK(e.what() == ::std::string("fill_bytes supports only exhaustive mdspans"));
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user