Skip to content

Commit

Permalink
now compiling again,
Browse files Browse the repository at this point in the history
  • Loading branch information
mike dupont committed Nov 21, 2023
1 parent f62b81d commit 19a8830
Show file tree
Hide file tree
Showing 5 changed files with 262 additions and 223 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ if (LLAMA_MPI)
if (MPI_C_FOUND)
message(STATUS "MPI found")
set(GGML_HEADERS_MPI ggml-mpi.h)
set(GGML_SOURCES_MPI ggml-mpi.c ggml-mpi.h)
set(GGML_SOURCES_MPI ggml-mpi.cpp ggml-mpi.h)
add_compile_definitions(GGML_USE_MPI)
add_compile_definitions(${MPI_C_COMPILE_DEFINITIONS})
if (NOT MSVC)
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ ggml-metal.o: ggml-metal.m ggml-metal.h
endif # LLAMA_METAL

ifdef LLAMA_MPI
ggml-mpi.o: ggml-mpi.c ggml-mpi.h
ggml-mpi.o: ggml-mpi.cpp ggml-mpi.h
$(CC) $(CFLAGS) -c $< -o $@
endif # LLAMA_MPI

Expand Down Expand Up @@ -537,16 +537,16 @@ $(info )
# Build library
#

ggml.o: ggml.c ggml.h ggml-cuda.h
ggml.o: ggml.cpp ggml.h ggml-cuda.h
$(CXX) $(CXXFLAGS) -c $< -o $@

ggml-alloc.o: ggml-alloc.c ggml.h ggml-alloc.h
ggml-alloc.o: ggml-alloc.cpp ggml.h ggml-alloc.h
$(CXX) $(CXXFLAGS) -c $< -o $@

ggml-backend.o: ggml-backend.c ggml.h ggml-backend.h
ggml-backend.o: ggml-backend.cpp ggml.h ggml-backend.h
$(CXX) $(CXXFLAGS) -c $< -o $@

ggml-quants.o: ggml-quants.c ggml.h ggml-quants.h
ggml-quants.o: ggml-quants.cpp ggml.h ggml-quants.h
$(CXX) $(CXXFLAGS) -c $< -o $@

OBJS += ggml-alloc.o ggml-backend.o ggml-quants.o
Expand Down
4 changes: 2 additions & 2 deletions ggml-quants.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6595,8 +6595,8 @@ void ggml_vec_dot_q5_K_q8_K(const int n, float * __restrict__ s, const void * __
void ggml_vec_dot_q6_K_q8_K(const int n, float * __restrict__ s, const void * __restrict__ vx, const void * __restrict__ vy) {
assert(n % QK_K == 0);

const block_q6_K * __restrict__ x = vx;
const block_q8_K * __restrict__ y = vy;
const block_q6_K * __restrict__ x = (const block_q6_K *)vx;
const block_q8_K * __restrict__ y = (const block_q8_K *)vy;

const int nb = n / QK_K;

Expand Down
Loading

0 comments on commit 19a8830

Please sign in to comment.