From 34839e8da0efa8e8296acb938d91d16b690e66de Mon Sep 17 00:00:00 2001 From: henryruhs Date: Sat, 3 Feb 2024 17:17:58 +0100 Subject: [PATCH 1/4] Add next --- install.js | 2 +- package.json | 2 +- pinokio.js | 2 +- update.js | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/install.js b/install.js index 00ea82c..5de9384 100644 --- a/install.js +++ b/install.js @@ -49,7 +49,7 @@ module.exports = async kernel => method: 'shell.run', params: { - message: 'git clone https://github.com/facefusion/facefusion --branch 2.2.1 --single-branch' + message: 'git clone https://github.com/facefusion/facefusion --branch next --single-branch' } }, { diff --git a/package.json b/package.json index 51df261..26eef2a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "facefusion-pinokio", "description": "Next generation face swapper and enhancer", - "version": "2.2.1", + "version": "next", "license": "MIT", "devDependencies": { diff --git a/pinokio.js b/pinokio.js index a0bcbd6..3440c02 100644 --- a/pinokio.js +++ b/pinokio.js @@ -1,7 +1,7 @@ module.exports = { version: '1', - title: 'FaceFusion 2.2.1', + title: 'FaceFusion NEXT', description: 'Next generation face swapper and enhancer', icon: 'icon.png', menu: require(__dirname + '/menu.js') diff --git a/update.js b/update.js index 063de02..b2e78bf 100644 --- a/update.js +++ b/update.js @@ -15,7 +15,7 @@ module.exports = () => method: 'shell.run', params: { - message: 'git pull origin 2.2.1', + message: 'git pull origin next', path: 'facefusion' } }, @@ -23,7 +23,7 @@ module.exports = () => method: 'shell.run', params: { - message: 'git checkout 2.2.1', + message: 'git checkout next', path: 'facefusion' } } From d65ae2e6bf7296395d6cc366faa90754df76680b Mon Sep 17 00:00:00 2001 From: henryruhs Date: Sat, 3 Feb 2024 18:03:18 +0100 Subject: [PATCH 2/4] Adjust instal script --- install.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/install.js b/install.js index 5de9384..b589e3f 100644 --- a/install.js +++ b/install.js @@ -4,10 +4,6 @@ function install(kernel) if (platform === 'darwin') { - if (arch === 'arm64') - { - return 'python install.py --onnxruntime coreml-silicon --torch default --skip-venv'; - } return 'python install.py --onnxruntime default --torch default --skip-venv'; } if ([ 'linux', 'win32' ].includes(platform) && gpu === 'nvidia') From d9263f9ddcef47dfca353d6282dc508b4ee677be Mon Sep 17 00:00:00 2001 From: henryruhs Date: Sat, 3 Feb 2024 18:05:37 +0100 Subject: [PATCH 3/4] Fix lint --- install.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.js b/install.js index b589e3f..e348de7 100644 --- a/install.js +++ b/install.js @@ -1,6 +1,6 @@ function install(kernel) { - const { platform, arch, gpu } = kernel; + const { platform, gpu } = kernel; if (platform === 'darwin') { From 0b6cab1a9e423d444299e21941c33cc0a58077ce Mon Sep 17 00:00:00 2001 From: henryruhs Date: Wed, 14 Feb 2024 19:40:25 +0100 Subject: [PATCH 4/4] Updates for 2.3.0 --- install.js | 6 +++--- package.json | 2 +- pinokio.js | 2 +- update.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/install.js b/install.js index e348de7..987a799 100644 --- a/install.js +++ b/install.js @@ -8,13 +8,13 @@ function install(kernel) } if ([ 'linux', 'win32' ].includes(platform) && gpu === 'nvidia') { - return 'python install.py --onnxruntime cuda --torch cuda --skip-venv'; + return 'python install.py --onnxruntime cuda-11.8 --torch cuda-11.8 --skip-venv'; } if (gpu === 'amd') { if (platform === 'linux') { - return 'python install.py --onnxruntime rocm --torch rocm --skip-venv'; + return 'python install.py --onnxruntime rocm-5.4.2 --torch rocm-5.4.2 --skip-venv'; } if (platform === 'win32') { @@ -45,7 +45,7 @@ module.exports = async kernel => method: 'shell.run', params: { - message: 'git clone https://github.com/facefusion/facefusion --branch next --single-branch' + message: 'git clone https://github.com/facefusion/facefusion --branch 2.3.0 --single-branch' } }, { diff --git a/package.json b/package.json index 26eef2a..c924446 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "facefusion-pinokio", "description": "Next generation face swapper and enhancer", - "version": "next", + "version": "2.3.0", "license": "MIT", "devDependencies": { diff --git a/pinokio.js b/pinokio.js index 3440c02..6b986fe 100644 --- a/pinokio.js +++ b/pinokio.js @@ -1,7 +1,7 @@ module.exports = { version: '1', - title: 'FaceFusion NEXT', + title: 'FaceFusion 2.3.0', description: 'Next generation face swapper and enhancer', icon: 'icon.png', menu: require(__dirname + '/menu.js') diff --git a/update.js b/update.js index b2e78bf..94bad5a 100644 --- a/update.js +++ b/update.js @@ -15,7 +15,7 @@ module.exports = () => method: 'shell.run', params: { - message: 'git pull origin next', + message: 'git pull origin 2.3.0', path: 'facefusion' } }, @@ -23,7 +23,7 @@ module.exports = () => method: 'shell.run', params: { - message: 'git checkout next', + message: 'git checkout 2.3.0', path: 'facefusion' } }