From aed3d08ba12b897995e76fc50e991810c4d4922f Mon Sep 17 00:00:00 2001 From: henryruhs Date: Sun, 22 Sep 2024 11:19:40 +0200 Subject: [PATCH 1/6] Move over to local conda env --- install.js | 6 +++--- run.js | 2 +- update.js | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/install.js b/install.js index 2a1c2c9..67734a6 100644 --- a/install.js +++ b/install.js @@ -45,7 +45,7 @@ module.exports = async kernel => message: 'conda install conda-forge::openvino=2024.3.0 --yes', conda: { - name: 'facefusion' + path: 'facefusion/.env' } } }, @@ -57,7 +57,7 @@ module.exports = async kernel => message: 'conda install conda-forge::cuda-runtime=12.4.1 cudnn=9.2.1.18 --yes', conda: { - name: 'facefusion' + path: 'facefusion/.env' } } }, @@ -73,7 +73,7 @@ module.exports = async kernel => }, conda: { - name: 'facefusion' + path: 'facefusion/.env' } } }, diff --git a/run.js b/run.js index 1eb610a..90714c3 100644 --- a/run.js +++ b/run.js @@ -27,7 +27,7 @@ module.exports = () => path: 'facefusion', conda: { - name: 'facefusion' + path: 'facefusion/.env' }, on: [ diff --git a/update.js b/update.js index 49f80ea..b5dacb1 100644 --- a/update.js +++ b/update.js @@ -32,4 +32,3 @@ module.exports = () => return config; }; - From 9b73142bd2ad356131f6b596b7dd931bd91a45d0 Mon Sep 17 00:00:00 2001 From: henryruhs Date: Sun, 22 Sep 2024 11:23:05 +0200 Subject: [PATCH 2/6] Move over to local conda env --- menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu.js b/menu.js index f7094cf..9c3cf9a 100644 --- a/menu.js +++ b/menu.js @@ -4,7 +4,7 @@ module.exports = async kernel => { const menu = []; - if (!await kernel.exists(__dirname, 'facefusion', '.git')) + if (!await kernel.exists(__dirname, 'facefusion', '.env')) { menu.push( { From 9ba46a3effdf23965ec940a8cb005048d5e71c9f Mon Sep 17 00:00:00 2001 From: henryruhs Date: Sun, 22 Sep 2024 11:47:21 +0200 Subject: [PATCH 3/6] Move over to local conda env part2 --- install.js | 6 +++--- menu.js | 2 +- run.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/install.js b/install.js index 67734a6..fa4818c 100644 --- a/install.js +++ b/install.js @@ -45,7 +45,7 @@ module.exports = async kernel => message: 'conda install conda-forge::openvino=2024.3.0 --yes', conda: { - path: 'facefusion/.env' + path: '.env' } } }, @@ -57,7 +57,7 @@ module.exports = async kernel => message: 'conda install conda-forge::cuda-runtime=12.4.1 cudnn=9.2.1.18 --yes', conda: { - path: 'facefusion/.env' + path: '.env' } } }, @@ -73,7 +73,7 @@ module.exports = async kernel => }, conda: { - path: 'facefusion/.env' + path: '.env' } } }, diff --git a/menu.js b/menu.js index 9c3cf9a..968e7ed 100644 --- a/menu.js +++ b/menu.js @@ -4,7 +4,7 @@ module.exports = async kernel => { const menu = []; - if (!await kernel.exists(__dirname, 'facefusion', '.env')) + if (!await kernel.exists(__dirname, '.env')) { menu.push( { diff --git a/run.js b/run.js index 90714c3..268db19 100644 --- a/run.js +++ b/run.js @@ -27,7 +27,7 @@ module.exports = () => path: 'facefusion', conda: { - path: 'facefusion/.env' + path: '.env' }, on: [ From e9314c27973fc3dd79bce1372282c9a8ef07fc0d Mon Sep 17 00:00:00 2001 From: henryruhs Date: Sun, 22 Sep 2024 12:03:09 +0200 Subject: [PATCH 4/6] Move over to local conda env part3 --- reset.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/reset.js b/reset.js index 5d74c4d..847104a 100644 --- a/reset.js +++ b/reset.js @@ -10,6 +10,13 @@ module.exports = () => { 'path': 'facefusion' } + }, +{ + method: 'fs.rm', + params: + { + 'path': '.env' + } } ] }; From 670d8b68aa88ca06e31f7da019e1a0f54b831534 Mon Sep 17 00:00:00 2001 From: henryruhs Date: Sun, 22 Sep 2024 12:06:35 +0200 Subject: [PATCH 5/6] Add DefaultWithJobs --- menu.js | 2 +- run.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/menu.js b/menu.js index 968e7ed..854646c 100644 --- a/menu.js +++ b/menu.js @@ -25,8 +25,8 @@ module.exports = async kernel => { [ [ 'fa-solid fa-power-off', 'Run Default', 'Default' ], + [ 'fa-solid fa-robot', 'Run Default With Jobs', 'DefaultWithJobs' ], [ 'fa-solid fa-gauge', 'Run Benchmark', 'Benchmark' ], - [ 'fa-solid fa-robot', 'Run Jobs', 'Jobs' ], [ 'fa-solid fa-camera', 'Run Webcam', 'Webcam' ] ] .forEach(([ icon, text, mode ]) => diff --git a/run.js b/run.js index 268db19..9176317 100644 --- a/run.js +++ b/run.js @@ -6,8 +6,8 @@ module.exports = () => cmd: { Default: 'python facefusion.py run', + DefaultWithJobs: 'python facefusion.py run --ui-layouts default jobs', Benchmark: 'python facefusion.py run --ui-layouts benchmark', - Jobs: 'python facefusion.py run --ui-layouts jobs', Webcam: 'python facefusion.py run --ui-layouts webcam' }, run: @@ -58,7 +58,7 @@ module.exports = () => params: { uri: '{{ local.url }}', - name: 'Share local' + name: 'Share Local' } } ] From 73ca55cdb5bfa722321930cd84fd75e980ebdf0a Mon Sep 17 00:00:00 2001 From: henryruhs Date: Sun, 22 Sep 2024 13:06:13 +0200 Subject: [PATCH 6/6] Add DefaultWithJobs --- menu.js | 2 +- run.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/menu.js b/menu.js index 854646c..a32376f 100644 --- a/menu.js +++ b/menu.js @@ -25,7 +25,7 @@ module.exports = async kernel => { [ [ 'fa-solid fa-power-off', 'Run Default', 'Default' ], - [ 'fa-solid fa-robot', 'Run Default With Jobs', 'DefaultWithJobs' ], + [ 'fa-solid fa-robot', 'Run Default+Jobs', 'Default+Jobs' ], [ 'fa-solid fa-gauge', 'Run Benchmark', 'Benchmark' ], [ 'fa-solid fa-camera', 'Run Webcam', 'Webcam' ] ] diff --git a/run.js b/run.js index 9176317..f4aaa52 100644 --- a/run.js +++ b/run.js @@ -5,10 +5,10 @@ module.exports = () => daemon: true, cmd: { - Default: 'python facefusion.py run', - DefaultWithJobs: 'python facefusion.py run --ui-layouts default jobs', - Benchmark: 'python facefusion.py run --ui-layouts benchmark', - Webcam: 'python facefusion.py run --ui-layouts webcam' + 'Default': 'python facefusion.py run', + 'Default+Jobs': 'python facefusion.py run --ui-layouts default jobs', + 'Benchmark': 'python facefusion.py run --ui-layouts benchmark', + 'Webcam': 'python facefusion.py run --ui-layouts webcam' }, run: [