Commit 94dec2cd authored by Valentin Reis's avatar Valentin Reis

Merge branch '41-2-names-of-the-nrm-binaries' into 'master'

Resolve "Names of the NRM binaries"

Closes #41

See merge request !83
parents 7f3dd187 c7e2b6fb
Pipeline #7029 failed with stages
in 30 minutes and 10 seconds
...@@ -42,7 +42,7 @@ def main(argv=None): ...@@ -42,7 +42,7 @@ def main(argv=None):
defaults = {"nrm_log": "/tmp/nrm.log", defaults = {"nrm_log": "/tmp/nrm.log",
"hwloc": "hwloc", "hwloc": "hwloc",
"perf": "perf", "perf": "perf",
"argo_perf_wrapper": "argo-perf-wrapper", "argo_perf_wrapper": "nrm-perfwrapper",
"argo_nodeos_config": "argo_nodeos_config", "argo_nodeos_config": "argo_nodeos_config",
"pmpi_lib": "/usr/lib/libnrm-pmpi.so", "pmpi_lib": "/usr/lib/libnrm-pmpi.so",
} }
...@@ -100,7 +100,7 @@ def main(argv=None): ...@@ -100,7 +100,7 @@ def main(argv=None):
"necessary. Override default with the PERFWRAPPER " "necessary. Override default with the PERFWRAPPER "
"environment variable.", "environment variable.",
default=os.environ.get('ARGO_PERF_WRAPPER', default=os.environ.get('ARGO_PERF_WRAPPER',
'argo-perf-wrapper')) 'nrm-perfwrapper'))
args = parser.parse_args(remaining_argv) args = parser.parse_args(remaining_argv)
nrm.daemon.runner(config=args) nrm.daemon.runner(config=args)
return(0) return(0)
......
...@@ -28,7 +28,7 @@ class ContainerManager(object): ...@@ -28,7 +28,7 @@ class ContainerManager(object):
container runtime underneath.""" container runtime underneath."""
def __init__(self, container_runtime, rm, def __init__(self, container_runtime, rm,
perfwrapper="argo-perf-wrapper", perfwrapper="nrm-perfwrapper",
linuxperf="perf", linuxperf="perf",
pmpi_lib="/usr/lib/libnrm-pmpi.so"): pmpi_lib="/usr/lib/libnrm-pmpi.so"):
self.linuxperf = linuxperf self.linuxperf = linuxperf
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment