Skip to content

Commit ff1790a

Browse files
committed
[REFACTOR][RUNTIME][RPC] Move minrpc/ into src/runtime/rpc/minrpc/
minrpc implements a minimal RPC protocol that shares rpc_reference.h with the standard RPC transport in src/runtime/rpc/. Nesting minrpc/ under rpc/ makes that structural relationship explicit on the file system and removes it from the runtime top-level. Changes: - src/runtime/minrpc/ → src/runtime/rpc/minrpc/ (3 files + posix_popen_server/) - rpc_endpoint.h, rpc_session.h: "../minrpc/rpc_reference.h" → "minrpc/rpc_reference.h" - disco/protocol.h, process_session.cc, threaded_session.cc: "../minrpc/rpc_reference.h" → "../rpc/minrpc/rpc_reference.h" - hexagon/rpc/{hexagon,simulator}/rpc_server.cc: "../../../minrpc/minrpc_server.h" → "../../../rpc/minrpc/minrpc_server.h" - CMakeLists.txt: RUNTIME_SRCS glob src/runtime/minrpc/*.cc → src/runtime/rpc/minrpc/*.cc - cmake/modules/Hexagon.cmake: two explicit header list entries updated - python/tvm/rpc/minrpc.py: path constant for -I flag and server.cc source updated from src/runtime/minrpc to src/runtime/rpc/minrpc Header guards in minrpc_server.h and rpc_reference.h already encode TVM_RUNTIME_MINRPC_*, which remain correct after the move.
1 parent ad3eb5a commit ff1790a

13 files changed

Lines changed: 11 additions & 11 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ tvm_file_glob(GLOB RUNTIME_SRCS
344344
src/runtime/*.cc
345345
src/runtime/vm/*.cc
346346
src/runtime/memory/*.cc
347-
src/runtime/minrpc/*.cc
347+
src/runtime/rpc/minrpc/*.cc
348348
)
349349
# Note: src/runtime/disco/** moves to libtvm_runtime_extra.
350350
# Note: src/runtime/{cuda,vulkan,opencl,metal,rocm,hexagon}/* move to per-backend DSOs.

cmake/modules/Hexagon.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ if(USE_HEXAGON_RPC)
289289

290290
# Include the generic RPC code into the TVM runtime.
291291
list(APPEND RUNTIME_HEXAGON_SRCS
292-
"${TVMRT_SOURCE_DIR}/minrpc/minrpc_server.h"
293-
"${TVMRT_SOURCE_DIR}/minrpc/rpc_reference.h"
292+
"${TVMRT_SOURCE_DIR}/rpc/minrpc/minrpc_server.h"
293+
"${TVMRT_SOURCE_DIR}/rpc/minrpc/rpc_reference.h"
294294
"${TVMRT_SOURCE_DIR}/rpc/rpc_module.cc"
295295
"${TVMRT_SOURCE_DIR}/rpc/rpc_endpoint.cc"
296296
"${TVMRT_SOURCE_DIR}/rpc/rpc_session.cc"

python/tvm/rpc/minrpc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def find_minrpc_server_libpath(server="posix_popen_server"):
3939
"""
4040
curr_dir = os.path.dirname(os.path.realpath(os.path.expanduser(__file__)))
4141
source_dir = os.path.abspath(os.path.join(curr_dir, "..", "..", ".."))
42-
minrpc_dir = os.path.join(source_dir, "src", "runtime", "minrpc")
42+
minrpc_dir = os.path.join(source_dir, "src", "runtime", "rpc", "minrpc")
4343
path = os.path.join(minrpc_dir, server, f"{server}.cc")
4444

4545
candidates = [path]

src/runtime/disco/process_session.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <vector>
2828

2929
#include "../../support/pipe.h"
30-
#include "../minrpc/rpc_reference.h"
30+
#include "../rpc/minrpc/rpc_reference.h"
3131
#include "./bcast_session.h"
3232
#include "./disco_worker_thread.h"
3333
#include "./message_queue.h"

src/runtime/disco/protocol.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "../../support/arena.h"
3434
#include "../../support/base64.h"
3535
#include "../../support/bytes_io.h"
36-
#include "../minrpc/rpc_reference.h"
36+
#include "../rpc/minrpc/rpc_reference.h"
3737

3838
namespace tvm {
3939
namespace runtime {

src/runtime/disco/threaded_session.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <utility>
3030

3131
#include "../../support/ring_buffer.h"
32-
#include "../minrpc/rpc_reference.h"
32+
#include "../rpc/minrpc/rpc_reference.h"
3333
#include "./bcast_session.h"
3434
#include "./disco_worker_thread.h"
3535
#include "./protocol.h"

src/runtime/hexagon/rpc/hexagon/rpc_server.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ extern "C" {
3636
#include <memory>
3737
#include <string>
3838

39-
#include "../../../minrpc/minrpc_server.h"
39+
#include "../../../rpc/minrpc/minrpc_server.h"
4040
#include "../../hexagon/hexagon_common.h"
4141
#include "../../hexagon/hexagon_device_api.h"
4242
#include "../../profiler/prof_utils.h"

src/runtime/hexagon/rpc/simulator/rpc_server.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <sstream>
2929
#include <string>
3030

31-
#include "../../../minrpc/minrpc_server.h"
31+
#include "../../../rpc/minrpc/minrpc_server.h"
3232
#include "../../hexagon_common.h"
3333
#include "../../profiler/prof_utils.h"
3434
#include "hexagon_sim_proto.h"

src/runtime/minrpc/posix_popen_server/posix_popen_server.cc renamed to src/runtime/rpc/minrpc/posix_popen_server/posix_popen_server.cc

File renamed without changes.

0 commit comments

Comments
 (0)