Skip to content
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

Jump to bottom

WIP: Add apptainer to GaudiExec #2321

Merged
merged 7 commits into from
Apr 15, 2024
Merged

WIP: Add apptainer to GaudiExec #2321

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2c7a60f
add apptainer to build
mesmith75 Apr 12, 2024
284342f
some fix
mesmith75 Apr 12, 2024
5dd0d16
tidy
mesmith75 Apr 12, 2024
41cd785
tidy
mesmith75 Apr 12, 2024
547f514
add option
mesmith75 Apr 12, 2024
6b0441c
add options
mesmith75 Apr 12, 2024
4229b41
Merge branch 'develop' into appt_run
mesmith75 Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 15 additions & 2 deletions ganga/GangaLHCb/Lib/Applications/GaudiExec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,9 @@ class GaudiExec(IPrepareApp):
'nMakeCores': SimpleItem(defvalue=1,
doc='Number of cores to be provided via the "-j" option to the "make" command'\
'when building the ganga-input-sandbox'),

'apptainerBuild' : SimpleItem(defvalue=False, doc="Run the build command in apptainer"),
'containerLocation' : SimpleItem(defvalue='/cvmfs/cernvm-prod.cern.ch/cvm4',
doc='Where is the container to use for the build located'),
# Prepared job object
'is_prepared': SimpleItem(defvalue=None, strict_sequence=0, visitable=1, copyable=1, hidden=0,
typelist=[None, ShareDir], protected=0, comparable=1,
Expand Down Expand Up @@ -564,7 +566,18 @@ def execCmd(self, cmd):
if cmd != 'make':
rc, stdout, stderr = _exec_cmd(cmd_file.name, self.directory)
else:
rc, stdout, stderr = _exec_cmd(cmd_file.name, self.directory)
if self.apptainerBuild or 'slc6' in self.platform:
try:
logger.info('Building inside apptainer: %s' % self.containerLocation)
cmd_to_run = 'apptainer exec --env "PATH=$PATH" --bind $PWD --bind /cvmfs:/cvmfs:ro '\
+ self.containerLocation + ' ' + cmd_file.name
rc, stdout, stderr = _exec_cmd(cmd_to_run, self.directory)
except:
logger.error('Failed to build the application inside a container. '
'Perhaps the specified container location is not accessible.')
raise GangaException('Failed to execute make command')
else:
rc, stdout, stderr = _exec_cmd(cmd_file.name, self.directory)
if rc != 0:
logger.error("Failed to execute command: %s" % cmd_file.name)
logger.error("Tried to execute command in: %s" % self.directory)
Expand Down