From d6ea821d6fdff40406c1df24445bfe7ed51f07ac Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Thu, 5 Sep 2024 16:15:49 +0200 Subject: [PATCH] [HETEROGENEOUS] Changes suggested by new llvm18 clang-format --- .../plugins/alpaka/AlpakaBackendProducer.cc | 2 +- .../AlpakaInterface/interface/CachedBufAlloc.h | 15 +++++++++------ .../test/alpaka/testPrefixScan.dev.cc | 2 +- .../CUDACore/interface/ScopedContext.h | 2 +- .../CUDAUtilities/interface/device_unique_ptr.h | 2 +- .../interface/host_noncached_unique_ptr.h | 4 ++-- .../CUDAUtilities/interface/host_unique_ptr.h | 2 +- .../SonicTriton/interface/TritonDummyCache.h | 2 +- 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/HeterogeneousCore/AlpakaCore/plugins/alpaka/AlpakaBackendProducer.cc b/HeterogeneousCore/AlpakaCore/plugins/alpaka/AlpakaBackendProducer.cc index a09fa075fe245..b4b0454c3dd1c 100644 --- a/HeterogeneousCore/AlpakaCore/plugins/alpaka/AlpakaBackendProducer.cc +++ b/HeterogeneousCore/AlpakaCore/plugins/alpaka/AlpakaBackendProducer.cc @@ -12,7 +12,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { class AlpakaBackendProducer : public global::EDProducer<> { public: - AlpakaBackendProducer(edm::ParameterSet const& config){}; + AlpakaBackendProducer(edm::ParameterSet const& config) {} void produce(edm::StreamID sid, device::Event& event, device::EventSetup const&) const override {} diff --git a/HeterogeneousCore/AlpakaInterface/interface/CachedBufAlloc.h b/HeterogeneousCore/AlpakaInterface/interface/CachedBufAlloc.h index 36aa8ec079bdf..64b518e02c2d1 100644 --- a/HeterogeneousCore/AlpakaInterface/interface/CachedBufAlloc.h +++ b/HeterogeneousCore/AlpakaInterface/interface/CachedBufAlloc.h @@ -26,8 +26,9 @@ namespace cms::alpakatools { template struct CachedBufAlloc { template - ALPAKA_FN_HOST static auto allocCachedBuf(alpaka::DevCpu const& dev, TQueue queue, TExtent const& extent) - -> alpaka::BufCpu { + ALPAKA_FN_HOST static auto allocCachedBuf(alpaka::DevCpu const& dev, + TQueue queue, + TExtent const& extent) -> alpaka::BufCpu { // non-cached, queue-ordered asynchronous host-only memory return alpaka::allocAsyncBuf(queue, extent); } @@ -85,8 +86,9 @@ namespace cms::alpakatools { template struct CachedBufAlloc { template - ALPAKA_FN_HOST static auto allocCachedBuf(alpaka::DevCudaRt const& dev, TQueue queue, TExtent const& extent) - -> alpaka::BufCudaRt { + ALPAKA_FN_HOST static auto allocCachedBuf(alpaka::DevCudaRt const& dev, + TQueue queue, + TExtent const& extent) -> alpaka::BufCudaRt { ALPAKA_DEBUG_MINIMAL_LOG_SCOPE; auto& allocator = getDeviceCachingAllocator(dev); @@ -161,8 +163,9 @@ namespace cms::alpakatools { template struct CachedBufAlloc { template - ALPAKA_FN_HOST static auto allocCachedBuf(alpaka::DevHipRt const& dev, TQueue queue, TExtent const& extent) - -> alpaka::BufHipRt { + ALPAKA_FN_HOST static auto allocCachedBuf(alpaka::DevHipRt const& dev, + TQueue queue, + TExtent const& extent) -> alpaka::BufHipRt { ALPAKA_DEBUG_MINIMAL_LOG_SCOPE; auto& allocator = getDeviceCachingAllocator(dev); diff --git a/HeterogeneousCore/AlpakaInterface/test/alpaka/testPrefixScan.dev.cc b/HeterogeneousCore/AlpakaInterface/test/alpaka/testPrefixScan.dev.cc index 95e1cf12f294e..75a2f310e4fb4 100644 --- a/HeterogeneousCore/AlpakaInterface/test/alpaka/testPrefixScan.dev.cc +++ b/HeterogeneousCore/AlpakaInterface/test/alpaka/testPrefixScan.dev.cc @@ -215,7 +215,7 @@ int main() { alpaka::enqueue(queue, alpaka::createTaskKernel(workDivMultiBlock, verify(), output1_d.data(), num_items)); alpaka::wait(queue); // input_d and output1_d end of scope - } // ksize + } // ksize } return 0; diff --git a/HeterogeneousCore/CUDACore/interface/ScopedContext.h b/HeterogeneousCore/CUDACore/interface/ScopedContext.h index ec0b8c4a3f897..bba559942a51f 100644 --- a/HeterogeneousCore/CUDACore/interface/ScopedContext.h +++ b/HeterogeneousCore/CUDACore/interface/ScopedContext.h @@ -237,7 +237,7 @@ namespace cms { })}); } } // namespace impl - } // namespace cuda + } // namespace cuda } // namespace cms #endif diff --git a/HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h b/HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h index eb86c05be465c..9dffbb467abb9 100644 --- a/HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h +++ b/HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h @@ -46,7 +46,7 @@ namespace cms { struct bounded_array {}; }; } // namespace impl - } // namespace device + } // namespace device template typename device::impl::make_device_unique_selector::non_array make_device_unique(cudaStream_t stream) { diff --git a/HeterogeneousCore/CUDAUtilities/interface/host_noncached_unique_ptr.h b/HeterogeneousCore/CUDAUtilities/interface/host_noncached_unique_ptr.h index 009f4b859fb7d..4b57713486702 100644 --- a/HeterogeneousCore/CUDAUtilities/interface/host_noncached_unique_ptr.h +++ b/HeterogeneousCore/CUDAUtilities/interface/host_noncached_unique_ptr.h @@ -36,8 +36,8 @@ namespace cms { struct bounded_array {}; }; } // namespace impl - } // namespace noncached - } // namespace host + } // namespace noncached + } // namespace host /** * The difference wrt. make_host_unique is that these diff --git a/HeterogeneousCore/CUDAUtilities/interface/host_unique_ptr.h b/HeterogeneousCore/CUDAUtilities/interface/host_unique_ptr.h index ea89cc7490d85..6cb7eb48cbc31 100644 --- a/HeterogeneousCore/CUDAUtilities/interface/host_unique_ptr.h +++ b/HeterogeneousCore/CUDAUtilities/interface/host_unique_ptr.h @@ -56,7 +56,7 @@ namespace cms { struct bounded_array {}; }; } // namespace impl - } // namespace host + } // namespace host // Allocate pageable host memory template diff --git a/HeterogeneousCore/SonicTriton/interface/TritonDummyCache.h b/HeterogeneousCore/SonicTriton/interface/TritonDummyCache.h index df38d0bae28c9..515afd44959be 100644 --- a/HeterogeneousCore/SonicTriton/interface/TritonDummyCache.h +++ b/HeterogeneousCore/SonicTriton/interface/TritonDummyCache.h @@ -14,7 +14,7 @@ namespace edm { return new T(iPSet); } } // namespace impl - } // namespace stream + } // namespace stream } // namespace edm #endif