Merge branch 'main' into main

This commit is contained in:
Henry Ruhs 2023-05-30 21:13:15 +02:00 committed by GitHub
commit f50337f708
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

5
run.py
View File

@ -34,14 +34,11 @@ parser.add_argument('--gpu', help='use gpu', dest='gpu', action='store_true', de
parser.add_argument('--keep-fps', help='maintain original fps', dest='keep_fps', action='store_true', default=False) parser.add_argument('--keep-fps', help='maintain original fps', dest='keep_fps', action='store_true', default=False)
parser.add_argument('--keep-frames', help='keep frames directory', dest='keep_frames', action='store_true', default=False) parser.add_argument('--keep-frames', help='keep frames directory', dest='keep_frames', action='store_true', default=False)
parser.add_argument('--max-memory', help='set max memory', default=16, type=int) parser.add_argument('--max-memory', help='set max memory', default=16, type=int)
parser.add_argument('--max-cores', help='set max cpu cores', dest='cores_count', type=int) parser.add_argument('--max-cores', help='set max cpu cores', dest='cores_count', type=int, default=psutil.cpu_count()-1)
for name, value in vars(parser.parse_args()).items(): for name, value in vars(parser.parse_args()).items():
args[name] = value args[name] = value
if not args['cores_count']:
args['cores_count'] = psutil.cpu_count()-1
sep = "/" sep = "/"
if os.name == "nt": if os.name == "nt":
sep = "\\" sep = "\\"