Removed setting default alpha in Adapter because of possible confused…

… behaviour in the scenario when adapters are switched without setting alpha.

image_generation/lcm_dreamshaper_v7/cpp/src/main.cpp

@@ -142,7 +142,7 @@ StableDiffusionModels compile_models(const std::string& model_path,
         Timer t("Loading LoRA weights");
         DEBUG_PRINT("Adapters registered:" << lora_path.size());
         for(size_t i = 0; i < lora_path.size(); ++i) {
-            lora_config.add(ov::genai::Adapter(lora_path[i], i < alpha.size() ? alpha[i] : 0.75f)); // TODO: Consider using default alpha from LoRA file
+            lora_config.add(ov::genai::Adapter(lora_path[i]), i < alpha.size() ? alpha[i] : 0.75f); // TODO: Consider using default alpha from LoRA file
         }
     }
 

image_generation/stable_diffusion_1_5/cpp/src/main.cpp

@@ -151,7 +151,7 @@ StableDiffusionModels compile_models(const std::string& model_path,
         Timer t("Loading LoRA weights");
         DEBUG_PRINT("Adapters registered:" << lora_path.size());
         for(size_t i = 0; i < lora_path.size(); ++i) {
-            lora_config.add(ov::genai::Adapter(lora_path[i], i < alpha.size() ? alpha[i] : 0.75f)); // TODO: Consider using default alpha from LoRA file
+            lora_config.add(ov::genai::Adapter(lora_path[i]), i < alpha.size() ? alpha[i] : 0.75f); // TODO: Consider using default alpha from LoRA file
         }
     }
 

samples/cpp/lora_greedy_causal_lm/lora_greedy_causal_lm.cpp

@@ -20,22 +20,22 @@ int main(int argc, char* argv[]) try {
 
     std::cout << "MODE_STATIC" << std::endl;
     {
-        Adapter adapter(adapter_path, 0.75);
-        LLMPipeline pipe(model_path, device, AdapterConfig(adapter, AdapterConfig::MODE_STATIC));
+        Adapter adapter(adapter_path);
+        LLMPipeline pipe(model_path, device, AdapterConfig(adapter, 0.75, AdapterConfig::MODE_STATIC));
         std::cout << pipe.generate(prompt, max_new_tokens(100)) << std::endl;
     }
 
     std::cout << "MODE_STATIC_RANK" << std::endl;
     {
-        Adapter adapter(adapter_path, 0.75);
-        LLMPipeline pipe(model_path, device, AdapterConfig(adapter, AdapterConfig::MODE_STATIC_RANK));
+        Adapter adapter(adapter_path);
+        LLMPipeline pipe(model_path, device, AdapterConfig(adapter, 0.75, AdapterConfig::MODE_STATIC_RANK));
         std::cout << pipe.generate(prompt, max_new_tokens(100)) << std::endl;
     }
 
     std::cout << "MODE_DYNAMIC" << std::endl;
     {
-        Adapter adapter(adapter_path, 0.75);
-        LLMPipeline pipe(model_path, device, AdapterConfig(adapter, AdapterConfig::MODE_DYNAMIC));
+        Adapter adapter(adapter_path);
+        LLMPipeline pipe(model_path, device, AdapterConfig(adapter, 0.75, AdapterConfig::MODE_DYNAMIC));
         std::cout << pipe.generate(prompt, max_new_tokens(100)) << std::endl;
     }
 
@@ -47,7 +47,7 @@ int main(int argc, char* argv[]) try {
 
     std::cout << "MODE_AUTO/explicit alpha" << std::endl;
     {
-        LLMPipeline pipe(model_path, device, Adapter(adapter_path, 0.75));
+        LLMPipeline pipe(model_path, device, AdapterConfig(Adapter(adapter_path), 0.75));
         std::cout << pipe.generate(prompt, max_new_tokens(100)) << std::endl;
     }
 
@@ -59,15 +59,6 @@ int main(int argc, char* argv[]) try {
         std::cout << pipe.generate(prompt, max_new_tokens(100)) << std::endl;
     }
 
-    std::cout << "MODE_AUTO/blended" << std::endl;
-    {
-        Adapter adapter1(adapter_path1, 0.5);
-        Adapter adapter2(adapter_path2, 0.25);
-        LLMPipeline pipe(model_path, device, {adapter1, adapter2});
-        std::cout << pipe.generate(prompt, adapters(adapter1), max_new_tokens(100)) << std::endl;
-        std::cout << pipe.generate(prompt, adapters(adapter2), max_new_tokens(100)) << std::endl;
-    }
-
     std::cout << "MODE_AUTO/blended with late alpha set" << std::endl;
     {
         Adapter adapter1 = Adapter(adapter_path1);

src/cpp/include/openvino/genai/lora_adapter.hpp

@@ -78,6 +78,8 @@ struct OPENVINO_GENAI_EXPORTS AdapterConfig {
     std::vector<std::shared_ptr<ov::op::v0::Constant>> alpha_constants;
 
     AdapterConfig (const Adapter& adapter, Mode mode = MODE_AUTO) : AdapterConfig(std::vector<Adapter>{adapter}, mode) {}
+    AdapterConfig (const Adapter& adapter, float alpha, Mode mode = MODE_AUTO) : AdapterConfig(std::vector<std::pair<Adapter, float>>{{adapter, alpha}}, mode) {}
+    AdapterConfig (const Adapter& adapter, double alpha, Mode mode = MODE_AUTO) : AdapterConfig(adapter, float(alpha), mode) {}
     AdapterConfig (const std::vector<Adapter>& adapters, Mode mode = MODE_AUTO);
     AdapterConfig (const std::vector<std::pair<Adapter, float>>& adapters, Mode mode = MODE_AUTO);
 

src/cpp/src/lora_adapter.cpp

@@ -676,30 +676,17 @@ namespace genai {
 
 class Adapter::Impl {
 public:
-    Impl(const std::string& path, std::optional<float> default_alpha = std::nullopt) :  // FIXME: Pass lora patterns
-        tensors(group_lora_tensors(read_safetensors(path), default_lora_patterns())),  // FIXME: Accept directory with the config as well
-        default_alpha(default_alpha) {
-    }
-
-    std::optional<float> get_default_alpha () const {
-        return default_alpha;
-    }
+    Impl(const std::string& path) :
+        tensors(group_lora_tensors(read_safetensors(path), default_lora_patterns()))
+    {}
 
     LoRATensors tensors;
-    std::optional<float> default_alpha;
 };
 
-Adapter::Adapter(const std::string& path, float default_alpha) :
-    m_pimpl(std::make_shared<Adapter::Impl>(path, default_alpha)) {
-}
-
 Adapter::Adapter(const std::string& path) :
     m_pimpl(std::make_shared<Adapter::Impl>(path)) {
 }
 
-std::optional<float> Adapter::get_default_alpha() const {
-    return m_pimpl->get_default_alpha();
-}
 
 
 struct AdapterControllerImpl {
@@ -1245,7 +1232,7 @@ AdapterConfig::AdapterConfig (const std::vector<Adapter>& adapters, Mode mode) :
     decompose_mode();
     alphas.reserve(adapters.size());
     for(const auto& adapter: adapters) {
-        auto const alpha = adapter.get_default_alpha().value_or(1);
+        auto const alpha = 1;
         alphas.push_back(alpha);
         alpha_constants.push_back(alpha_as_constant(alpha));
     }
@@ -1279,7 +1266,7 @@ AdapterConfig& AdapterConfig::add(const Adapter& adapter, float alpha) {
 }
 
 AdapterConfig& AdapterConfig::add(const Adapter& adapter) {
-    return add(adapter, adapter.get_default_alpha().value_or(1));
+    return add(adapter, 1);
 }
 
 AdapterConfig& AdapterConfig::set_alpha(const Adapter& adapter, float alpha) {