From b2c3721462ffd73c43afc10b5f5c51b060208ed8 Mon Sep 17 00:00:00 2001 From: Ilian Iliev Date: Sun, 14 May 2023 13:20:24 +0300 Subject: [PATCH 1/4] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e2c7528..afd72b2 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,7 @@ Use *Install from URL* option with this repo url. - dlib==19.24.0 - setuptools -All requirements will be installed on first use, except for: - - [cmake](https://cmake.org/download/) - used only for dlib masks +All requirements will be installed on first use. **NOTE:** Some of these packages are incompatible with newer versions of **lightning-utilities** and **pytorch-lightning**. If some other extensions you use require newer versions, they will be incompatible with this extension. @@ -56,4 +55,4 @@ All requirements will be installed on first use, except for: ### Contributing -Feel free to submit PRs to develop! \ No newline at end of file +Feel free to submit PRs to develop! From 806e7f71f078d815afa492b5f40009851d1d6b3c Mon Sep 17 00:00:00 2001 From: Ilian Iliev Date: Sun, 14 May 2023 13:26:19 +0300 Subject: [PATCH 2/4] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index afd72b2..0d150b1 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ Use *Install from URL* option with this repo url. - pytorch-lightning==1.7.6 - dlib==19.24.0 - setuptools +- cmake All requirements will be installed on first use. From 13fe7c48bf9a38a5b342c409d1a3059f5a0d5c6e Mon Sep 17 00:00:00 2001 From: "ilian.iliev" Date: Sun, 14 May 2023 20:30:14 +0300 Subject: [PATCH 3/4] Fixed openmim version removed --- install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.py b/install.py index fa10a54..edbc969 100644 --- a/install.py +++ b/install.py @@ -56,8 +56,8 @@ if not is_installed("dlib"): if not is_installed("mmdet"): - run(f'"{python}" -m pip install openmim==0.3.5', desc="Installing openmim", errdesc="Couldn't install openmim") - run(f'"{python}" -m mim install mmcv-full==1.7.1', desc=f"Installing mmcv-full", errdesc=f"Couldn't install mmcv-full") + run(f'"{python}" -m pip install openmim', desc="Installing openmim", errdesc="Couldn't install openmim") + run(f'"{python}" -m mim install mmcv-full', desc=f"Installing mmcv-full", errdesc=f"Couldn't install mmcv-full") run(f'"{python}" -m pip install mmdet==2.27.0', desc=f"Installing mmdet", errdesc=f"Couldn't install mmdet") if (len(list_models(dd_models_path)) == 0): From 82ca7bcf8617e404a7fbb4a24ce0cc5275d0f4aa Mon Sep 17 00:00:00 2001 From: "ilian.iliev" Date: Sun, 14 May 2023 21:21:57 +0300 Subject: [PATCH 4/4] openmim install moved first --- install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.py b/install.py index edbc969..943e995 100644 --- a/install.py +++ b/install.py @@ -37,6 +37,7 @@ def list_models(model_path): python = sys.executable +run(f'"{python}" -m pip install -U openmim', desc=None, errdesc="Couldn't install openmim") run(f'"{python}" -m pip install lightning-utilities==0.4.0', desc=None, errdesc=f"Couldn't install lightning-utilities") run(f'"{python}" -m pip install pytorch-lightning==1.7.6', desc=None, errdesc=f"Couldn't install pytorch-lightning") @@ -56,7 +57,6 @@ if not is_installed("dlib"): if not is_installed("mmdet"): - run(f'"{python}" -m pip install openmim', desc="Installing openmim", errdesc="Couldn't install openmim") run(f'"{python}" -m mim install mmcv-full', desc=f"Installing mmcv-full", errdesc=f"Couldn't install mmcv-full") run(f'"{python}" -m pip install mmdet==2.27.0', desc=f"Installing mmdet", errdesc=f"Couldn't install mmdet")