Parcourir la source

Enable -std= for cmake builds, fix warnings (#598)

Stephan Walter il y a 2 ans
Parent
commit
3525899277
2 fichiers modifiés avec 6 ajouts et 4 suppressions
  1. 2 0
      CMakeLists.txt
  2. 4 4
      ggml.c

+ 2 - 0
CMakeLists.txt

@@ -68,7 +68,9 @@ option(LLAMA_BUILD_EXAMPLES         "llama: build examples" ${LLAMA_STANDALONE})
 # Compile flags
 # Compile flags
 #
 #
 
 
+set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED true)
 set(CMAKE_CXX_STANDARD_REQUIRED true)
+set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED true)
 set(CMAKE_C_STANDARD_REQUIRED true)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 find_package(Threads REQUIRED)

+ 4 - 4
ggml.c

@@ -542,8 +542,8 @@ static void quantize_row_q4_0_reference(const float * restrict x, block_q4_0 * r
             const uint8_t vi0 = (int8_t)roundf(v0) + 8;
             const uint8_t vi0 = (int8_t)roundf(v0) + 8;
             const uint8_t vi1 = (int8_t)roundf(v1) + 8;
             const uint8_t vi1 = (int8_t)roundf(v1) + 8;
 
 
-            assert(vi0 >= 0 && vi0 < 16);
-            assert(vi1 >= 0 && vi1 < 16);
+            assert(vi0 < 16);
+            assert(vi1 < 16);
 
 
             pp[l/2] = vi0 | (vi1 << 4);
             pp[l/2] = vi0 | (vi1 << 4);
         }
         }
@@ -837,8 +837,8 @@ static void quantize_row_q4_1_reference(const float * restrict x, void * restric
             const uint8_t vi0 = roundf(v0);
             const uint8_t vi0 = roundf(v0);
             const uint8_t vi1 = roundf(v1);
             const uint8_t vi1 = roundf(v1);
 
 
-            assert(vi0 >= 0 && vi0 < 16);
-            assert(vi1 >= 0 && vi1 < 16);
+            assert(vi0 < 16);
+            assert(vi1 < 16);
 
 
             pp[l/2] = vi0 | (vi1 << 4);
             pp[l/2] = vi0 | (vi1 << 4);
         }
         }