Skip to content

Commit a816229

Browse files
committed
device_array_ops.h -> device_array.h
1 parent 9916e9b commit a816229

File tree

5 files changed

+16
-9
lines changed

5 files changed

+16
-9
lines changed

examples/device/ta_dense_um_tensor.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
// clang-format off
2121
#include <tiledarray.h>
2222
#include <TiledArray/device/um_tensor.h>
23+
#include <TiledArray/device/device_array.h>
2324
// clang-format on
2425

2526
#ifdef TILEDARRAY_HAS_CUDA

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ if(TILEDARRAY_HAS_HIP OR TILEDARRAY_HAS_CUDA)
235235
TiledArray/device/btas.h
236236
TiledArray/device/btas_um_tensor.h
237237
TiledArray/device/um_tensor.h
238-
TiledArray/device/device_array_ops.h
238+
TiledArray/device/device_array.h
239239
TiledArray/device/device_task_fn.h
240240
TiledArray/device/kernel/mult_kernel.h
241241
TiledArray/device/kernel/reduce_kernel.h

src/TiledArray/device/btas_um_tensor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
#include <TiledArray/device/blas.h>
3636
#include <TiledArray/device/btas.h>
37-
#include <TiledArray/device/device_array_ops.h>
37+
#include <TiledArray/device/device_array.h>
3838
#include <TiledArray/device/um_storage.h>
3939
#include <TiledArray/external/librett.h>
4040
#include <TiledArray/tile.h>
Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,24 @@
2121
*
2222
*/
2323

24-
#ifndef TILEDARRAY_DEVICE_ARRAY_OPERATIONS_H
25-
#define TILEDARRAY_DEVICE_ARRAY_OPERATIONS_H
24+
#ifndef TILEDARRAY_DEVICE_ARRAY_H
25+
#define TILEDARRAY_DEVICE_ARRAY_H
2626

2727
#include <TiledArray/config.h>
2828

2929
#ifdef TILEDARRAY_HAS_DEVICE
30+
#include <TiledArray/fwd.h>
3031

3132
#include <TiledArray/device/um_storage.h>
3233
#include <TiledArray/external/device.h>
33-
#include <TiledArray/fwd.h>
3434
#include <TiledArray/tile.h>
3535

3636
namespace TiledArray {
3737

38-
/// Array-level to_device operation for DistArrays containing device tensors
38+
/// @brief Array-level to_device operation for DistArrays
39+
/// @tparam UMT Device (UM) Tile type
40+
/// @tparam Policy Policy for DistArray
41+
/// @param um_array input array
3942
template <typename UMT, typename Policy>
4043
void to_device(TiledArray::DistArray<TiledArray::Tile<UMT>, Policy> &um_array) {
4144
auto to_device_fn = [](TiledArray::Tile<UMT> &tile) {
@@ -66,7 +69,10 @@ void to_device(TiledArray::DistArray<TiledArray::Tile<UMT>, Policy> &um_array) {
6669
DeviceSafeCall(device::deviceSynchronize());
6770
}
6871

69-
/// Array-level to_host operation for DistArrays containing device tensors
72+
/// @brief Array-level to_host operation for DistArrays
73+
/// @tparam UMT Device (UM) Tile type
74+
/// @tparam Policy Policy for DistArray
75+
/// @param um_array input array
7076
template <typename UMT, typename Policy>
7177
void to_host(TiledArray::DistArray<TiledArray::Tile<UMT>, Policy> &um_array) {
7278
auto to_host_fn = [](TiledArray::Tile<UMT> &tile) {
@@ -101,4 +107,4 @@ void to_host(TiledArray::DistArray<TiledArray::Tile<UMT>, Policy> &um_array) {
101107

102108
#endif // TILEDARRAY_HAS_DEVICE
103109

104-
#endif // TILEDARRAY_DEVICE_ARRAY_OPERATIONS_H
110+
#endif // TILEDARRAY_DEVICE_ARRAY_H

src/TiledArray/device/um_tensor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <TiledArray/fwd.h>
3232

3333
#include <TiledArray/device/blas.h>
34-
#include <TiledArray/device/device_array_ops.h>
34+
#include <TiledArray/device/device_array.h>
3535
#include <TiledArray/device/kernel/mult_kernel.h>
3636
#include <TiledArray/device/kernel/reduce_kernel.h>
3737
#include <TiledArray/device/um_storage.h>

0 commit comments

Comments
 (0)