From 14e77a1e16b565607e46132253e330b95ad90eed Mon Sep 17 00:00:00 2001 From: Jordan Ogas Date: Mon, 20 Mar 2023 12:34:49 -0600 Subject: [PATCH] initial thought --- bin/ch_core.c | 4 ++++ doc/install.rst | 32 +++++++++++++++++++++++++++++--- examples/Dockerfile.libfabric | 1 + 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/bin/ch_core.c b/bin/ch_core.c index 8d244ae82..2d60a08f2 100644 --- a/bin/ch_core.c +++ b/bin/ch_core.c @@ -71,6 +71,10 @@ struct bind BINDS_DEFAULT[] = { { 0 } }; +#ifdef ADD_BINDS + /* add more optional binds based on autoconf. */ +#endif + /* Architectures that we support for seccomp. Order matches the corresponding table below. diff --git a/doc/install.rst b/doc/install.rst index 73a801fdb..4b5c4c08e 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -88,9 +88,6 @@ be built. Dependency selection: :code:`--with-FOO` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Some dependencies can be specified as follows. Note only some of these support -:code:`--with-FOO=no`, as listed. - :code:`--with-libsquashfuse={yes,no,PATH}` Whether to link with :code:`libsquashfuse`. Options: @@ -124,6 +121,35 @@ Some dependencies can be specified as follows. Note only some of these support Path to Python used by :code:`sphinx-build`. Default: shebang of :code:`sphinx-build`. +Some dependencies can be specified as follows. Note only some of these support +:code:`--with-FOO=no`, as listed. + +Optional bind selection: :code:`--bind-FOO` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +By default, :code:`ch-run` binds the minimal number mount points needed to run. +You can add more files with: + +:code:`--bind-path={PATH[:PREFIX}` + Add file from path to to ch-run optional default run-time binds. + + * Path to host file. Optionally bind at prefix if set; otherwise, + :code:`/usr/local/lib` + +:code:`--bind-libfabric={PATH[:PREFIX]}` + Add host libfabric to ch-run optional default run-time binds. + + * Path to host :code:`libfabric.so`. Optionally bind at prefix if set; + otherwise :code:`/usr/local/lib`. + +:code:`--bind-fi-provider={PATH[:PREFIX]}` + Add host libfabric shared fabric provider to ch-run optional default run-time + binds. + + * Path to host libfabric shared provider, with :code:`*-fi.so` suffix. + Optionally bind at prefix if set; + otherwise :code:`/usr/local/lib/libfabric`. + Less strict build: :code:`--enable-buggy-build` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/examples/Dockerfile.libfabric b/examples/Dockerfile.libfabric index 210d722ca..6db9a8a72 100644 --- a/examples/Dockerfile.libfabric +++ b/examples/Dockerfile.libfabric @@ -95,6 +95,7 @@ RUN dnf install -y --setopt=install_weak_deps=false \ libibumad-devel \ librdmacm \ librdmacm-devel \ + libssh \ rdma-core \ make \ numactl-devel \