Skip to content

Commit

Permalink
Workaround for QC PC
Browse files Browse the repository at this point in the history
  • Loading branch information
@sykuang
sykuang committed Jul 23, 2024
1 parent 705b7ec commit b18e648
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 68 deletions.
4 changes: 2 additions & 2 deletions ggml/src/ggml-aarch64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ void ggml_gemv_q4_0_4x8_q8_0(int n, float * restrict s, size_t bs, const void *
"__ARM_FEATURE_SVE defined, use the Q4_0_8_8 quantization format for optimal performance");
}
#endif
#if defined(__ARM_NEON) && defined(__ARM_FEATURE_MATMUL_INT8)
#if defined(__ARM_NEON) && defined(__ARM_FEATURE_MATMUL_INT8) && !defined(_MSC_VER)

This comment has been minimized.

Sign in to view

Copy link
@AndreasKunar

AndreasKunar Jul 23, 2024 •
edited
Loading

clang masquerades as MSVC, you should better test with "&& ! ((defined(_MSC_VER)) && ! defined(clang))" - otherwise the conditional also excludes clang for arm64/Windows

P.S: see PR#ggerganov#8531
const void * b_ptr = vx;
const void * a_ptr = vy;
float * res_ptr = s;
Expand Down Expand Up @@ -1271,7 +1271,7 @@ void ggml_gemm_q4_0_4x8_q8_0(int n, float * restrict s, size_t bs, const void *
"__ARM_FEATURE_SVE defined, use the Q4_0_8_8 quantization format for optimal performance");
}
#endif
#if defined(__ARM_NEON) && defined(__ARM_FEATURE_MATMUL_INT8)
#if defined(__ARM_NEON) && defined(__ARM_FEATURE_MATMUL_INT8) && !defined(_MSC_VER)

This comment has been minimized.

Sign in to view

Copy link
@AndreasKunar

AndreasKunar Jul 23, 2024 •
edited
Loading

same - clang masquerades as MSVC, you should better test with "&& ! ((defined(_MSC_VER)) && ! defined(clang))" - otherwise the conditional also excludes clang for arm64/Windows

P.S: see PR#8531
const void * b_ptr = vx;
const void * a_ptr = vy;
float * res_ptr = s;
Expand Down
Loading

0 comments on commit b18e648

Please sign in to comment.