|
|
@@ -4311,13 +4311,13 @@ struct ggml_tensor * ggml_set_2d_inplace(
|
|
|
static struct ggml_tensor * ggml_cpy_impl(
|
|
|
struct ggml_context * ctx,
|
|
|
struct ggml_tensor * a,
|
|
|
- struct ggml_tensor * b,
|
|
|
- bool inplace) {
|
|
|
+ struct ggml_tensor * b) {
|
|
|
GGML_ASSERT(ggml_nelements(a) == ggml_nelements(b));
|
|
|
|
|
|
bool is_node = false;
|
|
|
|
|
|
- if (!inplace && (a->grad || b->grad)) {
|
|
|
+ if (a->grad || b->grad) {
|
|
|
+ // inplace is false and either one have a grad
|
|
|
is_node = true;
|
|
|
}
|
|
|
|
|
|
@@ -4341,29 +4341,21 @@ struct ggml_tensor * ggml_cpy(
|
|
|
struct ggml_context * ctx,
|
|
|
struct ggml_tensor * a,
|
|
|
struct ggml_tensor * b) {
|
|
|
- return ggml_cpy_impl(ctx, a, b, false);
|
|
|
-}
|
|
|
-
|
|
|
-struct ggml_tensor * ggml_cpy_inplace(
|
|
|
- struct ggml_context * ctx,
|
|
|
- struct ggml_tensor * a,
|
|
|
- struct ggml_tensor * b) {
|
|
|
- return ggml_cpy_impl(ctx, a, b, true);
|
|
|
+ return ggml_cpy_impl(ctx, a, b);
|
|
|
}
|
|
|
|
|
|
// ggml_cont
|
|
|
|
|
|
static struct ggml_tensor * ggml_cont_impl(
|
|
|
struct ggml_context * ctx,
|
|
|
- struct ggml_tensor * a,
|
|
|
- bool inplace) {
|
|
|
+ struct ggml_tensor * a) {
|
|
|
bool is_node = false;
|
|
|
|
|
|
- if (!inplace && a->grad) {
|
|
|
+ if (a->grad) {
|
|
|
is_node = true;
|
|
|
}
|
|
|
|
|
|
- struct ggml_tensor * result = inplace ? ggml_view_tensor(ctx, a) : ggml_dup_tensor(ctx, a);
|
|
|
+ struct ggml_tensor * result = ggml_dup_tensor(ctx, a);
|
|
|
ggml_format_name(result, "%s (cont)", a->name);
|
|
|
|
|
|
result->op = GGML_OP_CONT;
|
|
|
@@ -4376,13 +4368,7 @@ static struct ggml_tensor * ggml_cont_impl(
|
|
|
struct ggml_tensor * ggml_cont(
|
|
|
struct ggml_context * ctx,
|
|
|
struct ggml_tensor * a) {
|
|
|
- return ggml_cont_impl(ctx, a, false);
|
|
|
-}
|
|
|
-
|
|
|
-struct ggml_tensor * ggml_cont_inplace(
|
|
|
- struct ggml_context * ctx,
|
|
|
- struct ggml_tensor * a) {
|
|
|
- return ggml_cont_impl(ctx, a, true);
|
|
|
+ return ggml_cont_impl(ctx, a);
|
|
|
}
|
|
|
|
|
|
// make contiguous, with new shape
|