mirror of
https://github.com/deepfakes/faceswap
synced 2025-06-07 10:43:27 -04:00
Fixups
- Deprecations - display correct long argument - Minor spelling + linting
This commit is contained in:
parent
dce7d98302
commit
696692dc08
11 changed files with 33 additions and 33 deletions
|
@ -71,7 +71,7 @@ class ExtractConvertArgs(FaceSwapArgs):
|
||||||
"action": FileFullPaths,
|
"action": FileFullPaths,
|
||||||
"filetypes": "alignments",
|
"filetypes": "alignments",
|
||||||
"type": str,
|
"type": str,
|
||||||
"dest": "depr_alignments_path_al_p",
|
"dest": "depr_alignments_al_p",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
return argument_list
|
return argument_list
|
||||||
|
|
||||||
|
@ -391,12 +391,12 @@ class ExtractArgs(ExtractConvertArgs):
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-min", ),
|
"opts": ("-min", ),
|
||||||
"type": int,
|
"type": int,
|
||||||
"dest": "depr_min_size_min_m",
|
"dest": "depr_min-size_min_m",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-een", ),
|
"opts": ("-een", ),
|
||||||
"type": int,
|
"type": int,
|
||||||
"dest": "depr_extract_every_n_een_N",
|
"dest": "depr_extract-every-n_een_N",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-nm",),
|
"opts": ("-nm",),
|
||||||
|
@ -407,7 +407,7 @@ class ExtractArgs(ExtractConvertArgs):
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-rf", ),
|
"opts": ("-rf", ),
|
||||||
"type": int,
|
"type": int,
|
||||||
"dest": "depr_re_feed_rf_R",
|
"dest": "depr_re-feed_rf_R",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-sz", ),
|
"opts": ("-sz", ),
|
||||||
|
@ -417,12 +417,12 @@ class ExtractArgs(ExtractConvertArgs):
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-si", ),
|
"opts": ("-si", ),
|
||||||
"type": int,
|
"type": int,
|
||||||
"dest": "depr_save_interval_si_v",
|
"dest": "depr_save-interval_si_v",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-dl", ),
|
"opts": ("-dl", ),
|
||||||
"action": "store_true",
|
"action": "store_true",
|
||||||
"dest": "depr_debug_landmarks_dl_B",
|
"dest": "depr_debug-landmarks_dl_B",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-sp", ),
|
"opts": ("-sp", ),
|
||||||
|
@ -432,12 +432,12 @@ class ExtractArgs(ExtractConvertArgs):
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-sf", ),
|
"opts": ("-sf", ),
|
||||||
"action": "store_true",
|
"action": "store_true",
|
||||||
"dest": "depr_skip_faces_sf_e",
|
"dest": "depr_skip-existing-faces_sf_e",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-ssf", ),
|
"opts": ("-ssf", ),
|
||||||
"action": "store_true",
|
"action": "store_true",
|
||||||
"dest": "depr_skip_saving_faces_ssf_K",
|
"dest": "depr_skip-saving-faces_ssf_K",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
return argument_list
|
return argument_list
|
||||||
|
|
||||||
|
@ -726,22 +726,22 @@ class ConvertArgs(ExtractConvertArgs):
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-ref", ),
|
"opts": ("-ref", ),
|
||||||
"type": str,
|
"type": str,
|
||||||
"dest": "depr_reference_video_ref_r",
|
"dest": "depr_reference-video_ref_r",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-fr", ),
|
"opts": ("-fr", ),
|
||||||
"type": str,
|
"type": str,
|
||||||
"nargs": "+",
|
"nargs": "+",
|
||||||
"dest": "depr_frame_ranges_fr_R",
|
"dest": "depr_frame-ranges_fr_R",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-osc", ),
|
"opts": ("-osc", ),
|
||||||
"type": int,
|
"type": int,
|
||||||
"dest": "depr_output_scale_osc_O",
|
"dest": "depr_output-scale_osc_O",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-otf", ),
|
"opts": ("-otf", ),
|
||||||
"action": "store_true",
|
"action": "store_true",
|
||||||
"dest": "depr_on_the_fly_otf_T",
|
"dest": "depr_on-the-fly_otf_T",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
return argument_list
|
return argument_list
|
||||||
|
|
|
@ -327,7 +327,7 @@ class TrainArgs(FaceSwapArgs):
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-bs", ),
|
"opts": ("-bs", ),
|
||||||
"type": int,
|
"type": int,
|
||||||
"dest": "depr_batch_size_bs_b",
|
"dest": "depr_batch-size_bs_b",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-it", ),
|
"opts": ("-it", ),
|
||||||
|
@ -337,46 +337,46 @@ class TrainArgs(FaceSwapArgs):
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-nl", ),
|
"opts": ("-nl", ),
|
||||||
"action": "store_true",
|
"action": "store_true",
|
||||||
"dest": "depr_no_logs_nl_n",
|
"dest": "depr_no-logs_nl_n",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-ss", ),
|
"opts": ("-ss", ),
|
||||||
"type": int,
|
"type": int,
|
||||||
"dest": "depr_snapshot_interval_ss_I",
|
"dest": "depr_snapshot-interval_ss_I",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-tia", ),
|
"opts": ("-tia", ),
|
||||||
"type": str,
|
"type": str,
|
||||||
"dest": "depr_timelapse_input_a_tia_x",
|
"dest": "depr_timelapse-input-A_tia_x",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-tib", ),
|
"opts": ("-tib", ),
|
||||||
"type": str,
|
"type": str,
|
||||||
"dest": "depr_timelapse_input_b_tib_y",
|
"dest": "depr_timelapse-input-B_tib_y",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-to", ),
|
"opts": ("-to", ),
|
||||||
"type": str,
|
"type": str,
|
||||||
"dest": "depr_timelapse_output_to_z",
|
"dest": "depr_timelapse-output_to_z",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-wl", ),
|
"opts": ("-wl", ),
|
||||||
"action": "store_true",
|
"action": "store_true",
|
||||||
"dest": "depr_warp_to_landmarks_wl_M",
|
"dest": "depr_warp-to-landmarks_wl_M",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-nf", ),
|
"opts": ("-nf", ),
|
||||||
"action": "store_true",
|
"action": "store_true",
|
||||||
"dest": "depr_no_flip_nf_P",
|
"dest": "depr_no-flip_nf_P",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-nac", ),
|
"opts": ("-nac", ),
|
||||||
"action": "store_true",
|
"action": "store_true",
|
||||||
"dest": "depr_no_augment_color_nac_c",
|
"dest": "depr_no-augment-color_nac_c",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-nw", ),
|
"opts": ("-nw", ),
|
||||||
"action": "store_true",
|
"action": "store_true",
|
||||||
"dest": "depr_no_warp_nw_W",
|
"dest": "depr_no-warp_nw_W",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
return argument_list
|
return argument_list
|
||||||
|
|
|
@ -25,7 +25,7 @@ class AugConstants: # pylint:disable=too-many-instance-attributes,too-few-publi
|
||||||
----------
|
----------
|
||||||
config: dict[str, ConfigValueType]
|
config: dict[str, ConfigValueType]
|
||||||
The user training configuration options
|
The user training configuration options
|
||||||
pricessing_size: int:
|
processing_size: int:
|
||||||
The size of image to augment the data for
|
The size of image to augment the data for
|
||||||
batch_size: int
|
batch_size: int
|
||||||
The batch size that augmented data is being prepared for
|
The batch size that augmented data is being prepared for
|
||||||
|
|
|
@ -479,7 +479,7 @@ class _Samples(): # pylint:disable=too-few-public-methods
|
||||||
logger.debug("Resizing sample: (side: '%s', sample.shape: %s, target_size: %s, scale: %s)",
|
logger.debug("Resizing sample: (side: '%s', sample.shape: %s, target_size: %s, scale: %s)",
|
||||||
side, sample.shape, target_size, scale)
|
side, sample.shape, target_size, scale)
|
||||||
interpn = cv2.INTER_CUBIC if scale > 1.0 else cv2.INTER_AREA
|
interpn = cv2.INTER_CUBIC if scale > 1.0 else cv2.INTER_AREA
|
||||||
retval = np.array([cv2.resize(img, (target_size, target_size), interpn)
|
retval = np.array([cv2.resize(img, (target_size, target_size), interpolation=interpn)
|
||||||
for img in sample])
|
for img in sample])
|
||||||
logger.debug("Resized sample: (side: '%s' shape: %s)", side, retval.shape)
|
logger.debug("Resized sample: (side: '%s' shape: %s)", side, retval.shape)
|
||||||
return retval
|
return retval
|
||||||
|
|
|
@ -53,7 +53,7 @@ def finalize(images_found: int, num_faces_detected: int, verify_output: bool) ->
|
||||||
logger.info("Double check your results.")
|
logger.info("Double check your results.")
|
||||||
logger.info("-------------------------")
|
logger.info("-------------------------")
|
||||||
|
|
||||||
logger.info("Process Succesfully Completed. Shutting Down...")
|
logger.info("Process Successfully Completed. Shutting Down...")
|
||||||
|
|
||||||
|
|
||||||
class Alignments(AlignmentsBase):
|
class Alignments(AlignmentsBase):
|
||||||
|
|
|
@ -208,17 +208,17 @@ class AlignmentsArgs(FaceSwapArgs):
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-fc", ),
|
"opts": ("-fc", ),
|
||||||
"type": str,
|
"type": str,
|
||||||
"dest": "depr_faces_dir_fc_c",
|
"dest": "depr_faces_folder_fc_c",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-fr", ),
|
"opts": ("-fr", ),
|
||||||
"type": str,
|
"type": str,
|
||||||
"dest": "depr_extract_every_n_een_N",
|
"dest": "depr_extract-every-n_een_N",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-een", ),
|
"opts": ("-een", ),
|
||||||
"type": int,
|
"type": int,
|
||||||
"dest": "depr_frames_dir_fr_r",
|
"dest": "depr_faces_folder_fr_r",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-sz", ),
|
"opts": ("-sz", ),
|
||||||
|
|
|
@ -211,7 +211,7 @@ class EffmpegArgs(FaceSwapArgs):
|
||||||
"opts": ("-ef", ),
|
"opts": ("-ef", ),
|
||||||
"type": str,
|
"type": str,
|
||||||
"choices": IMAGE_EXTENSIONS,
|
"choices": IMAGE_EXTENSIONS,
|
||||||
"dest": "depr_extract_ext_et_E",
|
"dest": "depr_extract-filetype_et_E",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ('-tr', ),
|
"opts": ('-tr', ),
|
||||||
|
|
|
@ -69,7 +69,7 @@ class ManualArgs(FaceSwapArgs):
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-al", ),
|
"opts": ("-al", ),
|
||||||
"type": str,
|
"type": str,
|
||||||
"dest": "depr_alignments_path_al_a",
|
"dest": "depr_alignments_al_a",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-fr", ),
|
"opts": ("-fr", ),
|
||||||
|
|
|
@ -238,6 +238,6 @@ class MaskArgs(FaceSwapArgs):
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-it", ),
|
"opts": ("-it", ),
|
||||||
"type": str,
|
"type": str,
|
||||||
"dest": "depr_input_type_it_I",
|
"dest": "depr_input-type_it_I",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
return argument_list
|
return argument_list
|
||||||
|
|
|
@ -76,6 +76,6 @@ class PreviewArgs(FaceSwapArgs):
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-al", ),
|
"opts": ("-al", ),
|
||||||
"type": str,
|
"type": str,
|
||||||
"dest": "depr_alignments_path_al_a",
|
"dest": "depr_alignments_al_a",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
return argument_list
|
return argument_list
|
||||||
|
|
|
@ -225,6 +225,6 @@ class SortArgs(FaceSwapArgs):
|
||||||
argument_list.append({
|
argument_list.append({
|
||||||
"opts": ("-lf", ),
|
"opts": ("-lf", ),
|
||||||
"type": str,
|
"type": str,
|
||||||
"dest": "depr_log_file_path_lf_f",
|
"dest": "depr_log-file_lf_f",
|
||||||
"help": argparse.SUPPRESS})
|
"help": argparse.SUPPRESS})
|
||||||
return argument_list
|
return argument_list
|
||||||
|
|
Loading…
Add table
Reference in a new issue