avoid build failures in macos

leejet · leejet · commit 3f3c328eeb69 · 2024-07-07T18:24:30.000+08:00
diff --git a/conditioner.hpp b/conditioner.hpp
@@ -8,6 +8,10 @@ struct SDCondition {
     struct ggml_tensor* c_crossattn = NULL;  // aka context
     struct ggml_tensor* c_vector    = NULL;  // aka y
     struct ggml_tensor* c_concat    = NULL;
+
+    SDCondition() = default;
+    SDCondition(struct ggml_tensor* c_crossattn, struct ggml_tensor* c_vector, struct ggml_tensor* c_concat) :
+    c_crossattn(c_crossattn), c_vector(c_vector), c_concat(c_concat) {}
 };
 
 struct Conditioner {
@@ -514,7 +518,7 @@ struct FrozenCLIPEmbedderWithCustomWords : public Conditioner {
             GGML_ASSERT(offset == ggml_nbytes(vec));
         }
         // print_ggml_tensor(result);
-        return {hidden_states, vec, NULL};
+        return SDCondition(hidden_states, vec, NULL);
     }
 
     std::tuple<SDCondition, std::vector<bool>>
@@ -941,7 +945,7 @@ struct SD3CLIPEmbedder : public Conditioner {
                                         hidden_states,
                                         chunk_hidden_states->ne[0],
                                         ggml_nelements(hidden_states) / chunk_hidden_states->ne[0]);
-        return {hidden_states, pooled, NULL};
+        return SDCondition(hidden_states, pooled, NULL);
     }
 
     SDCondition get_learned_condition(ggml_context* work_ctx,
diff --git a/stable-diffusion.cpp b/stable-diffusion.cpp
@@ -1482,7 +1482,7 @@ SD_API sd_image_t* img2vid(sd_ctx_t* sd_ctx,
 
     auto uc_vector = ggml_dup_tensor(work_ctx, cond.c_vector);
 
-    SDCondition uncond = {uc_crossattn, uc_vector, uc_concat};
+    SDCondition uncond = SDCondition(uc_crossattn, uc_vector, uc_concat);
 
     int64_t t1 = ggml_time_ms();
     LOG_INFO("get_learned_condition completed, taking %" PRId64 " ms", t1 - t0);
@@ -1513,7 +1513,7 @@ SD_API sd_image_t* img2vid(sd_ctx_t* sd_ctx,
                                                  sample_method,
                                                  sigmas,
                                                  -1,
-                                                 {NULL, NULL});
+                                                 SDCondition(NULL, NULL, NULL));
 
     int64_t t2 = ggml_time_ms();
     LOG_INFO("sampling completed, taking %.2fs", (t2 - t1) * 1.0f / 1000);
diff --git a/t5.hpp b/t5.hpp
@@ -151,7 +151,7 @@ class T5UniGramTokenizer {
             value[i] = (*pieces)[i].second;        // vocab_id
         }
 
-        trie_ = std::make_unique<Darts::DoubleArray>();
+        trie_ = std::unique_ptr<Darts::DoubleArray>(new Darts::DoubleArray());
         if (trie_->build(key.size(), const_cast<char**>(&key[0]), nullptr,
                          &value[0]) != 0) {
             status_ = BUILD_DOUBLE_ARRAY_FAILED;

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ class T5UniGramTokenizer {`
`151`	`151`	`value[i] = (*pieces)[i].second; // vocab_id`
`152`	`152`	`}`
`153`	`153`
`154`		`- trie_ = std::make_unique<Darts::DoubleArray>();`
	`154`	`+ trie_ = std::unique_ptr<Darts::DoubleArray>(new Darts::DoubleArray());`
`155`	`155`	`if (trie_->build(key.size(), const_cast<char**>(&key[0]), nullptr,`
`156`	`156`	`&value[0]) != 0) {`
`157`	`157`	`status_ = BUILD_DOUBLE_ARRAY_FAILED;`