Skip to content

Commit 9b486ea

Browse files
MeinersburMeinersbur
committed
Cleanup
1 parent ea7fb0b commit 9b486ea

File tree

13 files changed

+25
-156
lines changed

13 files changed

+25
-156
lines changed

‎flang-rt/lib/CufRuntime/allocatable.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "flang/Runtime/CUDA/allocatable.h"
10-
#include "../assign-impl.h"
11-
#include "../stat.h"
12-
#include "../terminator.h"
10+
#include "flang-rt/descriptor.h"
11+
#include "../flang_rt/assign-impl.h"
12+
#include "../flang_rt/stat.h"
13+
#include "../flang_rt/terminator.h"
1314
#include "flang/Runtime/CUDA/common.h"
1415
#include "flang/Runtime/CUDA/descriptor.h"
1516
#include "flang/Runtime/CUDA/memmove-function.h"

‎flang-rt/lib/CufRuntime/allocator.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "flang/Runtime/CUDA/allocator.h"
10-
#include "../derived.h"
11-
#include "../stat.h"
12-
#include "../terminator.h"
13-
#include "../type-info.h"
14-
#include "flang/Common/Fortran.h"
15-
#include "flang/ISO_Fortran_binding_wrapper.h"
9+
#include "flang-rt/CUDA/allocator.h"
10+
#include "flang-rt/allocator-registry.h"
11+
#include "../flang_rt/derived.h"
12+
#include "../flang_rt/stat.h"
13+
#include "../flang_rt/terminator.h"
14+
#include "../flang_rt/type-info.h"
15+
#include "flang/Common/ISO_Fortran_binding_wrapper.h"
1616
#include "flang/Runtime/CUDA/common.h"
17-
#include "flang/Runtime/allocator-registry.h"
17+
#include "flang/Support/Fortran.h"
1818

1919
#include "cuda_runtime.h"
2020

‎flang-rt/lib/CufRuntime/descriptor.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "flang/Runtime/CUDA/descriptor.h"
10-
#include "../terminator.h"
11-
#include "flang/Runtime/CUDA/allocator.h"
10+
#include "flang-rt/CUDA/allocator.h"
11+
#include "flang-rt/descriptor.h"
12+
#include "../flang_rt/terminator.h"
1213
#include "flang/Runtime/CUDA/common.h"
1314

1415
#include "cuda_runtime.h"

‎flang-rt/lib/CufRuntime/kernel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "flang/Runtime/CUDA/kernel.h"
10-
#include "../terminator.h"
10+
#include "../flang_rt/terminator.h"
1111
#include "flang/Runtime/CUDA/common.h"
1212

1313
#include "cuda_runtime.h"

‎flang-rt/lib/CufRuntime/memory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "flang/Runtime/CUDA/memory.h"
10-
#include "../assign-impl.h"
11-
#include "../terminator.h"
10+
#include "../flang_rt/assign-impl.h"
11+
#include "../flang_rt/terminator.h"
1212
#include "flang/Runtime/CUDA/common.h"
1313
#include "flang/Runtime/CUDA/descriptor.h"
1414
#include "flang/Runtime/CUDA/memmove-function.h"

‎flang-rt/lib/CufRuntime/registration.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "flang/Runtime/CUDA/registration.h"
10-
#include "../terminator.h"
10+
#include "../flang_rt/terminator.h"
1111
#include "flang/Runtime/CUDA/common.h"
1212

1313
#include "cuda_runtime.h"

‎flang-rt/unittests/Runtime/CUDA/Allocatable.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "flang/Runtime/allocatable.h"
10+
#include "flang-rt/CUDA/allocator.h"
11+
#include "flang-rt/allocator-registry.h"
12+
#include "flang-rt/descriptor.h"
1013
#include "gtest/gtest.h"
11-
#include "../../../runtime/terminator.h"
12-
#include "flang/Common/Fortran.h"
13-
#include "flang/Runtime/CUDA/allocator.h"
14+
#include "../../../lib/flang_rt/terminator.h"
1415
#include "flang/Runtime/CUDA/common.h"
1516
#include "flang/Runtime/CUDA/descriptor.h"
16-
#include "flang/Runtime/allocator-registry.h"
17+
#include "flang/Support/Fortran.h"
1718

1819
#include "cuda_runtime.h"
1920

‎flang/include/flang/Common/README.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎flang/include/flang/Runtime/README.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎flang/include/flang/Testing/README.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)