ggml-org
diff --git a/‎ggml/src/ggml-cann/CMakeLists.txt
-2 b/‎ggml/src/ggml-cann/CMakeLists.txt
-2
diff --git a/‎ggml/src/ggml-cann/aclnn_ops.cpp
+241-226 b/‎ggml/src/ggml-cann/aclnn_ops.cpp
+241-226
diff --git a/‎ggml/src/ggml-cann/ggml-cann.cpp
+15-11 b/‎ggml/src/ggml-cann/ggml-cann.cpp
+15-11
diff --git a/‎ggml/src/ggml-cann/kernels/CMakeLists.txt
-30 b/‎ggml/src/ggml-cann/kernels/CMakeLists.txt
-30
diff --git a/‎ggml/src/ggml-cann/kernels/ascendc_kernels.h
-19 b/‎ggml/src/ggml-cann/kernels/ascendc_kernels.h
-19
diff --git a/‎ggml/src/ggml-cann/kernels/dup.cpp
-234 b/‎ggml/src/ggml-cann/kernels/dup.cpp
-234
@@ -51,13 +51,11 @@ if (CANN_INSTALL_DIR)
         ${CANN_INSTALL_DIR}/acllib/include
     )
 
-    add_subdirectory(kernels)
     list(APPEND CANN_LIBRARIES
         ascendcl
         nnopbase
         opapi
         acl_op_compiler
-        ascendc_kernels
     )
 
     file(GLOB GGML_SOURCES_CANN "*.cpp")
 
@@ -1704,24 +1704,28 @@ static bool ggml_backend_cann_supports_op(ggml_backend_dev_t dev,
             switch (op->src[0]->type) {
                 case GGML_TYPE_F32:
                 case GGML_TYPE_F16:
-                case GGML_TYPE_Q4_0:
                 case GGML_TYPE_Q8_0:
                     return true;
                 default:
                     return false;
             }
         } break;
         case GGML_OP_CPY: {
-            switch (op->type) {
-                case GGML_TYPE_F32:
-                case GGML_TYPE_F16:
-                case GGML_TYPE_Q8_0:
-                case GGML_TYPE_Q4_0:
-                    return true;
-                default:
-                    return false;
+            ggml_tensor *src = op->src[0];
+            if ((op->type != GGML_TYPE_F32 && op->type != GGML_TYPE_F16) ||
+                  (src->type != GGML_TYPE_F32 &&
+                    src->type != GGML_TYPE_F16)) {
+                // only support F32 and F16.
+                return false;
             }
-        }
+
+            if (!ggml_are_same_shape(op, src) && !ggml_is_contiguous(op)) {
+                // unsupport dst is not contiguous.
+                return false;
+            }
+
+            return true;
+        } break;
         case GGML_OP_CONT: {
             // TODO: support GGML_TYPE_BF16
             switch (op->src[0]->type) {
@@ -1762,9 +1766,9 @@ static bool ggml_backend_cann_supports_op(ggml_backend_dev_t dev,
             }
             return true;
         }
+        case GGML_OP_DUP:
         case GGML_OP_IM2COL:
         case GGML_OP_CONCAT:
-        case GGML_OP_DUP:
         case GGML_OP_REPEAT:
         case GGML_OP_NONE:
         case GGML_OP_RESHAPE:
Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,11 @@ if (CANN_INSTALL_DIR)`
`51`	`51`	`${CANN_INSTALL_DIR}/acllib/include`
`52`	`52`	`)`
`53`	`53`
`54`		`- add_subdirectory(kernels)`
`55`	`54`	`list(APPEND CANN_LIBRARIES`
`56`	`55`	`ascendcl`
`57`	`56`	`nnopbase`
`58`	`57`	`opapi`
`59`	`58`	`acl_op_compiler`
`60`		`- ascendc_kernels`
`61`	`59`	`)`
`62`	`60`
`63`	`61`	`file(GLOB GGML_SOURCES_CANN "*.cpp")`