Skip to content

Commit 7a4758b

Browse files
committed
fix relateive path
1 parent b6f1df1 commit 7a4758b

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

cpp/src/examples/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
2-
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../../test/resources/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../../test/resources/)
3-
41
add_subdirectory("../../../examples/cpp/babyllama/" "${CMAKE_CURRENT_BINARY_DIR}/../../test/resources/examples/babyllama/babyllama_handler/")
52

63
add_subdirectory("../../../examples/cpp/llamacpp/" "${CMAKE_CURRENT_BINARY_DIR}/../../test/resources/examples/llamacpp/llamacpp_handler/")

cpp/test/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ FetchContent_MakeAvailable(googletest)
1010

1111
set(TEST_BINARY ${CMAKE_PROJECT_NAME}_test)
1212
file(GLOB_RECURSE TEST_SOURCES LIST_DIRECTORIES false *.cc *.hh)
13+
file(COPY resources/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/resources/)
1314

1415
add_executable(${TEST_BINARY} ${TEST_SOURCES})
1516
target_link_libraries(${TEST_BINARY} gtest_main gmock_main ts_backends_core ts_backends_protocol ts_utils ${TORCH_LIBRARIES} ${NCCL_LIBRARY})

cpp/test/backends/otf_protocol_and_handler_test.cc

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ TEST(BackendIntegTest, TestOTFProtocolAndHandler) {
2424
// model_name length
2525
.WillOnce(::testing::Return(5))
2626
// model_path length
27-
.WillOnce(::testing::Return(45))
27+
.WillOnce(::testing::Return(37))
2828
// batch_size
2929
.WillOnce(::testing::Return(1))
3030
// handler length
@@ -44,8 +44,8 @@ TEST(BackendIntegTest, TestOTFProtocolAndHandler) {
4444
strncpy(data, "mnist", length);
4545
}))
4646
.WillOnce(testing::Invoke([=](size_t length, char* data) {
47-
ASSERT_EQ(length, 45);
48-
strncpy(data, "../test/resources/examples/mnist/base_handler", length);
47+
ASSERT_EQ(length, 37);
48+
strncpy(data, "resources/examples/mnist/base_handler", length);
4949
}))
5050
.WillOnce(testing::Invoke([=](size_t length, char* data) {
5151
ASSERT_EQ(length, 11);
@@ -59,7 +59,7 @@ TEST(BackendIntegTest, TestOTFProtocolAndHandler) {
5959
EXPECT_CALL(*client_socket, SendAll(testing::_, testing::_)).Times(1);
6060
auto load_model_request = OTFMessage::RetrieveLoadMsg(*client_socket);
6161
ASSERT_EQ(load_model_request->model_dir,
62-
"../test/resources/examples/mnist/base_handler");
62+
"resources/examples/mnist/base_handler");
6363
ASSERT_EQ(load_model_request->model_name, "mnist");
6464
ASSERT_EQ(load_model_request->envelope, "");
6565
ASSERT_EQ(load_model_request->model_name, "mnist");
@@ -68,9 +68,9 @@ TEST(BackendIntegTest, TestOTFProtocolAndHandler) {
6868

6969
// initialize backend
7070
auto backend = std::make_shared<torchserve::Backend>();
71-
MetricsRegistry::Initialize("../test/resources/metrics/default_config.yaml",
71+
MetricsRegistry::Initialize("resources/metrics/default_config.yaml",
7272
MetricsContext::BACKEND);
73-
backend->Initialize("../test/resources/examples/mnist/base_handler");
73+
backend->Initialize("resources/examples/mnist/base_handler");
7474

7575
// load the model
7676
auto load_model_response = backend->LoadModel(load_model_request);
@@ -125,7 +125,7 @@ TEST(BackendIntegTest, TestOTFProtocolAndHandler) {
125125
.WillOnce(testing::Invoke([=](size_t length, char* data) {
126126
ASSERT_EQ(length, 3883);
127127
// strncpy(data, "valu", length);
128-
std::ifstream input("../test/resources/examples/mnist/0_png.pt",
128+
std::ifstream input("resources/examples/mnist/0_png.pt",
129129
std::ios::in | std::ios::binary);
130130
std::vector<char> image((std::istreambuf_iterator<char>(input)),
131131
(std::istreambuf_iterator<char>()));

cpp/test/utils/common.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ModelPredictTest : public ::testing::Test {
1515
const std::string& inference_request_id_prefix,
1616
int inference_expect_code) {
1717
torchserve::MetricsRegistry::Initialize(
18-
"../test/resources/metrics/default_config.yaml",
18+
"resources/metrics/default_config.yaml",
1919
torchserve::MetricsContext::BACKEND);
2020
backend_->Initialize(model_dir);
2121
auto result = backend_->LoadModel(std::move(load_model_request));

0 commit comments

Comments
 (0)