Merge 9627188c3c into acd0f11749

add config for macOS 64

INSTALL.md

@@ -20,6 +20,7 @@
   - [Running faceswap](#running-faceswap)
   - [Create a desktop shortcut](#create-a-desktop-shortcut)
   - [Updating faceswap](#updating-faceswap)
+- [macOS x64 (#macos-64-install-guide)
 - [macOS (Apple Silicon) Install Guide](#macos-apple-silicon-install-guide)
   - [Prerequisites](#prerequisites-2)
     - [OS](#os)
@@ -162,6 +163,49 @@ It's good to keep faceswap up to date as new features are added and bugs are fix
 - Enter the faceswap folder: `cd faceswap`
 - Enter the following `git pull --all`
 - Once the latest version has downloaded, make sure your dependencies are up to date. There is a script to help with this: `python update_deps.py`
+# macOS x64 Install Guide
+macOS (Apple Silicon) Install Guide
+
+Prerequisites
+
+OS
+
+macOS 12.0+
+
+XCode Tools
+
+xcode-select --install
+XQuartz
+
+Download and install from:
+
+https://www.xquartz.org/
+Conda
+
+Download and install the latest Conda env from:
+
+https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
+Install Conda:
+
+$ chmod +x ~/Downloads/Miniconda3-latest-MacOSX-x86_64.sh
+$ sh ~/Downloads/Miniconda3-latest-MacOSX-x86_64.sh
+restart shell
+
+Setup
+
+Create and Activate the Environment (with ML acceleration INTEL )
+
+$ conda create --name faceswap python=3.8
+$ conda activate faceswap
+faceswap
+
+Download the faceswap repo and enter the faceswap folder:
+$ git clone --depth 1 https://github.com/deepfakes/faceswap.git
+$ cd faceswap
+Easy install
+
+$ python setup.py
+If you have issues/errors follow the Manual install steps below.
 
 # macOS (Apple Silicon) Install Guide
 

requirements/_requirements_base.txt

@@ -8,6 +8,8 @@ scikit-learn>=1.3.0
 fastcluster>=1.2.6
 matplotlib>=3.8.0
 imageio>=2.33.1
-imageio-ffmpeg>=0.4.9
+# ffmpeg binary >=0.6.0 breaks convert.
+# TODO fix convert to use latest binary
+imageio-ffmpeg>=0.4.9,<0.6.0
 ffmpy>=0.3.0
 pywin32>=305 ; sys_platform == "win32"

setup.py

@@ -13,7 +13,7 @@ import re
 import sys
 import typing as T
 from shutil import which
-from subprocess import list2cmdline, PIPE, Popen, run, STDOUT
+from subprocess import PIPE, Popen, run, STDOUT
 
 from pkg_resources import parse_requirements
 
@@ -1076,7 +1076,9 @@ class Install():  # pylint:disable=too-few-public-methods
         str
             The formatted full package and version string
         """
-        return f"{package}{','.join(''.join(spec) for spec in version)}"
+        retval = f"{package}{','.join(''.join(spec) for spec in version)}"
+        logger.debug("Formatted package \"%s\" version \"%s\" to \"%s'", package, version, retval)
+        return retval
 
     def _install_setup_packages(self) -> None:
         """ Install any packages that are required for the setup.py installer to work. This
@@ -1493,7 +1495,7 @@ class WinPTYInstaller(Installer):  # pylint:disable=too-few-public-methods
                  is_gui: bool) -> None:
         super().__init__(environment, package, command, is_gui)
         self._cmd = which(command[0], path=os.environ.get('PATH', os.defpath))
-        self._cmdline = list2cmdline(command)
+        self._cmdline = " ".join(command)
         logger.debug("cmd: '%s', cmdline: '%s'", self._cmd, self._cmdline)
 
         self._pbar = re.compile(r"(?:eta\s[\d\W]+)|(?:\s+\|\s+\d+%)\Z")