[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:
muh-bot
@@ -1,181 +0,0 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// Part of CUDASTF 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) 2026 NVIDIA CORPORATION & AFFILIATES.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
/**
|
||||
* @file
|
||||
* @brief Tests for the standalone stream pool functionality in exec_place.
|
||||
*
|
||||
* Verifies that exec_place::pick_stream(resources) works without a CUDASTF
|
||||
* context, returning valid CUDA streams from the per-place stream pool
|
||||
* lazily created inside an `exec_place_resources` registry.
|
||||
*/
|
||||
|
||||
#include <cuda/experimental/__places/places.cuh>
|
||||
|
||||
using namespace cuda::experimental::places;
|
||||
|
||||
__global__ void increment_kernel(int* data, int n)
|
||||
{
|
||||
int tid = blockIdx.x * blockDim.x + threadIdx.x;
|
||||
if (tid < n)
|
||||
{
|
||||
data[tid] += 1;
|
||||
}
|
||||
}
|
||||
|
||||
// Streams returned by pick_stream(resources) are owned by the supplied
|
||||
// `exec_place_resources` registry (round-robin, lazily created). Callers
|
||||
// must NOT destroy them; their lifetime ends with the registry.
|
||||
void test_basic_pick_stream()
|
||||
{
|
||||
exec_place_resources resources;
|
||||
exec_place place = exec_place::current_device();
|
||||
|
||||
cudaStream_t stream = place.pick_stream(resources);
|
||||
_CCCL_ASSERT(stream != nullptr, "pick_stream must return a valid stream");
|
||||
|
||||
int current_device;
|
||||
cuda_try(cudaGetDevice(¤t_device));
|
||||
_CCCL_ASSERT(get_device_from_stream(stream) == current_device, "stream must belong to the current device");
|
||||
|
||||
fprintf(stderr, "test_basic_pick_stream: PASSED\n");
|
||||
}
|
||||
|
||||
void test_pick_stream_computation_hint()
|
||||
{
|
||||
exec_place_resources resources;
|
||||
exec_place place = exec_place::current_device();
|
||||
|
||||
cudaStream_t compute_stream = place.pick_stream(resources, true);
|
||||
cudaStream_t transfer_stream = place.pick_stream(resources, false);
|
||||
|
||||
_CCCL_ASSERT(compute_stream != nullptr, "compute stream must be valid");
|
||||
_CCCL_ASSERT(transfer_stream != nullptr, "transfer stream must be valid");
|
||||
|
||||
fprintf(stderr, "test_pick_stream_computation_hint: PASSED\n");
|
||||
}
|
||||
|
||||
void test_pick_stream_specific_device(int ndevs)
|
||||
{
|
||||
if (ndevs < 2)
|
||||
{
|
||||
fprintf(stderr, "test_pick_stream_specific_device: skipped (need >= 2 devices)\n");
|
||||
return;
|
||||
}
|
||||
|
||||
exec_place_resources resources;
|
||||
for (int d = 0; d < ndevs && d < 2; d++)
|
||||
{
|
||||
exec_place dev = exec_place::device(d);
|
||||
cudaStream_t stream = dev.pick_stream(resources);
|
||||
_CCCL_ASSERT(stream != nullptr, "stream must be valid");
|
||||
_CCCL_ASSERT(get_device_from_stream(stream) == d, "stream must belong to the requested device");
|
||||
}
|
||||
|
||||
fprintf(stderr, "test_pick_stream_specific_device: PASSED\n");
|
||||
}
|
||||
|
||||
void test_launch_kernel_on_picked_stream()
|
||||
{
|
||||
exec_place_resources resources;
|
||||
exec_place place = exec_place::current_device();
|
||||
cudaStream_t stream = place.pick_stream(resources);
|
||||
|
||||
constexpr int N = 256;
|
||||
int* d_data;
|
||||
cuda_try(cudaMallocAsync(&d_data, N * sizeof(int), stream));
|
||||
cuda_try(cudaMemsetAsync(d_data, 0, N * sizeof(int), stream));
|
||||
|
||||
increment_kernel<<<1, N, 0, stream>>>(d_data, N);
|
||||
|
||||
int h_data[N];
|
||||
cuda_try(cudaMemcpyAsync(h_data, d_data, N * sizeof(int), cudaMemcpyDeviceToHost, stream));
|
||||
cuda_try(cudaStreamSynchronize(stream));
|
||||
|
||||
for (const auto& v : h_data)
|
||||
{
|
||||
_CCCL_ASSERT(v == 1, "kernel result mismatch");
|
||||
}
|
||||
|
||||
cuda_try(cudaFreeAsync(d_data, stream));
|
||||
cuda_try(cudaStreamSynchronize(stream));
|
||||
|
||||
fprintf(stderr, "test_launch_kernel_on_picked_stream: PASSED\n");
|
||||
}
|
||||
|
||||
void test_round_robin_streams()
|
||||
{
|
||||
exec_place_resources resources;
|
||||
exec_place place = exec_place::current_device();
|
||||
|
||||
cudaStream_t first = place.pick_stream(resources);
|
||||
cudaStream_t second = place.pick_stream(resources);
|
||||
|
||||
_CCCL_ASSERT(first != nullptr, "first stream must be valid");
|
||||
_CCCL_ASSERT(second != nullptr, "second stream must be valid");
|
||||
|
||||
fprintf(stderr, "test_round_robin_streams: PASSED\n");
|
||||
}
|
||||
|
||||
// Two independent registries must hand out independent streams for the same
|
||||
// place: this is the property that lets multiple STF contexts (or multiple
|
||||
// threads with their own `async_resources_handle`) share a device without
|
||||
// touching each other's stream pools.
|
||||
void test_two_handles_isolation()
|
||||
{
|
||||
exec_place_resources r1;
|
||||
exec_place_resources r2;
|
||||
exec_place place = exec_place::current_device();
|
||||
|
||||
cudaStream_t s1 = place.pick_stream(r1);
|
||||
cudaStream_t s2 = place.pick_stream(r2);
|
||||
|
||||
_CCCL_ASSERT(s1 != nullptr && s2 != nullptr, "streams must be valid");
|
||||
_CCCL_ASSERT(s1 != s2, "different registries must own different streams");
|
||||
_CCCL_ASSERT(r1.size() == 1 && r2.size() == 1, "each registry should hold exactly one entry");
|
||||
|
||||
fprintf(stderr, "test_two_handles_isolation: PASSED\n");
|
||||
}
|
||||
|
||||
// A registry destroyed before another is created must release its CUDA
|
||||
// streams; subsequent device-reset followed by a fresh registry must not
|
||||
// observe any stale handles. This is the property that lets pytest sessions
|
||||
// survive `cuda.bindings.driver.cuDevicePrimaryCtxReset` between tests.
|
||||
void test_reset_survives_with_fresh_registry()
|
||||
{
|
||||
{
|
||||
exec_place_resources resources;
|
||||
cudaStream_t stream = exec_place::current_device().pick_stream(resources);
|
||||
cuda_try(cudaStreamSynchronize(stream));
|
||||
}
|
||||
// Old registry destroyed -> its cached streams are gone -> reset is safe.
|
||||
cuda_try(cudaDeviceReset());
|
||||
|
||||
exec_place_resources resources;
|
||||
cudaStream_t stream = exec_place::current_device().pick_stream(resources);
|
||||
_CCCL_ASSERT(stream != nullptr, "fresh registry must produce a valid stream after reset");
|
||||
cuda_try(cudaStreamSynchronize(stream));
|
||||
|
||||
fprintf(stderr, "test_reset_survives_with_fresh_registry: PASSED\n");
|
||||
}
|
||||
|
||||
int main()
|
||||
{
|
||||
int ndevs;
|
||||
cuda_try(cudaGetDeviceCount(&ndevs));
|
||||
|
||||
test_basic_pick_stream();
|
||||
test_pick_stream_computation_hint();
|
||||
test_pick_stream_specific_device(ndevs);
|
||||
test_launch_kernel_on_picked_stream();
|
||||
test_round_robin_streams();
|
||||
test_two_handles_isolation();
|
||||
test_reset_survives_with_fresh_registry();
|
||||
}
|
||||
Reference in New Issue
Block a user