Removed all traces of cpu-benchmark.cpp

Author: henricasanova

Makefile

@@ -35,9 +35,7 @@ recipe to generate a task graph. Once the task graph has been generated, each ta
 is set to be an instance of the workflow task benchmark. For each task, the following 
 values for the parameters of the workflow task benchmark can be specified:
 
-- :code:`cpu_work`: CPU work per workflow task. The :code:`cpu-benchmark` executable 
-  (compiled C++) calculates an increasingly precise value of π up until the specified 
-  total amount of computation (cpu_work) has been performed.
+- :code:`cpu_work`: CPU work per workflow task.
 - :code:`data`: Individual data volumes for each task in a way that is coherent 
   with respect to task data dependencies (in the form of a dictionary of input 
   size files per workflow task type). Alternatively, a total data footprint (in MB)

bin/cpu-benchmark.cpp

@@ -16,32 +16,33 @@
 from setuptools.command.build_ext import build_ext
 
 class Build(build_ext):
-    """Customized setuptools build command - builds cpu-benchmark on build."""
+    """Customized setuptools build command"""
 
     def run(self):
-        # Try to build the cpu-benchmark, but make it optional
-        # This allows installation on Windows where make/g++ may not be available
-        try:
-            result = subprocess.call(["make"], stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL)
-            if result != 0:
-                sys.stderr.write("Warning: 'make' build failed. cpu-benchmark will not be available.\n")
-                sys.stderr.write("This is expected on Windows. To build cpu-benchmark, install make and g++.\n")
-        except (FileNotFoundError, OSError):
-            sys.stderr.write("Warning: 'make' is not installed. cpu-benchmark will not be available.\n")
-            sys.stderr.write("This is expected on Windows. To build cpu-benchmark, install make and g++.\n")
-        super().run()
+        pass
+        # OLD CODE TO build a C++ executable
+        # # This allows installation on Windows where make/g++ may not be available
+        # try:
+        #     result = subprocess.call(["make"], stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL)
+        #     if result != 0:
+        #         sys.stderr.write("Warning: 'make' build failed. cpu-benchmark will not be available.\n")
+        #         sys.stderr.write("This is expected on Windows. To build cpu-benchmark, install make and g++.\n")
+        # except (FileNotFoundError, OSError):
+        #     sys.stderr.write("Warning: 'make' is not installed. cpu-benchmark will not be available.\n")
+        #     sys.stderr.write("This is expected on Windows. To build cpu-benchmark, install make and g++.\n")
+        # super().run()
 
 # Conditionally include cpu-benchmark based on platform
 data_files = []
-if sys.platform != 'win32':
-    # On Unix-like systems (Linux, macOS, Docker), always try to include it
-    # The Build class will create it during the build process
-    data_files.append(('bin', ['bin/cpu-benchmark']))
-else:
-    # On Windows, only include if it exists (e.g., if user manually compiled it)
-    cpu_benchmark_path = 'bin/cpu-benchmark'
-    if os.path.exists(cpu_benchmark_path):
-        data_files.append(('bin', [cpu_benchmark_path]))
+# if sys.platform != 'win32':
+#     # On Unix-like systems (Linux, macOS, Docker), always try to include it
+#     # The Build class will create it during the build process
+#     data_files.append(('bin', ['bin/cpu-benchmark']))
+# else:
+#     # On Windows, only include if it exists (e.g., if user manually compiled it)
+#     cpu_benchmark_path = 'bin/cpu-benchmark'
+#     if os.path.exists(cpu_benchmark_path):
+#         data_files.append(('bin', [cpu_benchmark_path]))
 
 setup(
     packages=find_packages(),

docs/source/generating_workflow_benchmarks.rst

@@ -57,13 +57,8 @@ def _install_WfCommons_on_container(container):
     # Cleanup files that came from the host
     exit_code, output = container.exec_run("sudo /bin/rm -rf /tmp/WfCommons/build/", user="wfcommons", stdout=True, stderr=True)
     exit_code, output = container.exec_run("sudo /bin/rm -rf /tmp/WfCommons/*.egg-info/", user="wfcommons", stdout=True, stderr=True)
-    # Clean up and force a rebuild of cpu-benchmark (because it may be compiled for the wrong architecture)
-    exit_code, output = container.exec_run("sudo /bin/rm -rf /tmp/WfCommons/bin/cpu-benchmark.o", user="wfcommons", stdout=True,
-                                           stderr=True)
-    exit_code, output = container.exec_run("sudo /bin/rm -rf /tmp/WfCommons/bin/cpu-benchmark", user="wfcommons", stdout=True,
-                                           stderr=True)
 
-    # Install WfCommons on the container (to install wfbench and cpu-benchmark really)
+    # Install WfCommons on the container (to install wfbench really)
     exit_code, output = container.exec_run("sudo python3 -m pip install . --break-system-packages",
                                            user="wfcommons",
                                            workdir="/tmp/WfCommons", stdout=True, stderr=True)
@@ -103,22 +98,17 @@ def _start_docker_container(backend, mounted_dir, working_dir, bin_dir, command=
     # Installing WfCommons on container
     _install_WfCommons_on_container(container)
 
-    # Copy over the wfbench and cpu-benchmark executables to where they should go on the container
+    # Copy over the wfbench executable to where they should go on the container
     if bin_dir:
-        sys.stderr.write(f"[{backend}] Copying wfbench and cpu-benchmark...\n")
+        sys.stderr.write(f"[{backend}] Copying wfbench...\n")
         exit_code, output = container.exec_run(["sh", "-c", "sudo cp -f `which wfbench` " + bin_dir],
                                                user="wfcommons",
                                                stdout=True, stderr=True)
         if exit_code != 0:
             raise RuntimeError("Failed to copy wfbench script to the bin directory")
 
-        exit_code, output = container.exec_run(["sh", "-c", "sudo cp -f `which cpu-benchmark` " + bin_dir],
-                                               user="wfcommons",
-                                               stdout=True, stderr=True)
-        if exit_code != 0:
-            raise RuntimeError("Failed to copy cpu-benchmark executable to the bin directory")
     else:
-        sys.stderr.write(f"[{backend}] Not Copying wfbench and cpu-benchmark...\n")
+        sys.stderr.write(f"[{backend}] Not Copying wfbench...\n")
 
     container.backend = backend
     return container

setup.py

@@ -348,7 +348,7 @@ def test_translator(self, backend) -> None:
         if backend == "pegasus":
             parser = PegasusLogsParser(dirpath / "work/wfcommons/pegasus/Blast-Benchmark/run0001/")
         elif backend == "taskvine":
-            parser = TaskVineLogsParser(dirpath / "vine-run-info/most-recent/vine-logs", filenames_to_ignore=["cpu-benchmark","stress-ng", "wfbench"])
+            parser = TaskVineLogsParser(dirpath / "vine-run-info/most-recent/vine-logs", filenames_to_ignore=["stress-ng", "wfbench"])
         elif backend == "makeflow":
             parser = MakeflowLogsParser(execution_dir = dirpath, resource_monitor_logs_dir = dirpath / "monitor_data/")
         elif backend == "streamflow":

tests/test_helpers.py

@@ -94,7 +94,6 @@ def _copy_binary_files(self, output_folder: pathlib.Path) -> None:
         bin_folder.mkdir(exist_ok=True)
 
         shutil.copy(shutil.which("wfbench"), bin_folder)
-        shutil.copy(shutil.which("cpu-benchmark"), bin_folder)
 
     def _generate_input_files(self, output_folder: pathlib.Path) -> None:
         """

tests/translators_loggers/test_translators_loggers.py

@@ -65,7 +65,6 @@ def translate(self, output_folder: pathlib.Path, tasks_priorities: Optional[Dict
                                "                                is_stageable=True)\n" \
                                "transformation.add_env(PATH='/usr/bin:/bin:.')\n" \
                                "transformation.add_profiles(Namespace.CONDOR, 'request_disk', '10')\n" \
-                               "transformation.add_requirement(t_cpu_benchmark)\n" \
                                "tc.add_transformations(transformation)\n\n"
 
         # adding tasks

wfcommons/wfbench/translator/abstract_translator.py

@@ -118,7 +118,6 @@ def _add_task(self, task_name: str, parent_task: Optional[str] = None) -> list[s
             f_counter = 1
             task_script = f"t_{self.task_counter}.add_poncho_package(poncho_pkg)\n" \
                           f"t_{self.task_counter}.add_input(wfbench, 'wfbench')\n" \
-                          f"t_{self.task_counter}.add_input(cpu_bench, 'cpu-benchmark')\n" \
                           f"t_{self.task_counter}.add_input(stress_ng, 'stress-ng')\n"
             input_spec = "\"["
             for file in task.input_files:

wfcommons/wfbench/translator/pegasus.py

@@ -22,9 +22,9 @@ def which(file):
 tc = TransformationCatalog()
 rc = ReplicaCatalog()
 
-t_cpu_benchmark = Transformation('cpu-benchmark', site='local',
-pfn = os.getcwd() + '/bin/cpu-benchmark', is_stageable=True)
-tc.add_transformations(t_cpu_benchmark)
+# t_cpu_benchmark = Transformation('cpu-benchmark', site='local',
+# pfn = os.getcwd() + '/bin/cpu-benchmark', is_stageable=True)
+# tc.add_transformations(t_cpu_benchmark)
 transformation_path = os.getcwd() + '/bin/wfbench'
 
 task_output_files = {}