diff --git a/INSTALL.md b/INSTALL.md index 9c0cc63..719024b 100755 --- a/INSTALL.md +++ b/INSTALL.md @@ -95,7 +95,7 @@ Reboot your PC, so that everything you have just installed gets registered. - Give it the name: faceswap - **IMPORTANT**: Select python version 3.8 - Hit "Create" (NB: This may take a while as it will need to download Python) -![Anaconda virtual env setup](https://i.imgur.com/59RHnLs.png) +![Anaconda virtual env setup](https://i.imgur.com/CLIDDfa.png) #### Entering your virtual environment To enter the virtual environment: @@ -155,7 +155,7 @@ Obtain git for your distribution from the [git website](https://git-scm.com/down The recommended install method is to use a Conda3 Environment as this will handle the installation of Nvidia's CUDA and cuDNN straight into your Conda Environment. This is by far the easiest and most reliable way to setup the project. - MiniConda3 is recommended: [MiniConda3](https://docs.conda.io/en/latest/miniconda.html) -Alternatively you can install Python (>= 3.6-3.8 64-bit) for your distribution (links below.) If you go down this route and are using an Nvidia GPU you should install CUDA (https://developer.nvidia.com/cuda-zone) and cuDNN (https://developer.nvidia.com/cudnn). for your system. If you do not plan to build Tensorflow yourself, make sure you install no higher than version 10.0 of CUDA and 7.5.x of CUDNN. +Alternatively you can install Python (>= 3.7-3.8 64-bit) for your distribution (links below.) If you go down this route and are using an Nvidia GPU you should install CUDA (https://developer.nvidia.com/cuda-zone) and cuDNN (https://developer.nvidia.com/cudnn). for your system. If you do not plan to build Tensorflow yourself, make sure you install no higher than version 10.0 of CUDA and 7.5.x of CUDNN. - Python distributions: - apt/yum install python3 (Linux) - [Installer](https://www.python.org/downloads/release/python-368/) (Windows) @@ -193,7 +193,7 @@ CUDA with Docker in 20 minutes. INFO The tool provides tips for installation and installs required python packages INFO Setup in Linux 4.14.39-1-MANJARO -INFO Installed Python: 3.6.5 64bit +INFO Installed Python: 3.7.5 64bit INFO Installed PIP: 10.0.1 Enable Docker? [Y/n] INFO Docker Enabled @@ -241,7 +241,7 @@ A successful setup log, without docker. INFO The tool provides tips for installation and installs required python packages INFO Setup in Linux 4.14.39-1-MANJARO -INFO Installed Python: 3.6.5 64bit +INFO Installed Python: 3.7.5 64bit INFO Installed PIP: 10.0.1 Enable Docker? [Y/n] n INFO Docker Disabled diff --git a/faceswap.py b/faceswap.py index 9f60adc..fa755a8 100755 --- a/faceswap.py +++ b/faceswap.py @@ -6,9 +6,9 @@ from lib.cli import args from lib.config import generate_configs if sys.version_info[0] < 3: - raise Exception("This program requires at least python3.6") -if sys.version_info[0] == 3 and sys.version_info[1] < 6: - raise Exception("This program requires at least python3.6") + raise Exception("This program requires at least python3.7") +if sys.version_info[0] == 3 and sys.version_info[1] < 7: + raise Exception("This program requires at least python3.7") _PARSER = args.FullHelpArgumentParser() diff --git a/setup.py b/setup.py index 62f43e8..60ffdf4 100755 --- a/setup.py +++ b/setup.py @@ -166,9 +166,9 @@ class Environment(): self.output.info("Installed Python: {0} {1}".format(self.py_version[0], self.py_version[1])) if not (self.py_version[0].split(".")[0] == "3" - and self.py_version[0].split(".")[1] in ("6", "7", "8") + and self.py_version[0].split(".")[1] in ("7", "8") and self.py_version[1] == "64bit") and not self.updater: - self.output.error("Please run this script with Python version 3.6, 3.7 or 3.8 " + self.output.error("Please run this script with Python version 3.7 or 3.8 " "64bit and try again.") sys.exit(1)