diff --git a/Onllama.Tiny/FormSettings.Designer.cs b/Onllama.Tiny/FormSettings.Designer.cs index 67eff08..93b07b3 100644 --- a/Onllama.Tiny/FormSettings.Designer.cs +++ b/Onllama.Tiny/FormSettings.Designer.cs @@ -30,6 +30,9 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormSettings)); panel1 = new AntdUI.Panel(); + checkboxNoHistory = new AntdUI.Checkbox(); + checkboxModels = new AntdUI.Checkbox(); + checkboxPara = new AntdUI.Checkbox(); buttonSave = new AntdUI.Button(); panel2 = new AntdUI.Panel(); input1 = new AntdUI.Input(); @@ -38,14 +41,15 @@ private void InitializeComponent() checkboxAny = new AntdUI.Checkbox(); divider2 = new AntdUI.Divider(); divider1 = new AntdUI.Divider(); - checkboxPara = new AntdUI.Checkbox(); - checkboxModels = new AntdUI.Checkbox(); + checkboxFlushAttention = new AntdUI.Checkbox(); panel1.SuspendLayout(); panel2.SuspendLayout(); SuspendLayout(); // // panel1 // + panel1.Controls.Add(checkboxFlushAttention); + panel1.Controls.Add(checkboxNoHistory); panel1.Controls.Add(checkboxModels); panel1.Controls.Add(checkboxPara); panel1.Controls.Add(buttonSave); @@ -57,16 +61,42 @@ private void InitializeComponent() panel1.Location = new Point(12, 12); panel1.Name = "panel1"; panel1.Shadow = 5; - panel1.Size = new Size(310, 268); + panel1.Size = new Size(310, 360); panel1.TabIndex = 0; panel1.Text = "panel1"; // + // checkboxNoHistory + // + checkboxNoHistory.BackColor = Color.Transparent; + checkboxNoHistory.Location = new Point(11, 215); + checkboxNoHistory.Name = "checkboxNoHistory"; + checkboxNoHistory.Size = new Size(288, 23); + checkboxNoHistory.TabIndex = 9; + checkboxNoHistory.Text = "禁用注意力"; + // + // checkboxModels + // + checkboxModels.BackColor = Color.Transparent; + checkboxModels.Location = new Point(11, 186); + checkboxModels.Name = "checkboxModels"; + checkboxModels.Size = new Size(288, 23); + checkboxModels.TabIndex = 8; + checkboxModels.Text = "允许同时加载多个模型"; + // + // checkboxPara + // + checkboxPara.BackColor = Color.Transparent; + checkboxPara.Location = new Point(11, 157); + checkboxPara.Name = "checkboxPara"; + checkboxPara.Size = new Size(288, 23); + checkboxPara.TabIndex = 7; + checkboxPara.Text = "允许对话并发请求"; + // // buttonSave // - buttonSave.Back = Color.Transparent; buttonSave.BackColor = Color.Transparent; buttonSave.BorderWidth = 1F; - buttonSave.Location = new Point(11, 235); + buttonSave.Location = new Point(11, 327); buttonSave.Name = "buttonSave"; buttonSave.Size = new Size(288, 25); buttonSave.TabIndex = 6; @@ -150,29 +180,20 @@ private void InitializeComponent() divider1.TabIndex = 0; divider1.Text = "模型位置"; // - // checkboxPara - // - checkboxPara.BackColor = Color.Transparent; - checkboxPara.Location = new Point(11, 157); - checkboxPara.Name = "checkboxPara"; - checkboxPara.Size = new Size(288, 23); - checkboxPara.TabIndex = 7; - checkboxPara.Text = "允许对话并发请求"; - // - // checkboxModels + // checkboxFlushAttention // - checkboxModels.BackColor = Color.Transparent; - checkboxModels.Location = new Point(11, 186); - checkboxModels.Name = "checkboxModels"; - checkboxModels.Size = new Size(288, 23); - checkboxModels.TabIndex = 8; - checkboxModels.Text = "允许同时加载多个模型"; + checkboxFlushAttention.BackColor = Color.Transparent; + checkboxFlushAttention.Location = new Point(11, 244); + checkboxFlushAttention.Name = "checkboxFlushAttention"; + checkboxFlushAttention.Size = new Size(288, 23); + checkboxFlushAttention.TabIndex = 10; + checkboxFlushAttention.Text = "启用 Flush Attention"; // // FormSettings // AutoScaleDimensions = new SizeF(7F, 17F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(334, 292); + ClientSize = new Size(334, 384); Controls.Add(panel1); FormBorderStyle = FormBorderStyle.FixedDialog; Icon = (Icon)resources.GetObject("$this.Icon"); @@ -202,5 +223,7 @@ private void InitializeComponent() private AntdUI.Button buttonSave; private AntdUI.Checkbox checkboxModels; private AntdUI.Checkbox checkboxPara; + private AntdUI.Checkbox checkboxNoHistory; + private AntdUI.Checkbox checkboxFlushAttention; } } \ No newline at end of file diff --git a/Onllama.Tiny/FormSettings.cs b/Onllama.Tiny/FormSettings.cs index ef2e916..a3c4b2a 100644 --- a/Onllama.Tiny/FormSettings.cs +++ b/Onllama.Tiny/FormSettings.cs @@ -16,6 +16,8 @@ private void FormSettings_Load(object sender, EventArgs e) Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + "\\.ollama\\models"; input1.Text = Environment.GetEnvironmentVariable("OLLAMA_MODELS", EnvironmentVariableTarget.User) ?? ""; checkboxAny.Checked = (Environment.GetEnvironmentVariable("OLLAMA_HOST", EnvironmentVariableTarget.User) ?? "").Equals("0.0.0.0"); + checkboxNoHistory.Checked = (Environment.GetEnvironmentVariable("OLLAMA_NOHISTORY", EnvironmentVariableTarget.User) ?? "").Equals("1"); + checkboxFlushAttention.Checked = (Environment.GetEnvironmentVariable("OLLAMA_FLASH_ATTENTION", EnvironmentVariableTarget.User) ?? "").Equals("1"); checkboxPara.Checked = (Environment.GetEnvironmentVariable("OLLAMA_NUM_PARALLEL", EnvironmentVariableTarget.User) ?? "").Equals("6"); checkboxModels.Checked = (Environment.GetEnvironmentVariable("OLLAMA_MAX_LOADED_MODELS", EnvironmentVariableTarget.User) ?? "").Equals("4"); checkboxNoGpu.Checked = (Environment.GetEnvironmentVariable("CUDA_VISIBLE_DEVICES", EnvironmentVariableTarget.User) ?? "").Equals("-1") || @@ -42,6 +44,10 @@ private void buttonSave_Click(object sender, EventArgs e) EnvironmentVariableTarget.User), () => Environment.SetEnvironmentVariable("OLLAMA_HOST", checkboxAny.Checked ? "0.0.0.0" : null, EnvironmentVariableTarget.User), + () => Environment.SetEnvironmentVariable("OLLAMA_NOHISTORY", + checkboxNoHistory.Checked ? "1" : null, EnvironmentVariableTarget.User), + () => Environment.SetEnvironmentVariable("OLLAMA_FLASH_ATTENTION", + checkboxFlushAttention.Checked ? "1" : null, EnvironmentVariableTarget.User), () => Environment.SetEnvironmentVariable("CUDA_VISIBLE_DEVICES", checkboxNoGpu.Checked ? " " : null, EnvironmentVariableTarget.User), () => Environment.SetEnvironmentVariable("HIP_VISIBLE_DEVICES",