Remove acestep binary path machinery

This commit is contained in:
Carl Philipp Klemm 2026-04-15 12:15:07 +02:00
parent cc72f360b9
commit f85bbb326e
5 changed files with 7 additions and 55 deletions

View file

@ -25,11 +25,6 @@ QString AdvancedSettingsDialog::getJsonTemplate() const
return ui->jsonTemplateEdit->toPlainText(); return ui->jsonTemplateEdit->toPlainText();
} }
QString AdvancedSettingsDialog::getAceStepPath() const
{
return ui->aceStepPathEdit->text();
}
QString AdvancedSettingsDialog::getQwen3ModelPath() const QString AdvancedSettingsDialog::getQwen3ModelPath() const
{ {
return ui->qwen3ModelEdit->text(); return ui->qwen3ModelEdit->text();
@ -65,11 +60,6 @@ void AdvancedSettingsDialog::setJsonTemplate(const QString &templateStr)
ui->jsonTemplateEdit->setPlainText(templateStr); ui->jsonTemplateEdit->setPlainText(templateStr);
} }
void AdvancedSettingsDialog::setAceStepPath(const QString &path)
{
ui->aceStepPathEdit->setText(path);
}
void AdvancedSettingsDialog::setQwen3ModelPath(const QString &path) void AdvancedSettingsDialog::setQwen3ModelPath(const QString &path)
{ {
ui->qwen3ModelEdit->setText(path); ui->qwen3ModelEdit->setText(path);
@ -100,15 +90,6 @@ void AdvancedSettingsDialog::setFlashAttention(bool enabled)
ui->flashAttentionCheckBox->setChecked(enabled); ui->flashAttentionCheckBox->setChecked(enabled);
} }
void AdvancedSettingsDialog::on_aceStepBrowseButton_clicked()
{
QString dir = QFileDialog::getExistingDirectory(this, "Select AceStep Build Directory", ui->aceStepPathEdit->text());
if (!dir.isEmpty())
{
ui->aceStepPathEdit->setText(dir);
}
}
void AdvancedSettingsDialog::on_qwen3BrowseButton_clicked() void AdvancedSettingsDialog::on_qwen3BrowseButton_clicked()
{ {
QString file = QFileDialog::getOpenFileName(this, "Select Qwen3 Model", ui->qwen3ModelEdit->text(), QString file = QFileDialog::getOpenFileName(this, "Select Qwen3 Model", ui->qwen3ModelEdit->text(),

View file

@ -24,7 +24,6 @@ public:
// Getters for settings // Getters for settings
QString getJsonTemplate() const; QString getJsonTemplate() const;
QString getAceStepPath() const;
QString getQwen3ModelPath() const; QString getQwen3ModelPath() const;
QString getTextEncoderModelPath() const; QString getTextEncoderModelPath() const;
QString getDiTModelPath() const; QString getDiTModelPath() const;
@ -34,7 +33,6 @@ public:
// Setters for settings // Setters for settings
void setJsonTemplate(const QString &templateStr); void setJsonTemplate(const QString &templateStr);
void setAceStepPath(const QString &path);
void setQwen3ModelPath(const QString &path); void setQwen3ModelPath(const QString &path);
void setTextEncoderModelPath(const QString &path); void setTextEncoderModelPath(const QString &path);
void setDiTModelPath(const QString &path); void setDiTModelPath(const QString &path);
@ -43,7 +41,6 @@ public:
void setFlashAttention(bool enabled); void setFlashAttention(bool enabled);
private slots: private slots:
void on_aceStepBrowseButton_clicked();
void on_qwen3BrowseButton_clicked(); void on_qwen3BrowseButton_clicked();
void on_textEncoderBrowseButton_clicked(); void on_textEncoderBrowseButton_clicked();
void on_ditBrowseButton_clicked(); void on_ditBrowseButton_clicked();

View file

@ -105,34 +105,13 @@
<enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum> <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="aceStepLabel">
<property name="text">
<string>AceStep Path:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="aceStepLayout">
<item>
<widget class="QLineEdit" name="aceStepPathEdit"/>
</item>
<item>
<widget class="QPushButton" name="aceStepBrowseButton">
<property name="text">
<string>Browse...</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="qwen3Label"> <widget class="QLabel" name="qwen3Label">
<property name="text"> <property name="text">
<string>Qwen3 Model:</string> <string>Qwen3 Model:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="0" column="1">
<layout class="QHBoxLayout" name="qwen3Layout"> <layout class="QHBoxLayout" name="qwen3Layout">
<item> <item>
<widget class="QLineEdit" name="qwen3ModelEdit"/> <widget class="QLineEdit" name="qwen3ModelEdit"/>
@ -146,14 +125,14 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0"> <item row="1" column="0">
<widget class="QLabel" name="textEncoderLabel"> <widget class="QLabel" name="textEncoderLabel">
<property name="text"> <property name="text">
<string>Text Encoder Model:</string> <string>Text Encoder Model:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="1" column="1">
<layout class="QHBoxLayout" name="textEncoderLayout"> <layout class="QHBoxLayout" name="textEncoderLayout">
<item> <item>
<widget class="QLineEdit" name="textEncoderEdit"/> <widget class="QLineEdit" name="textEncoderEdit"/>
@ -167,14 +146,14 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="3" column="0"> <item row="2" column="0">
<widget class="QLabel" name="ditLabel"> <widget class="QLabel" name="ditLabel">
<property name="text"> <property name="text">
<string>DiT Model:</string> <string>DiT Model:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="2" column="1">
<layout class="QHBoxLayout" name="ditLayout"> <layout class="QHBoxLayout" name="ditLayout">
<item> <item>
<widget class="QLineEdit" name="ditModelEdit"/> <widget class="QLineEdit" name="ditModelEdit"/>
@ -188,14 +167,14 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="4" column="0"> <item row="3" column="0">
<widget class="QLabel" name="vaeLabel"> <widget class="QLabel" name="vaeLabel">
<property name="text"> <property name="text">
<string>VAE Model:</string> <string>VAE Model:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="3" column="1">
<layout class="QHBoxLayout" name="vaeLayout"> <layout class="QHBoxLayout" name="vaeLayout">
<item> <item>
<widget class="QLineEdit" name="vaeModelEdit"/> <widget class="QLineEdit" name="vaeModelEdit"/>

View file

@ -155,7 +155,6 @@ void MainWindow::loadSettings()
// Load path settings with defaults based on application directory // Load path settings with defaults based on application directory
QString appDir = QCoreApplication::applicationDirPath(); QString appDir = QCoreApplication::applicationDirPath();
aceStepPath = settings.value("aceStepPath", appDir + "/acestep.cpp").toString();
qwen3ModelPath = settings.value("qwen3ModelPath", qwen3ModelPath = settings.value("qwen3ModelPath",
appDir + "/acestep.cpp/models/acestep-5Hz-lm-4B-Q8_0.gguf").toString(); appDir + "/acestep.cpp/models/acestep-5Hz-lm-4B-Q8_0.gguf").toString();
textEncoderModelPath = settings.value("textEncoderModelPath", textEncoderModelPath = settings.value("textEncoderModelPath",
@ -183,7 +182,6 @@ void MainWindow::saveSettings()
settings.setValue("shuffleMode", shuffleMode); settings.setValue("shuffleMode", shuffleMode);
// Save path settings // Save path settings
settings.setValue("aceStepPath", aceStepPath);
settings.setValue("qwen3ModelPath", qwen3ModelPath); settings.setValue("qwen3ModelPath", qwen3ModelPath);
settings.setValue("textEncoderModelPath", textEncoderModelPath); settings.setValue("textEncoderModelPath", textEncoderModelPath);
settings.setValue("ditModelPath", ditModelPath); settings.setValue("ditModelPath", ditModelPath);
@ -390,7 +388,6 @@ void MainWindow::on_advancedSettingsButton_clicked()
// Set current values // Set current values
dialog.setJsonTemplate(jsonTemplate); dialog.setJsonTemplate(jsonTemplate);
dialog.setAceStepPath(aceStepPath);
dialog.setQwen3ModelPath(qwen3ModelPath); dialog.setQwen3ModelPath(qwen3ModelPath);
dialog.setTextEncoderModelPath(textEncoderModelPath); dialog.setTextEncoderModelPath(textEncoderModelPath);
dialog.setDiTModelPath(ditModelPath); dialog.setDiTModelPath(ditModelPath);
@ -411,7 +408,6 @@ void MainWindow::on_advancedSettingsButton_clicked()
// Update settings // Update settings
jsonTemplate = dialog.getJsonTemplate(); jsonTemplate = dialog.getJsonTemplate();
aceStepPath = dialog.getAceStepPath();
qwen3ModelPath = dialog.getQwen3ModelPath(); qwen3ModelPath = dialog.getQwen3ModelPath();
textEncoderModelPath = dialog.getTextEncoderModelPath(); textEncoderModelPath = dialog.getTextEncoderModelPath();
ditModelPath = dialog.getDiTModelPath(); ditModelPath = dialog.getDiTModelPath();

View file

@ -50,7 +50,6 @@ class MainWindow : public QMainWindow
QString jsonTemplate; QString jsonTemplate;
// Path settings // Path settings
QString aceStepPath;
QString qwen3ModelPath; QString qwen3ModelPath;
QString textEncoderModelPath; QString textEncoderModelPath;
QString ditModelPath; QString ditModelPath;