Skip to content

Allow mcrun / mcdisplay to run / visualize without access to .c/.instr #2281

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
willend merged 3 commits into from
Dec 19, 2025
Merged

Allow mcrun / mcdisplay to run / visualize without access to .c/.instr #2281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab0555f
Allow mcrun / mcdisplay to run / visualize without access to .c/.instr
willend Dec 18, 2025
a858c74
Logic needed reversal
willend Dec 18, 2025
3bf12ec
Another round of fixing logic, LOG.info() that we are using binary di…
willend Dec 18, 2025
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
13 changes: 9 additions & 4 deletions tools/Python/mcrun/mccode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,21 @@ def x_path(file):
''' Return external path (relative to self.path) for file '''
return '%s/%s' % (dirname(self.path), basename(file))

# Copy instrument file to cwd if not already there (for compatibility)
if not isfile(basename(self.path)):
shutil.copy2(self.path, ".") # also copies stat information

# Create the path for the binary
if os.name == 'nt':
self.binpath = '%s.%s' % (self.name, mccode_config.platform['EXESUFFIX'])
else:
self.binpath = './%s.%s' % (self.name, mccode_config.platform['EXESUFFIX'])

# Check if self.path is .exe or .out binary, if so - skip ahead to execution
if self.path==basename(self.binpath):
LOG.info('Called with binary file %s, skipping ahead to execution', self.binpath)
return

# Copy instrument file to cwd if not already there (for compatibility)
if not isfile(basename(self.path)):
shutil.copy2(self.path, ".") # also copies stat information

# Check if c-code should be regenerated by comparing to instr timestamp
existingC = findReusableFile(self.path,
[self.cpath, x_path(self.cpath)])
Expand Down
5 changes: 0 additions & 5 deletions tools/Python/mcrun/mcrun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,12 +444,7 @@ def get_parameters(options):


def find_instr_file(instr):
# Remove [-mpi].out to avoid parsing a binary file
instr = clean_quotes(instr)
if instr.endswith("-mpi." + mccode_config.platform['EXESUFFIX']):
instr = instr[:-(5 + len(mccode_config.platform['EXESUFFIX']))]
if instr.endswith("." + mccode_config.platform['EXESUFFIX']):
instr = instr[:-(1 + len(mccode_config.platform['EXESUFFIX']))]

# Append ".instr" if needed
if not isfile(instr) and isfile(instr + ".instr"):
Expand Down