Skip to content

speccpu2017: Make parent_dir optional #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
apaolillo merged 1 commit into from
Jan 29, 2026
Merged

speccpu2017: Make parent_dir optional #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions benchkit/benches/speccpu2017/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
from benchkit.core.bktypes.callresults import BuildResult, FetchResult, RunResult
from benchkit.core.bktypes.contexts import BuildContext, CollectContext, FetchContext, RunContext
from benchkit.dependencies.packages import PackageDependency
from benchkit.utils.dir import benchkit_home_dir
from benchkit.utils.dir import benchkit_home_dir, get_benches_dir
from benchkit.utils.fetchtools import fuseiso_mount, fuseiso_umount, sed_edit


Expand All @@ -106,8 +106,8 @@ class SPECCPU2017Bench:
def fetch(
self,
ctx: FetchContext,
parent_dir: Path,
spec_source_iso: Path,
parent_dir: Path | None = None,
) -> FetchResult:
"""
Install the SPEC CPU® 2017 suite into the bench workspace from a local ISO.
Expand All @@ -124,16 +124,17 @@ def fetch(

Args:
ctx: FetchContext providing platform and execution capabilities.
spec_source_iso: Path to the SPEC CPU 2017 ISO image to install from.
parent_dir: Directory under which the SPEC installation directory
(`spec`) will be created/used.
spec_source_iso: Path to the SPEC CPU 2017 ISO image to install from.

Returns:
FetchResult with `src_dir` set to the installed SPEC directory
(`<parent_dir>/spec`).
"""
mnt_dir = benchkit_home_dir() / "spec-mnt"
parent_dir = get_benches_dir(parent_dir=parent_dir)
spec_dir = parent_dir / "spec"
mnt_dir = benchkit_home_dir() / "spec-mnt"

comm = ctx.platform.comm

Expand Down
2 changes: 1 addition & 1 deletion benchkit/commandwrappers/taskset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def command_prefix(
mtc = master_thread_core

if self.set_all_cpus:
if cpu_order is None or nb_threads is None:
if cpu_order is None:
return []

cpu_order_list = self.platform.cpu_order(provided_order=cpu_order)
Expand Down