LLM inference in C/C++
C++ ggml
cann : refactor `#ifdef` blocks to avoid unreachable code after `return` (#25273)
Raul Torresf3fb2fcdbc93
diff --git a/ggml/src/ggml-cann/ggml-cann.cpp b/ggml/src/ggml-cann/ggml-cann.cppindex 28e17f3f7c..4d83d411b2 100644--- a/ggml/src/ggml-cann/ggml-cann.cpp+++ b/ggml/src/ggml-cann/ggml-cann.cpp@@ -2455,9 +2455,10 @@ static bool ggml_backend_cann_supports_op(ggml_backend_dev_t dev, const ggml_ten#ifdef ASCEND_310P// Q4 && Q8 per group is not support on 310p devicereturn false;-#endif+#else// only support contiguous for quantized types.return ggml_is_contiguous(op->src[0]) && ggml_is_contiguous(op->src[1]);+#endifdefault:return false;}@@ -2472,9 +2473,10 @@ static bool ggml_backend_cann_supports_op(ggml_backend_dev_t dev, const ggml_ten#ifdef ASCEND_310P// Q4 && Q8 per group is not support on 310p devicereturn false;-#endif+#else// only support contiguous for quantized types.return ggml_is_contiguous(op->src[0]) && ggml_is_contiguous(op->src[1]);+#endifdefault:return false;}@@ -2641,7 +2643,7 @@ static bool ggml_backend_cann_supports_op(ggml_backend_dev_t dev, const ggml_ten#ifdef ASCEND_310P// Ger is not supported on 310p devicereturn false;-#endif+#elseswitch (op->src[0]->type) {case GGML_TYPE_F16:case GGML_TYPE_F32:@@ -2649,6 +2651,7 @@ static bool ggml_backend_cann_supports_op(ggml_backend_dev_t dev, const ggml_tendefault:return false;}+#endif}case GGML_OP_CONV_TRANSPOSE_1D:return true;@@ -2667,7 +2670,7 @@ static bool ggml_backend_cann_supports_op(ggml_backend_dev_t dev, const ggml_ten#ifdef ASCEND_310P// FA not support on 310p devicereturn false;-#endif+#else// derived from [ggml-cuda.cu]if (op->src[1]->type != GGML_TYPE_F16 || op->src[2]->type != GGML_TYPE_F16) {return false;@@ -2693,6 +2696,7 @@ static bool ggml_backend_cann_supports_op(ggml_backend_dev_t dev, const ggml_tenreturn false;}return true;+#endif}case GGML_OP_SSM_CONV:return true;