[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,283 +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 Unit tests for exec_place_scope RAII helper
|
||||
*/
|
||||
|
||||
#include <cuda/experimental/__places/places.cuh>
|
||||
|
||||
#include <thread>
|
||||
#include <vector>
|
||||
|
||||
using namespace cuda::experimental::places;
|
||||
|
||||
// Test 1: Basic scope functionality - single device switch
|
||||
void test_basic_scope(int ndevs)
|
||||
{
|
||||
if (ndevs < 2)
|
||||
{
|
||||
fprintf(stderr, "test_basic_scope: skipping (need at least 2 devices).\n");
|
||||
return;
|
||||
}
|
||||
|
||||
// Start on device 0
|
||||
cuda_try(cudaSetDevice(0));
|
||||
|
||||
int dev_before = -1;
|
||||
cuda_try(cudaGetDevice(&dev_before));
|
||||
EXPECT(dev_before == 0);
|
||||
|
||||
// Use scope to switch to device 1
|
||||
{
|
||||
exec_place_scope scope(exec_place::device(1));
|
||||
|
||||
int dev_inside = -1;
|
||||
cuda_try(cudaGetDevice(&dev_inside));
|
||||
EXPECT(dev_inside == 1);
|
||||
}
|
||||
|
||||
// After scope destruction, should be back to device 0
|
||||
int dev_after = -1;
|
||||
cuda_try(cudaGetDevice(&dev_after));
|
||||
EXPECT(dev_after == 0);
|
||||
}
|
||||
|
||||
// Test 2: Nested scopes
|
||||
void test_nested_scopes(int ndevs)
|
||||
{
|
||||
if (ndevs < 3)
|
||||
{
|
||||
fprintf(stderr, "test_nested_scopes: skipping (need at least 3 devices).\n");
|
||||
return;
|
||||
}
|
||||
|
||||
cuda_try(cudaSetDevice(0));
|
||||
|
||||
{
|
||||
exec_place_scope scope1(exec_place::device(1));
|
||||
|
||||
int dev = -1;
|
||||
cuda_try(cudaGetDevice(&dev));
|
||||
EXPECT(dev == 1);
|
||||
|
||||
{
|
||||
exec_place_scope scope2(exec_place::device(2));
|
||||
|
||||
cuda_try(cudaGetDevice(&dev));
|
||||
EXPECT(dev == 2);
|
||||
}
|
||||
|
||||
// After inner scope destruction, should be back to device 1
|
||||
cuda_try(cudaGetDevice(&dev));
|
||||
EXPECT(dev == 1);
|
||||
}
|
||||
|
||||
// After outer scope destruction, should be back to device 0
|
||||
int dev = -1;
|
||||
cuda_try(cudaGetDevice(&dev));
|
||||
EXPECT(dev == 0);
|
||||
}
|
||||
|
||||
// Test 3: Scope with host execution place (should be no-op for device)
|
||||
void test_host_place_scope(int ndevs)
|
||||
{
|
||||
if (ndevs < 1)
|
||||
{
|
||||
fprintf(stderr, "test_host_place_scope: skipping (need at least 1 device).\n");
|
||||
return;
|
||||
}
|
||||
|
||||
cuda_try(cudaSetDevice(0));
|
||||
|
||||
int dev_before = -1;
|
||||
cuda_try(cudaGetDevice(&dev_before));
|
||||
|
||||
{
|
||||
exec_place_scope scope(exec_place::host());
|
||||
|
||||
// Device should remain unchanged when using host place
|
||||
int dev_inside = -1;
|
||||
cuda_try(cudaGetDevice(&dev_inside));
|
||||
EXPECT(dev_inside == dev_before);
|
||||
}
|
||||
|
||||
int dev_after = -1;
|
||||
cuda_try(cudaGetDevice(&dev_after));
|
||||
EXPECT(dev_after == dev_before);
|
||||
}
|
||||
|
||||
// Test 4: Scope with same device (should be efficient no-op)
|
||||
void test_same_device_scope(int ndevs)
|
||||
{
|
||||
if (ndevs < 1)
|
||||
{
|
||||
fprintf(stderr, "test_same_device_scope: skipping (need at least 1 device).\n");
|
||||
return;
|
||||
}
|
||||
|
||||
cuda_try(cudaSetDevice(0));
|
||||
|
||||
{
|
||||
exec_place_scope scope(exec_place::device(0));
|
||||
|
||||
int dev = -1;
|
||||
cuda_try(cudaGetDevice(&dev));
|
||||
EXPECT(dev == 0);
|
||||
}
|
||||
|
||||
int dev = -1;
|
||||
cuda_try(cudaGetDevice(&dev));
|
||||
EXPECT(dev == 0);
|
||||
}
|
||||
|
||||
// Test 5: Stream creation within scope
|
||||
void test_stream_creation_in_scope(int ndevs)
|
||||
{
|
||||
if (ndevs < 2)
|
||||
{
|
||||
fprintf(stderr, "test_stream_creation_in_scope: skipping (need at least 2 devices).\n");
|
||||
return;
|
||||
}
|
||||
|
||||
cuda_try(cudaSetDevice(0));
|
||||
|
||||
cudaStream_t stream;
|
||||
|
||||
{
|
||||
exec_place_scope scope(exec_place::device(1));
|
||||
cuda_try(cudaStreamCreate(&stream));
|
||||
}
|
||||
|
||||
#if _CCCL_CTK_AT_LEAST(12, 8)
|
||||
// Verify stream was created on device 1 (cudaStreamGetDevice requires CUDA 12.8+)
|
||||
int stream_dev = -1;
|
||||
cuda_try(cudaStreamGetDevice(stream, &stream_dev));
|
||||
EXPECT(stream_dev == 1);
|
||||
#endif // _CCCL_CTK_AT_LEAST(12, 8)
|
||||
|
||||
// Clean up (need to be on correct device for some operations)
|
||||
{
|
||||
exec_place_scope scope(exec_place::device(1));
|
||||
cuda_try(cudaStreamDestroy(stream));
|
||||
}
|
||||
}
|
||||
|
||||
// Test 6: Multiple threads with scopes
|
||||
void test_multithreaded_scopes(int ndevs)
|
||||
{
|
||||
if (ndevs < 2)
|
||||
{
|
||||
fprintf(stderr, "test_multithreaded_scopes: skipping (need at least 2 devices).\n");
|
||||
return;
|
||||
}
|
||||
|
||||
const int num_threads = ::std::min(ndevs, 4);
|
||||
::std::vector<bool> results(num_threads, false);
|
||||
|
||||
::std::vector<::std::thread> threads;
|
||||
threads.reserve(num_threads);
|
||||
for (int i = 0; i < num_threads; ++i)
|
||||
{
|
||||
threads.emplace_back([&results, i, ndevs]() {
|
||||
// Each thread starts on device 0
|
||||
cuda_try(cudaSetDevice(0));
|
||||
|
||||
int target_dev = i % ndevs;
|
||||
|
||||
{
|
||||
exec_place_scope scope(exec_place::device(target_dev));
|
||||
|
||||
int dev = -1;
|
||||
cuda_try(cudaGetDevice(&dev));
|
||||
if (dev != target_dev)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Do some work
|
||||
cudaStream_t stream;
|
||||
cuda_try(cudaStreamCreate(&stream));
|
||||
cuda_try(cudaStreamSynchronize(stream));
|
||||
cuda_try(cudaStreamDestroy(stream));
|
||||
}
|
||||
|
||||
// Verify restoration
|
||||
int dev_after = -1;
|
||||
cuda_try(cudaGetDevice(&dev_after));
|
||||
if (dev_after != 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
results[i] = true;
|
||||
});
|
||||
}
|
||||
|
||||
for (auto& th : threads)
|
||||
{
|
||||
th.join();
|
||||
}
|
||||
|
||||
for (int i = 0; i < num_threads; ++i)
|
||||
{
|
||||
EXPECT(results[i]);
|
||||
}
|
||||
}
|
||||
|
||||
// Test 7: Stress test with multiple iterations
|
||||
void test_stress_iterations(int ndevs)
|
||||
{
|
||||
if (ndevs < 2)
|
||||
{
|
||||
fprintf(stderr, "test_stress_iterations: skipping (need at least 2 devices).\n");
|
||||
return;
|
||||
}
|
||||
|
||||
cuda_try(cudaSetDevice(0));
|
||||
|
||||
const int iterations = 100;
|
||||
for (int iter = 0; iter < iterations; ++iter)
|
||||
{
|
||||
int target_dev = iter % ndevs;
|
||||
|
||||
{
|
||||
exec_place_scope scope(exec_place::device(target_dev));
|
||||
|
||||
int dev = -1;
|
||||
cuda_try(cudaGetDevice(&dev));
|
||||
EXPECT(dev == target_dev);
|
||||
}
|
||||
|
||||
int dev_after = -1;
|
||||
cuda_try(cudaGetDevice(&dev_after));
|
||||
EXPECT(dev_after == 0);
|
||||
}
|
||||
}
|
||||
|
||||
int main()
|
||||
{
|
||||
// Initialize CUDA
|
||||
cuda_try(cudaFree(nullptr));
|
||||
|
||||
int ndevs;
|
||||
cuda_try(cudaGetDeviceCount(&ndevs));
|
||||
|
||||
test_basic_scope(ndevs);
|
||||
test_nested_scopes(ndevs);
|
||||
test_host_place_scope(ndevs);
|
||||
test_same_device_scope(ndevs);
|
||||
test_stream_creation_in_scope(ndevs);
|
||||
test_multithreaded_scopes(ndevs);
|
||||
test_stress_iterations(ndevs);
|
||||
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user