Skip to content

Commit

Permalink
apply code-format changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@nihui @github-actions
nihui authored and github-actions[bot] committed Nov 30, 2024
1 parent 0e3f4ee commit b49bb82
Show file tree
Hide file tree
Showing 2 changed files with 179 additions and 179 deletions.
80 changes: 40 additions & 40 deletions src/layer/riscv/riscv_activation.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,47 +24,47 @@
#include "rvv_mathfun_fp16s.h"
#endif

#define _RVV_FLOAT_ACTIVATION_PS(SEW, LMUL, MLEN, STYPE) \
static inline vfloat##SEW##m##LMUL##_t activation_ps(vfloat##SEW##m##LMUL##_t _v, int activation_type, const ncnn::Mat& activation_params, size_t vl) \
{ \
if (activation_type == 1) \
{ \
_v = __riscv_vfmax_vf_f##SEW##m##LMUL(_v, (STYPE)0.f, vl); \
} \
else if (activation_type == 2) \
{ \
vbool##MLEN##_t _lemask = __riscv_vmfle_vf_f##SEW##m##LMUL##_b##MLEN(_v, (STYPE)0.f, vl); \
_v = __riscv_vfmul_vf_f##SEW##m##LMUL##_mu(_lemask, _v, _v, (STYPE)activation_params[0], vl); \
} \
else if (activation_type == 3) \
{ \
_v = __riscv_vfmax_vf_f##SEW##m##LMUL(_v, (STYPE)activation_params[0], vl); \
_v = __riscv_vfmin_vf_f##SEW##m##LMUL(_v, (STYPE)activation_params[1], vl); \
} \
else if (activation_type == 4) \
{ \
_v = sigmoid_ps(_v, vl); \
} \
else if (activation_type == 5) \
{ \
_v = __riscv_vfmul_vv_f##SEW##m##LMUL(_v, tanh_ps(log_ps(__riscv_vfadd_vf_f##SEW##m##LMUL(exp_ps(_v, vl), (STYPE)1.f, vl), vl), vl), vl); \
} \
else if (activation_type == 6) \
{ \
const float alpha = activation_params[0]; \
const float beta = activation_params[1]; \
const float lower = -beta / alpha; \
const float upper = (1.f / alpha) + lower; \
vbool##MLEN##_t _lower = __riscv_vmflt_vf_f##SEW##m##LMUL##_b##MLEN(_v, (STYPE)lower, vl); \
vbool##MLEN##_t _higher = __riscv_vmfgt_vf_f##SEW##m##LMUL##_b##MLEN(_v, (STYPE)upper, vl); \
vbool##MLEN##_t _apply = __riscv_vmnor_mm_b##MLEN(_lower, _higher, vl); \
_v = __riscv_vfmerge_vfm_f##SEW##m##LMUL(_v, (STYPE).0f, _lower, vl); \
\
#define _RVV_FLOAT_ACTIVATION_PS(SEW, LMUL, MLEN, STYPE) \
static inline vfloat##SEW##m##LMUL##_t activation_ps(vfloat##SEW##m##LMUL##_t _v, int activation_type, const ncnn::Mat& activation_params, size_t vl) \
{ \
if (activation_type == 1) \
{ \
_v = __riscv_vfmax_vf_f##SEW##m##LMUL(_v, (STYPE)0.f, vl); \
} \
else if (activation_type == 2) \
{ \
vbool##MLEN##_t _lemask = __riscv_vmfle_vf_f##SEW##m##LMUL##_b##MLEN(_v, (STYPE)0.f, vl); \
_v = __riscv_vfmul_vf_f##SEW##m##LMUL##_mu(_lemask, _v, _v, (STYPE)activation_params[0], vl); \
} \
else if (activation_type == 3) \
{ \
_v = __riscv_vfmax_vf_f##SEW##m##LMUL(_v, (STYPE)activation_params[0], vl); \
_v = __riscv_vfmin_vf_f##SEW##m##LMUL(_v, (STYPE)activation_params[1], vl); \
} \
else if (activation_type == 4) \
{ \
_v = sigmoid_ps(_v, vl); \
} \
else if (activation_type == 5) \
{ \
_v = __riscv_vfmul_vv_f##SEW##m##LMUL(_v, tanh_ps(log_ps(__riscv_vfadd_vf_f##SEW##m##LMUL(exp_ps(_v, vl), (STYPE)1.f, vl), vl), vl), vl); \
} \
else if (activation_type == 6) \
{ \
const float alpha = activation_params[0]; \
const float beta = activation_params[1]; \
const float lower = -beta / alpha; \
const float upper = (1.f / alpha) + lower; \
vbool##MLEN##_t _lower = __riscv_vmflt_vf_f##SEW##m##LMUL##_b##MLEN(_v, (STYPE)lower, vl); \
vbool##MLEN##_t _higher = __riscv_vmfgt_vf_f##SEW##m##LMUL##_b##MLEN(_v, (STYPE)upper, vl); \
vbool##MLEN##_t _apply = __riscv_vmnor_mm_b##MLEN(_lower, _higher, vl); \
_v = __riscv_vfmerge_vfm_f##SEW##m##LMUL(_v, (STYPE).0f, _lower, vl); \
\
vfloat##SEW##m##LMUL##_t _p0 = __riscv_vfadd_vf_f##SEW##m##LMUL##_m(_apply, __riscv_vfmul_vf_f##SEW##m##LMUL##_m(_apply, _v, (STYPE)alpha, vl), (STYPE)beta, vl); \
_v = __riscv_vfmul_vv_f##SEW##m##LMUL##_mu(_apply, _v, _v, _p0, vl); \
} \
\
return _v; \
_v = __riscv_vfmul_vv_f##SEW##m##LMUL##_mu(_apply, _v, _v, _p0, vl); \
} \
\
return _v; \
}

#if __riscv_zvfh
Expand Down
Loading

0 comments on commit b49bb82

Please sign in to comment.