Skip to content
Snippets Groups Projects
Commit 6e93f85f authored by Amandine  PERRIN's avatar Amandine PERRIN
Browse files

Use utils argparse checking instead of a local one

parent f6510f0d
No related branches found
No related tags found
No related merge requests found
...@@ -157,25 +157,7 @@ def build_parser(parser): ...@@ -157,25 +157,7 @@ def build_parser(parser):
""" """
import argparse import argparse
import multiprocessing import multiprocessing
from PanACoTA import utils_argparse
def thread_num(param):
try:
param = int(param)
except Exception:
msg = "argument --threads threads: invalid int value: {}".format(param)
raise argparse.ArgumentTypeError(msg)
nb_cpu = multiprocessing.cpu_count()
if param > nb_cpu:
msg = ("You have {} threads on your computer, you cannot ask for more: "
"invalid value: {}").format(nb_cpu, param)
raise argparse.ArgumentTypeError(msg)
elif param < 0:
msg = ("Please provide a positive number of threads (or 0 for all threads): "
"Invalid value: {}").format(param)
raise argparse.ArgumentTypeError(msg)
elif param == 0:
return nb_cpu
return param
# Create command-line parser for all options and arguments to give # Create command-line parser for all options and arguments to give
required = parser.add_argument_group('Required arguments') required = parser.add_argument_group('Required arguments')
...@@ -200,7 +182,7 @@ def build_parser(parser): ...@@ -200,7 +182,7 @@ def build_parser(parser):
help="Output directory, where all results must be saved ") help="Output directory, where all results must be saved ")
optional = parser.add_argument_group('Optional arguments') optional = parser.add_argument_group('Optional arguments')
optional.add_argument("--threads", dest="threads", default=1, type=thread_num, optional.add_argument("--threads", dest="threads", default=1, type=utils_argparse.thread_num,
help=("add this option if you want to parallelize on several threads. " help=("add this option if you want to parallelize on several threads. "
"Indicate on how many threads you want to parallelize. " "Indicate on how many threads you want to parallelize. "
"By default, it uses 1 thread. Put 0 if you want to use " "By default, it uses 1 thread. Put 0 if you want to use "
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment