From 6d6eb679d5e8b01ab1648748b8414d22969263af Mon Sep 17 00:00:00 2001 From: toto Date: Sat, 16 Dec 2023 22:13:48 +0800 Subject: [PATCH] update --- __init__.py | 2 +- install.py => portrait/install.py | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) rename install.py => portrait/install.py (85%) diff --git a/__init__.py b/__init__.py index c7a7b37..0daf8ac 100644 --- a/__init__.py +++ b/__init__.py @@ -3,7 +3,7 @@ import os, sys main_path = os.path.dirname(__file__) sys.path.append(main_path) -import install +import portrait.install import requests from tqdm import tqdm from portrait.nodes import * diff --git a/install.py b/portrait/install.py similarity index 85% rename from install.py rename to portrait/install.py index 1f25c14..fb52c6b 100644 --- a/install.py +++ b/portrait/install.py @@ -1,6 +1,4 @@ -import platform import os -import shutil import sys import subprocess import threading @@ -13,6 +11,9 @@ sys.path.append(main_path) windows_not_install = ['mmcv_full\n'] +def log(msg): + print('toto==============', msg) + def handle_stream(stream, is_stdout): stream.reconfigure(encoding=locale.getpreferredencoding(), errors='replace') @@ -67,15 +68,20 @@ def is_installed(name): return result def check_and_install_requirements(file_path): - print(f"req_path: {file_path}") + log(file_path) if os.path.exists(file_path): with open(file_path, 'r') as file: lines = file.readlines() for line in lines: - if platform.system() == "Windows" and line in windows_not_install: - continue - else: - process_wrap(pip_install + [line], cwd=main_path) + log(line) + if not is_installed(line): + if platform.system() == "Windows" and line in windows_not_install: + log(f"windows skip {line}") + continue + else: + log(f"install {line}") + continue + process_wrap(pip_install + [line], cwd=main_path) return False return True