Fixes percentage checks

Author: Taina Coleman

wfcommons/wfperf/perf.py

@@ -16,8 +16,7 @@ def __init__(self, Recipe: Type[WorkflowRecipe], num_tasks: int) -> None:
 
     def create(self,
                save_dir: pathlib.Path,
-               cpu: int = 50,
-               mem: int = 50,
+               percent_cpu: float = 0.5,
                data_footprint: int = 100,
                test_mode: str = "seqwr",
                mem_total_size: str = "1000000G",
@@ -30,9 +29,6 @@ def create(self,
                threads: int = 2, #cpu threads
                verbose: bool = False) -> Dict:
 
-        self.check_percent(cpu, mem)
-        cpu_threads= cpu/10
-        mem_threads= mem/10
 
         if verbose:
             print("Checking if the sysbench is installed.")
@@ -61,9 +57,8 @@ def create(self,
                   f"--memory-block-size={block_size}",
                   f"--memory-scope={scope}",
                   f"--memory-total-size={mem_total_size}",
-                  f"memory-threads={mem_threads}"
                   f"--cpu-max-prime={max_prime}",
-                  f"cpu-threads={cpu_threads}",
+                  f"--percent_cpu={percent_cpu}",
                   f"--time={max_time}"]
 
         for job in wf["workflow"]["jobs"]:
@@ -157,15 +152,6 @@ def add_io_to_json(self, wf: Dict[str, Dict], file_size: int) -> None:
                     )
 
 
-    def check_percent(self, cpu:int, mem:int):
-        if not cpu % 10:
-            raise ValueError("CPU percentage must be multiple of 10.")
-        
-        if not mem % 10:
-            raise ValueError("Memory percentage must be multiple of 10.")
-        
-        if cpu + mem != 100:
-           raise ValueError("CPU + Memory must be 100.") 
 
     def _check_sysbench(self,):
         proc = subprocess.Popen(["which", "sysbench"], stdout=subprocess.PIPE)

wfcommons/wfperf/wfperf_benchmark.py

@@ -20,7 +20,7 @@ def main():
     parser = get_parser()
     args, other = parser.parse_known_args()
     name = args.name
-    assert(args.percent_cpu >= 0 and args.percent_cpu <= 1)
+    assert(args.percent_cpu >= 0.0 and args.percent_cpu <= 1.0)
 
     save_dir = [item for item in other if "save" in item][0]
     save_dir = pathlib.Path(save_dir.split("=")[1])