Merge branch 'master' into topic/uct/tcp_ep_flush

configure.ac

@@ -112,7 +112,7 @@ AC_DEFINE_UNQUOTED([UCX_CONFIGURE_FLAGS], ["$config_flags"], [UCX configure flag
 #
 # Define path of ucx.conf configuration file
 #
-AC_SUBST([ucx_conf_dir], [${sysconfdir}/ucx])
+AC_SUBST([ucx_config_dir], [${sysconfdir}/ucx])
 
 #
 # Provide the functionality of AS_VAR_APPEND if Autoconf does not have it.
@@ -405,7 +405,7 @@ AC_MSG_NOTICE([Building documents only])
 [
 AC_MSG_NOTICE([UCX build configuration:])
 AC_MSG_NOTICE([        Build prefix:   ${prefix}])
-AC_MSG_NOTICE([   Configuration dir:   ${ucx_conf_dir}])
+AC_MSG_NOTICE([   Configuration dir:   ${ucx_config_dir}])
 AC_MSG_NOTICE([  Preprocessor flags:   ${BASE_CPPFLAGS}])
 AC_MSG_NOTICE([          C compiler:   ${CC} ${BASE_CFLAGS}])
 AC_MSG_NOTICE([        C++ compiler:   ${CXX} ${BASE_CXXFLAGS}])

contrib/test_jenkins.sh

@@ -543,7 +543,7 @@ run_uct_hello() {
 				run_hello uct -d ${ucx_dev} -t "rc_verbs" ${send_func} -m ${mem_type}
 			done
 		done
-		for ucx_dev in $(get_active_ip_iface)
+		for ucx_dev in $(get_active_ip_ifaces)
 		do
 			echo "==== Running UCT hello world server on tcp/${ucx_dev} with sending ${send_func} ===="
 			run_hello uct -d ${ucx_dev} -t "tcp" ${send_func}
@@ -928,7 +928,7 @@ test_init_mt() {
 	$MAKEP
 	for ((i=0;i<50;++i))
 	do
-		$AFFINITY timeout 1m ./test/apps/test_init_mt
+		$AFFINITY timeout 5m ./test/apps/test_init_mt
 	done
 }
 

docs/source/running.md

@@ -156,3 +156,14 @@ Example of the command line (with optional flag to select IB device mlx5_0 port
 $ mpirun -np 2 -env UCX_NET_DEVICES=mlx5_0:1 ./executable
 ```
 
+## Running in Docker containers
+UCX can run in a container, but requires slight adjustments:
+
+* Some transports may be unsupported, depending on the runtime configuration.
+To see the available transports use `ucx_info -d`.
+
+* In order to enable shared memory transport, ptrace capability is required. The recommended shared memory size is 8GB. Add the following to `docker run` commandline: `--cap-add CAP_SYS_PTRACE --shm-size="8g"`.
+
+* To use the shared memory between several containers, add this instead: `--cap-add CAP_SYS_PTRACE --ipc host`.
+
+* To enable RDMA, the corresponding devices must be allowed: `--device=/dev/infiniband/rdma_cm --device=/dev/infiniband/uverbsX` (replace `X` with the device number).