Skip to content

Commit e023ad3

Browse files
committed
rebase metax maca support to main
1 parent 0c3c5c7 commit e023ad3

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
lines changed

src/infiniop/ops/causal_softmax/metax/causal_softmax_metax.maca

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
#include "../../../devices/metax/metax_common.h"
22
#include "causal_softmax_metax.h"
33

4-
#include <hccub/block/block_reduce.cuh>
4+
#ifdef ENABLE_METAX_MC_API
5+
#include <cub/block/block_reduce.cuh>
6+
#else
7+
#include <hccub/block/block_reduce.cuh>
8+
#endif
59
#include "../../../devices/metax/metax_kernel_common.h"
610

711
#include "../../../reduce/cuda/reduce.cuh"

src/infiniop/ops/random_sample/metax/random_sample_kernel.h

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
#include "../../../devices/metax/metax_kernel_common.h"
22
#include "infinicore.h"
3-
#include <hccub/device/device_radix_sort.cuh>
4-
#include <hccub/device/device_reduce.cuh>
5-
#include <hccub/device/device_scan.cuh>
3+
4+
#ifdef ENABLE_METAX_MC_API
5+
#include <cub/device/device_radix_sort.cuh>
6+
#include <cub/device/device_reduce.cuh>
7+
#include <cub/device/device_scan.cuh>
8+
#else
9+
#include <cub/device/device_radix_sort.cuh>
10+
#include <cub/device/device_reduce.cuh>
11+
#include <cub/device/device_scan.cuh>
12+
#endif
613

714
namespace op::random_sample::metax {
815

src/infiniop/ops/random_sample/metax/random_sample_metax.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#ifndef __RANDOM_SAMPLE_METAX_H__
22
#define __RANDOM_SAMPLE_METAX_H__
3-
43
#include "../random_sample.h"
54

65
DESCRIPTOR(metax)

src/infiniop/ops/random_sample/metax/random_sample_metax.maca

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include "../../../devices/metax/metax_ht2mc.h"
12
#include "../../../devices/metax/metax_common.h"
23
#include "../../../devices/metax/metax_handle.h"
34
#include "../info.h"

src/infiniop/ops/softplus/operator.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
#if defined(ENABLE_NVIDIA_API) || defined(ENABLE_ILUVATAR_API)
99
#include "nvidia/softplus_nvidia.cuh"
1010
#endif
11-
#ifdef ENABLE_METAX_API
12-
#include "metax/softplus_metax.h"
13-
#endif
1411

1512
__C infiniStatus_t infiniopCreateSoftplusDescriptor(
1613
infiniopHandle_t handle,

0 commit comments

Comments
 (0)