Merged
examples 算子头文件修改 #4377
baixueyanAdd on Jul 15
examples 算子头文件修改 #4377
Merged
Merged fromgcw_1m54gGxh/asc-devkitexamplesintocann/asc-devkit9.1.0
Total: 6 files changed+12-12
| @@ -16,8 +16,8 @@ | |||
| 16 | 16 | ||
| 17 | #include <cstdio> | 17 | #include <cstdio> |
| 18 | #include "acl/acl.h" | 18 | #include "acl/acl.h" |
| 19 | -#include "asc_simt.h" | 19 | +#include "simt_api/asc_simt.h" |
| 20 | -#include "asc_printf.h" | 20 | +#include "utils/debug/asc_printf.h" |
| 21 | 21 | ||
| 22 | __global__ void hello_world() | 22 | __global__ void hello_world() |
| 23 | { | 23 | { |
| @@ -17,8 +17,8 @@ | |||
| 17 | #include <iostream> | 17 | #include <iostream> |
| 18 | #include <vector> | 18 | #include <vector> |
| 19 | #include "acl/acl.h" | 19 | #include "acl/acl.h" |
| 20 | -#include "asc_simt.h" | 20 | +#include "simt_api/asc_simt.h" |
| 21 | -#include "asc_printf.h" | 21 | +#include "utils/debug/asc_printf.h" |
| 22 | 22 | ||
| 23 | __global__ void simt_printf(float* input, uint32_t in_shape) | 23 | __global__ void simt_printf(float* input, uint32_t in_shape) |
| 24 | { | 24 | { |
| @@ -17,9 +17,9 @@ | |||
| 17 | #include <iostream> | 17 | #include <iostream> |
| 18 | #include <vector> | 18 | #include <vector> |
| 19 | #include "acl/acl.h" | 19 | #include "acl/acl.h" |
| 20 | -#include "asc_simt.h" | 20 | +#include "simt_api/asc_simt.h" |
| 21 | -#include "asc_printf.h" | 21 | +#include "utils/debug/asc_printf.h" |
| 22 | -#include "asc_assert.h" | 22 | +#include "utils/debug/asc_assert.h" |
| 23 | 23 | ||
| 24 | __global__ void simt_assert(float* input, uint32_t in_shape) | 24 | __global__ void simt_assert(float* input, uint32_t in_shape) |
| 25 | { | 25 | { |
| @@ -20,8 +20,8 @@ | |||
| 20 | #include <iterator> | 20 | #include <iterator> |
| 21 | #include <vector> | 21 | #include <vector> |
| 22 | #include "acl/acl.h" | 22 | #include "acl/acl.h" |
| 23 | -#include "asc_simt.h" | 23 | +#include "simt_api/asc_simt.h" |
| 24 | -#include "asc_printf.h" | 24 | +#include "utils/debug/asc_printf.h" |
| 25 | 25 | ||
| 26 | __global__ void simt_gather(float* input, int32_t* index, float* output, uint64_t index_total_length) | 26 | __global__ void simt_gather(float* input, int32_t* index, float* output, uint64_t index_total_length) |
| 27 | { | 27 | { |
| @@ -15,9 +15,9 @@ | |||
| 15 | 15 | ||
| 16 | #include <iostream> | 16 | #include <iostream> |
| 17 | #include <vector> | 17 | #include <vector> |
| 18 | -#include "asc_assert.h" | 18 | +#include "utils/debug/asc_assert.h" |
| 19 | #include "acl/acl.h" | 19 | #include "acl/acl.h" |
| 20 | -#include "asc_simt.h" | 20 | +#include "simt_api/asc_simt.h" |
| 21 | 21 | ||
| 22 | // [核心] ASCENDC_CHECK宏：用于捕获并打印ACL错误信息 | 22 | // [核心] ASCENDC_CHECK宏：用于捕获并打印ACL错误信息 |
| 23 | #define ASCENDC_CHECK(expr) do { \ | 23 | #define ASCENDC_CHECK(expr) do { \ |
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <vector> | 21 | #include <vector> |
| 22 | #include <cmath> | 22 | #include <cmath> |
| 23 | #include "acl/acl.h" | 23 | #include "acl/acl.h" |
| 24 | -#include <asc_simt.h> | 24 | +#include "simt_api/asc_simt.h" |
| 25 | 25 | ||
| 26 | constexpr int32_t PER_THREAD_LOOP = 16; | 26 | constexpr int32_t PER_THREAD_LOOP = 16; |
| 27 | constexpr int32_t BLOCKS_PER_GRID = 48; | 27 | constexpr int32_t BLOCKS_PER_GRID = 48; |