From d768114f79077b2a923e8cf1f96895e0cd1a5cd5 Mon Sep 17 00:00:00 2001 From: udon-universe <128375799+udon-universe@users.noreply.github.com> Date: Tue, 2 May 2023 01:29:56 +0900 Subject: [PATCH 1/3] fix duplicate log and refactor --- install.py | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/install.py b/install.py index d3f2d1e..aa22a4c 100644 --- a/install.py +++ b/install.py @@ -1,28 +1,19 @@ import launch -if not launch.is_installed("onnx"): - launch.run_pip("install onnx", "Installing onnx...") +packages = [ + "onnx", + "onnxruntime-gpu", + "opencv-python", + "numpy", + "Pillow", + "segmentation-refinement", + "scikit-learn", + "clip", +] -if not launch.is_installed("onnxruntime-gpu"): - launch.run_pip("install onnxruntime-gpu", "Installing onnxruntime-gpu...") - -if not launch.is_installed("opencv-python"): - launch.run_pip("install opencv-python", "Installing opencv-python...") - -if not launch.is_installed("numpy"): - launch.run_pip("install numpy", "Installing numpy...") - -if not launch.is_installed("Pillow"): - launch.run_pip("install Pillow", "Installing Pillow...") - -if not launch.is_installed("segmentation-refinement"): - launch.run_pip("install segmentation-refinement", "Installing segmentation-refinement...") - -if not launch.is_installed("scikit-learn"): - launch.run_pip("install scikit-learn", "Installing scikit-learn...") - -if not launch.is_installed("clip"): - launch.run_pip("install clip", "Installing clip...") +for package in packages: + if not launch.is_installed(package): + launch.run_pip(f'install {package}', desc=package) if not launch.is_installed("segment_anything"): - launch.run_pip("install git+https://github.com/facebookresearch/segment-anything.git", "Installing segment_anything...") \ No newline at end of file + launch.run_pip("install git+https://github.com/facebookresearch/segment-anything.git", desc="segment_anything") From 87c9ba24176027e667540f70b49621d70b3bda69 Mon Sep 17 00:00:00 2001 From: udon-universe <128375799+udon-universe@users.noreply.github.com> Date: Tue, 2 May 2023 01:34:34 +0900 Subject: [PATCH 2/3] add extension name --- install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.py b/install.py index aa22a4c..710e1ed 100644 --- a/install.py +++ b/install.py @@ -13,7 +13,7 @@ packages = [ for package in packages: if not launch.is_installed(package): - launch.run_pip(f'install {package}', desc=package) + launch.run_pip(f'install {package}', desc=f'{package} for PBRemTools') if not launch.is_installed("segment_anything"): launch.run_pip("install git+https://github.com/facebookresearch/segment-anything.git", desc="segment_anything") From 7ef420e15c52c2a07a35024c1b62bd8b36a59cea Mon Sep 17 00:00:00 2001 From: udon-universe <128375799+udon-universe@users.noreply.github.com> Date: Tue, 2 May 2023 01:43:18 +0900 Subject: [PATCH 3/3] add extension name --- install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.py b/install.py index 710e1ed..bc238a2 100644 --- a/install.py +++ b/install.py @@ -16,4 +16,4 @@ for package in packages: launch.run_pip(f'install {package}', desc=f'{package} for PBRemTools') if not launch.is_installed("segment_anything"): - launch.run_pip("install git+https://github.com/facebookresearch/segment-anything.git", desc="segment_anything") + launch.run_pip("install git+https://github.com/facebookresearch/segment-anything.git", desc="segment_anything for PBRemTools")