Verified Commit 17411d14 authored by Marc Vef's avatar Marc Vef
Browse files

ofi+tcp support

parent 17be17af

.gitmodules

+2 −1
Original line number Diff line number Diff line 
[submodule "external/hermes"]

	path = external/hermes

	url = https://github.com/bsc-ssrg/hermes.git

	url = https://github.com/marcvef/hermes.git

	branch = ofi_tcp_support

[submodule "external/fmt"]

	path = external/fmt

	url = https://github.com/fmtlib/fmt

hermes @ 52d823c2

Original line number Diff line number Diff line 
Subproject commit 0af45bfa667f7ff9c78167ef94d975bffbd879f0
 
Subproject commit 52d823c211c0fc9b2ec9087bea025685312d3b1c

src/client/preload_util.cpp

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ extract_protocol(const string& uri) { 
        protocol = gkfs::rpc::protocol::ofi_psm2;

    } else if(uri.find(gkfs::rpc::protocol::ofi_verbs) != string::npos) {

        protocol = gkfs::rpc::protocol::ofi_verbs;

    } else if(uri.find(gkfs::rpc::protocol::ofi_tcp) != string::npos) {

        protocol = gkfs::rpc::protocol::ofi_tcp;

    }

    // check for shared memory protocol. Can be plain shared memory or real ofi

    // protocol + auto_sm

src/daemon/daemon.cpp

+2 −1
Original line number Diff line number Diff line
@@ -383,7 +383,8 @@ parse_input(const po::variables_map& vm) { 
        rpc_protocol = vm["rpc-protocol"].as<string>();

        if(rpc_protocol != gkfs::rpc::protocol::ofi_verbs &&

           rpc_protocol != gkfs::rpc::protocol::ofi_sockets &&

           rpc_protocol != gkfs::rpc::protocol::ofi_psm2) {

           rpc_protocol != gkfs::rpc::protocol::ofi_psm2 &&

           rpc_protocol != gkfs::rpc::protocol::ofi_tcp) {

            throw runtime_error(fmt::format(

                    "Given RPC protocol '{}' not supported. Check --help for supported protocols.",

                    rpc_protocol));