Skip to content

proper version info #450

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

Open
wants to merge 4 commits into
base: devel
Choose a base branch
from
Open

proper version info #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d937c65
proper version info
andre-merzky Nov 2, 2025
07adbe1
Update src/radical/utils/flux/flux_helper_v1.py
andre-merzky Nov 5, 2025
ca8152b
Update src/radical/utils/flux/flux_helper_v0.py
andre-merzky Nov 5, 2025
c3a45fe
merge from devel
andre-merzky Nov 6, 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
4 changes: 2 additions & 2 deletions src/radical/utils/flux/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
from .flux_module import FluxModule, spec_from_command, spec_from_dict

_fm = FluxModule()
if _fm.version == 1: FluxHelper = _FluxHelperV1
else : FluxHelper = _FluxHelperV0
if _fm.mode == 1: FluxHelper = _FluxHelperV1
else : FluxHelper = _FluxHelperV0

2 changes: 2 additions & 0 deletions src/radical/utils/flux/flux_helper_v0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ def __init__(self, uri : str,
self._cbacks = list() # list of callbacks

self._fm.verify()
for line in (self._fm.version or '').splitlines():
self._log.info('flux version: %s', line)


# --------------------------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions src/radical/utils/flux/flux_helper_v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ def __init__(self, uri : str,
self._cbacks = list() # list of callbacks

self._fm.verify()
for line in (self._fm.version or '').splitlines():
self._log.info('flux version: %s', line)


# --------------------------------------------------------------------------
Expand Down
28 changes: 20 additions & 8 deletions src/radical/utils/flux/flux_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class FluxModule(object):
_flux_job = None
_flux_exc = None
_flux_v = None
_flux_mode = None


# --------------------------------------------------------------------------
Expand All @@ -32,18 +33,24 @@ def __init__(self):
if self._flux_core or self._flux_job or self._flux_exc:
return

flux = None
flux_job = None
flux_exc = None
flux_v = None
flux = None
flux_job = None
flux_exc = None
flux_v = None
flux_mode = None

try:
out, err, ret = sh_callout('flux --version')
assert not ret, ['flux --version', err]

flux_v = out.strip()

flux = import_module('flux')
flux_job = import_module('flux.job')
if 'JournalConsumer' in dir(flux_job):
flux_v = 1
flux_mode = 1
else:
flux_v = 0
flux_mode = 0

except Exception as e:
flux_exc = e
Expand All @@ -67,9 +74,9 @@ def __init__(self):
flux = import_module('flux')
flux_job = import_module('flux.job')
if 'JournalConsumer' in dir(flux_job):
flux_v = 1
flux_mode = 1
else:
flux_v = 0
flux_mode = 0

except Exception as e:
flux_exc = e
Expand All @@ -81,6 +88,7 @@ def __init__(self):
self._flux_job = flux_job
self._flux_exc = flux_exc
self._flux_v = flux_v
self._flux_mode = flux_mode
self._flux_exe = which('flux')


Expand All @@ -103,6 +111,10 @@ def verify(self) -> None:

# --------------------------------------------------------------------------
#
@property
def mode(self) -> int:
return self._flux_mode

@property
def version(self) -> int:
return self._flux_v
Expand Down