Skip to content

Commit 1519cb4

Browse files
committed
fix compile warnings on macos
1 parent caa37b2 commit 1519cb4

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

ggml-rpc.cpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "ggml.h"
33
#include "ggml-backend-impl.h"
44

5+
#include <cinttypes>
56
#include <string>
67
#include <vector>
78
#include <memory>
@@ -729,7 +730,7 @@ static void rpc_alloc_buffer(ggml_backend_t backend, const std::vector<uint8_t>
729730
ggml_backend_buffer_t buffer = ggml_backend_buft_alloc_buffer(buft, size);
730731
uint64_t remote_ptr = reinterpret_cast<uint64_t>(buffer);
731732
uint64_t remote_size = buffer->size;
732-
GGML_PRINT_DEBUG("[%s] size: %lu -> remote_ptr: %lx, remote_size: %lu\n", __func__, size, remote_ptr, remote_size);
733+
GGML_PRINT_DEBUG("[%s] size: %" PRIu64 " -> remote_ptr: %" PRIx64 ", remote_size: %" PRIu64 "\n", __func__, size, remote_ptr, remote_size);
733734
// output serialization format: | remote_ptr (8 bytes) | remote_size (8 bytes) |
734735
output.resize(2*sizeof(uint64_t), 0);
735736
memcpy(output.data(), &remote_ptr, sizeof(remote_ptr));
@@ -758,7 +759,7 @@ static void rpc_buffer_get_base(const std::vector<uint8_t> & input, std::vector<
758759
// input serialization format: | remote_ptr (8 bytes) |
759760
uint64_t remote_ptr;
760761
memcpy(&remote_ptr, input.data(), sizeof(remote_ptr));
761-
GGML_PRINT_DEBUG("[%s] remote_ptr: %lx\n", __func__, remote_ptr);
762+
GGML_PRINT_DEBUG("[%s] remote_ptr: %" PRIx64 "\n", __func__, remote_ptr);
762763
ggml_backend_buffer_t buffer = reinterpret_cast<ggml_backend_buffer_t>(remote_ptr);
763764
void * base = ggml_backend_buffer_get_base(buffer);
764765
// output serialization format: | base_ptr (8 bytes) |
@@ -771,7 +772,7 @@ static void rpc_free_buffer(const std::vector<uint8_t> & input) {
771772
// input serialization format: | remote_ptr (8 bytes) |
772773
uint64_t remote_ptr;
773774
memcpy(&remote_ptr, input.data(), sizeof(remote_ptr));
774-
GGML_PRINT_DEBUG("[%s] remote_ptr: %lx\n", __func__, remote_ptr);
775+
GGML_PRINT_DEBUG("[%s] remote_ptr: %" PRIx64 "\n", __func__, remote_ptr);
775776
ggml_backend_buffer_t buffer = reinterpret_cast<ggml_backend_buffer_t>(remote_ptr);
776777
ggml_backend_buffer_free(buffer);
777778
}
@@ -782,7 +783,7 @@ static void rpc_buffer_clear(const std::vector<uint8_t> & input) {
782783
memcpy(&remote_ptr, input.data(), sizeof(remote_ptr));
783784
uint8_t value;
784785
memcpy(&value, input.data() + sizeof(uint64_t), sizeof(value));
785-
GGML_PRINT_DEBUG("[%s] remote_ptr: %lx, value: %u\n", __func__, remote_ptr, value);
786+
GGML_PRINT_DEBUG("[%s] remote_ptr: %" PRIx64 ", value: %u\n", __func__, remote_ptr, value);
786787
ggml_backend_buffer_t buffer = reinterpret_cast<ggml_backend_buffer_t>(remote_ptr);
787788
ggml_backend_buffer_clear(buffer, value);
788789
}
@@ -801,7 +802,7 @@ static void rpc_set_tensor(const std::vector<uint8_t> & input) {
801802
};
802803
struct ggml_context * ctx = ggml_init(params);
803804
ggml_tensor * tensor = deserialize_tensor(ctx, in_tensor);
804-
GGML_PRINT_DEBUG("[%s] buffer: %p, data: %p, offset: %lu, size: %lu\n", __func__, (void*)tensor->buffer, tensor->data, offset, size);
805+
GGML_PRINT_DEBUG("[%s] buffer: %p, data: %p, offset: %" PRIu64 ", size: %zu\n", __func__, (void*)tensor->buffer, tensor->data, offset, size);
805806
const void * data = input.data() + sizeof(rpc_tensor) + sizeof(offset);
806807
ggml_backend_tensor_set(tensor, data, offset, size);
807808
ggml_free(ctx);
@@ -822,7 +823,7 @@ static void rpc_get_tensor(const std::vector<uint8_t> & input, std::vector<uint8
822823
};
823824
struct ggml_context * ctx = ggml_init(params);
824825
ggml_tensor * tensor = deserialize_tensor(ctx, in_tensor);
825-
GGML_PRINT_DEBUG("[%s] buffer: %p, data: %p, offset: %lu, size: %lu\n", __func__, (void*)tensor->buffer, tensor->data, offset, size);
826+
GGML_PRINT_DEBUG("[%s] buffer: %p, data: %p, offset: %" PRIu64 ", size: %" PRIu64 "\n", __func__, (void*)tensor->buffer, tensor->data, offset, size);
826827
// output serialization format: | data (size bytes) |
827828
output.resize(size, 0);
828829
ggml_backend_tensor_get(tensor, output.data(), offset, size);

0 commit comments

Comments
 (0)