Merge branch 'staging' of https://github.com/deepfakes/faceswap into …

…staging

lib/sysinfo.py

@@ -344,10 +344,9 @@ def full_info(self):
             retval += ("{0: <20} {1}\n".format(key + ":", sys_info[key]))
         retval += "\n=============== Pip Packages ===============\n"
         retval += self.installed_pip
-        if not self.is_conda:
-            return retval
-        retval += "\n\n============== Conda Packages ==============\n"
-        retval += self.installed_conda
+        if self.is_conda:
+            retval += "\n\n============== Conda Packages ==============\n"
+            retval += self.installed_conda
         retval += self.state_file
         retval += "\n\n================= Configs =================="
         retval += self.configs

plugins/train/trainer/_base.py

@@ -333,12 +333,11 @@ def compile_sample(self, batch_size, samples=None, images=None):
         num_images = min(batch_size, num_images) if batch_size is not None else num_images
         logger.debug("Compiling samples: (side: '%s', samples: %s)", self.side, num_images)
         images = images if images is not None else self.target
-        samples = [samples[0:num_images]] if samples is not None else [self.samples[0:num_images]]
+        retval = [samples[0:num_images]] if samples is not None else [self.samples[0:num_images]]
         if self.use_mask:
-            retval = [tgt[0:num_images] for tgt in images]
+            retval.extend(tgt[0:num_images] for tgt in images)
         else:
-            retval = [images[0:num_images]]
-        retval = samples + retval
+            retval.extend(images[0:num_images])
         return retval
 
     def compile_timelapse_sample(self):

scripts/train.py

@@ -16,7 +16,7 @@
 from lib.keypress import KBHit
 from lib.multithreading import MultiThread
 from lib.queue_manager import queue_manager  # noqa pylint:disable=unused-import
-from lib.utils import get_folder, get_image_paths, set_system_verbosity
+from lib.utils import get_folder, get_image_paths, set_system_verbosity, deprecation_warning
 from plugins.plugin_loader import PluginLoader
 
 logger = logging.getLogger(__name__)  # pylint: disable=invalid-name
@@ -90,6 +90,16 @@ def process(self):
         """ Call the training process object """
         logger.debug("Starting Training Process")
         logger.info("Training data directory: %s", self.args.model_dir)
+
+        # TODO Move these args to config and remove these deprecation warnings
+        if hasattr(self.args, "warp_to_landmarks") and self.args.warp_to_landmarks:
+            deprecation_warning("`-wl`, ``--warp-to-landmarks``",
+                                additional_info="This option will be available within training "
+                                                "config settings (/config/train.ini).")
+        if hasattr(self.args, "no_augment_color") and self.args.no_flip:
+            deprecation_warning("`-nac`, ``--no-augment-color``",
+                                additional_info="This option will be available within training "
+                                                "config settings (/config/train.ini).")
         set_system_verbosity(self.args.loglevel)
         thread = self.start_thread()
         # queue_manager.debug_monitor(1)