From ca2f28eb91f5d6e45574925c734741560f91672f Mon Sep 17 00:00:00 2001 From: cyy Date: Sun, 13 Jul 2025 09:40:04 +0800 Subject: [PATCH 1/4] Don't use deprecated asmjit templates Signed-off-by: cyy --- CMakeLists.txt | 1 - src/EmbeddingSpMDM.cc | 4 ++-- src/EmbeddingSpMDMNBit.cc | 4 ++-- src/FbgemmI64.cc | 2 +- src/GenerateI8Depthwise.cc | 2 +- src/GenerateKernelDirectConvU8S8S32ACC32.cc | 4 ++-- src/GenerateKernelU8S8S32ACC16.cc | 2 +- src/GenerateKernelU8S8S32ACC16Avx512.cc | 2 +- src/GenerateKernelU8S8S32ACC32.cc | 2 +- src/GenerateKernelU8S8S32ACC32Avx512VNNI.cc | 2 +- src/GroupwiseConv.cc | 2 +- src/RowWiseSparseAdagradFused.cc | 2 +- src/SparseAdagrad.cc | 2 +- 13 files changed, 15 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 63f3eb4171..8219362513 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -205,7 +205,6 @@ else(MSVC) string(APPEND CMAKE_CXX_FLAGS " -Wall") string(APPEND CMAKE_CXX_FLAGS " -Wextra") string(APPEND CMAKE_CXX_FLAGS " -Werror") - string(APPEND CMAKE_CXX_FLAGS " -Wno-deprecated-declarations") string(APPEND CMAKE_CXX_FLAGS " -Wunknown-pragmas") string(APPEND CMAKE_CXX_FLAGS " -Wimplicit-fallthrough") string(APPEND CMAKE_CXX_FLAGS " -Wno-strict-aliasing") diff --git a/src/EmbeddingSpMDM.cc b/src/EmbeddingSpMDM.cc index bebaac7be2..f79e35733e 100644 --- a/src/EmbeddingSpMDM.cc +++ b/src/EmbeddingSpMDM.cc @@ -322,7 +322,7 @@ GenEmbeddingSpMDMLookup< if (ROWWISE_SPARSE) { func.init( - asmjit::FuncSignatureT< + asmjit::FuncSignature::build< bool, int64_t, // output_size int64_t, // index_size @@ -337,7 +337,7 @@ GenEmbeddingSpMDMLookup< a->environment()); } else { func.init( - asmjit::FuncSignatureT< + asmjit::FuncSignature::build< bool, int64_t, // output_size int64_t, // index_size diff --git a/src/EmbeddingSpMDMNBit.cc b/src/EmbeddingSpMDMNBit.cc index 2ffe733c7c..62741abd61 100644 --- a/src/EmbeddingSpMDMNBit.cc +++ b/src/EmbeddingSpMDMNBit.cc @@ -293,7 +293,7 @@ GenEmbeddingSpMDMNBitLookup< if (ROWWISE_SPARSE) { func.init( - asmjit::FuncSignatureT< + asmjit::FuncSignature::build< bool, int64_t, // output_size int64_t, // index_size @@ -308,7 +308,7 @@ GenEmbeddingSpMDMNBitLookup< a->environment()); } else { func.init( - asmjit::FuncSignatureT< + asmjit::FuncSignature::build< bool, int64_t, // output_size int64_t, // index_size diff --git a/src/FbgemmI64.cc b/src/FbgemmI64.cc index a0f58c5aff..0254235fe0 100644 --- a/src/FbgemmI64.cc +++ b/src/FbgemmI64.cc @@ -179,7 +179,7 @@ CodeGenBase::getOrCreate( asmjit::FuncDetail func; func.init( - asmjit::FuncSignatureT< + asmjit::FuncSignature::build< void, int64_t*, int64_t*, diff --git a/src/GenerateI8Depthwise.cc b/src/GenerateI8Depthwise.cc index dcfda587f7..a4091ade46 100644 --- a/src/GenerateI8Depthwise.cc +++ b/src/GenerateI8Depthwise.cc @@ -262,7 +262,7 @@ GenI8Depthwise::jit_kernel_signature GenI8Depthwise::getOrCreate( asmjit::FuncDetail func; func.init( - asmjit::FuncSignatureT< + asmjit::FuncSignature::build< void, const std::uint8_t*, const std::int8_t*, diff --git a/src/GenerateKernelDirectConvU8S8S32ACC32.cc b/src/GenerateKernelDirectConvU8S8S32ACC32.cc index 8ba0815531..988b610adb 100644 --- a/src/GenerateKernelDirectConvU8S8S32ACC32.cc +++ b/src/GenerateKernelDirectConvU8S8S32ACC32.cc @@ -227,7 +227,7 @@ DirectConvCodeGenBase::getOrCreateDirectConv( asmjit::FuncDetail func; func.init( - asmjit::FuncSignatureT< + asmjit::FuncSignature::build< void, uint8_t*, int8_t*, @@ -652,7 +652,7 @@ DirectConvCodeGenBase:: asmjit::FuncDetail func; func.init( - asmjit::FuncSignatureT< + asmjit::FuncSignature::build< void, uint8_t*, int8_t*, diff --git a/src/GenerateKernelU8S8S32ACC16.cc b/src/GenerateKernelU8S8S32ACC16.cc index ca8b750672..6bd337dfcd 100644 --- a/src/GenerateKernelU8S8S32ACC16.cc +++ b/src/GenerateKernelU8S8S32ACC16.cc @@ -183,7 +183,7 @@ CodeGenBase::getOrCreate( asmjit::FuncDetail func; func.init( - asmjit::FuncSignatureT< + asmjit::FuncSignature::build< void, uint8_t*, int8_t*, diff --git a/src/GenerateKernelU8S8S32ACC16Avx512.cc b/src/GenerateKernelU8S8S32ACC16Avx512.cc index bfebc152be..716626af9a 100644 --- a/src/GenerateKernelU8S8S32ACC16Avx512.cc +++ b/src/GenerateKernelU8S8S32ACC16Avx512.cc @@ -144,7 +144,7 @@ CodeGenBase::getOrCreate( asmjit::FuncDetail func; func.init( - asmjit::FuncSignatureT< + asmjit::FuncSignature::build< void, uint8_t*, int8_t*, diff --git a/src/GenerateKernelU8S8S32ACC32.cc b/src/GenerateKernelU8S8S32ACC32.cc index d71dbe7f33..b6b506af67 100644 --- a/src/GenerateKernelU8S8S32ACC32.cc +++ b/src/GenerateKernelU8S8S32ACC32.cc @@ -182,7 +182,7 @@ CodeGenBase::getOrCreate( asmjit::FuncDetail func; func.init( - asmjit::FuncSignatureT< + asmjit::FuncSignature::build< void, uint8_t*, int8_t*, diff --git a/src/GenerateKernelU8S8S32ACC32Avx512VNNI.cc b/src/GenerateKernelU8S8S32ACC32Avx512VNNI.cc index d4b4981f71..f2c73a4d32 100644 --- a/src/GenerateKernelU8S8S32ACC32Avx512VNNI.cc +++ b/src/GenerateKernelU8S8S32ACC32Avx512VNNI.cc @@ -136,7 +136,7 @@ CodeGenBase::getOrCreate( asmjit::FuncDetail func; func.init( - asmjit::FuncSignatureT< + asmjit::FuncSignature::build< void, uint8_t*, int8_t*, diff --git a/src/GroupwiseConv.cc b/src/GroupwiseConv.cc index 5b90bf5612..b320981e4c 100644 --- a/src/GroupwiseConv.cc +++ b/src/GroupwiseConv.cc @@ -217,7 +217,7 @@ jit_conv_kernel_fp GenConvKernel::getOrCreate() { scratchReg2_ = a->gpz(13); func_.init( - asmjit::FuncSignatureT< + asmjit::FuncSignature::build< void, uint8_t*, int8_t*, diff --git a/src/RowWiseSparseAdagradFused.cc b/src/RowWiseSparseAdagradFused.cc index 0b1373ae7c..f1624dd4bd 100644 --- a/src/RowWiseSparseAdagradFused.cc +++ b/src/RowWiseSparseAdagradFused.cc @@ -168,7 +168,7 @@ typename ReturnFunctionSignature:: asmjit::FuncDetail func; func.init( - asmjit::FuncSignatureT< + asmjit::FuncSignature::build< bool, // return type int64_t, // output_size int64_t, // index_size diff --git a/src/SparseAdagrad.cc b/src/SparseAdagrad.cc index ce42201946..c489e2c566 100644 --- a/src/SparseAdagrad.cc +++ b/src/SparseAdagrad.cc @@ -500,7 +500,7 @@ GenSparseAdagrad::getOrCreate( asmjit::FuncDetail func; func.init( - asmjit::FuncSignatureT< + asmjit::FuncSignature::build< int, // return type int, // num rows std::uint64_t, // param_size From 5c1d06c5322093d1050014d4f7201caccd3cda7b Mon Sep 17 00:00:00 2001 From: cyy Date: Mon, 14 Jul 2025 20:50:14 +0800 Subject: [PATCH 2/4] Fix gtest deprecated functions Signed-off-by: cyy --- test/EmbeddingSpMDM8BitTest.cc | 2 +- test/EmbeddingSpMDMNBitTest.cc | 2 +- test/EmbeddingSpMDMTest.cc | 6 +++--- test/FP16Test.cc | 2 +- test/FP32Test.cc | 2 +- test/Float16ConvertTest.cc | 2 +- test/GConvTest.cc | 6 +++--- test/I8DepthwiseTest.cc | 6 +++--- test/I8DirectconvTest.cc | 6 +++--- test/I8SpmdmTest.cc | 2 +- test/Im2ColFusedRequantizeTest.cc | 2 +- test/PackedRequantizeAcc16Test.cc | 6 +++--- test/PackedRequantizeTest.cc | 6 +++--- test/QuantUtilsTest.cc | 12 ++++++------ test/RequantizeOnlyTest.cc | 2 +- test/RowWiseSparseAdagradFusedTest.cc | 2 +- test/SparseAdagradTest.cc | 2 +- test/SparseDenseMMInt8Test.cc | 2 +- test/SparsePackUnpackTest.cc | 2 +- test/TransposedRequantizeTest.cc | 2 +- test/UniConvTest.cc | 4 ++-- 21 files changed, 39 insertions(+), 39 deletions(-) diff --git a/test/EmbeddingSpMDM8BitTest.cc b/test/EmbeddingSpMDM8BitTest.cc index 514de02ceb..cba5eee39d 100644 --- a/test/EmbeddingSpMDM8BitTest.cc +++ b/test/EmbeddingSpMDM8BitTest.cc @@ -58,7 +58,7 @@ class Fused8BitRowwiseEmbeddingLookupTest EmbeddingSpMDMOutputDtypeChoice>> {}; }; // namespace -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, Fused8BitRowwiseEmbeddingLookupTest, ::testing::Combine( diff --git a/test/EmbeddingSpMDMNBitTest.cc b/test/EmbeddingSpMDMNBitTest.cc index 5251455f4e..abe99687d3 100644 --- a/test/EmbeddingSpMDMNBitTest.cc +++ b/test/EmbeddingSpMDMNBitTest.cc @@ -61,7 +61,7 @@ class FusedNBitRowwiseEmbeddingLookupTest : public testing::TestWithParam> {}; }; // namespace -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, FusedNBitRowwiseEmbeddingLookupTest, ::testing::Combine( diff --git a/test/EmbeddingSpMDMTest.cc b/test/EmbeddingSpMDMTest.cc index f1011d9d4e..8f8772edab 100644 --- a/test/EmbeddingSpMDMTest.cc +++ b/test/EmbeddingSpMDMTest.cc @@ -67,7 +67,7 @@ class IndexRemapTest static vector prefetch_distances = {0, 16, 1000000}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, EmbeddingSpMDMTest, ::testing::Combine( @@ -84,7 +84,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(FLOAT, FLOAT16, BFLOAT16), ::testing::Values(FLOAT, FLOAT16, BFLOAT16))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, rowwiseSparseEmbeddingSpMDMTest, ::testing::Combine( @@ -99,7 +99,7 @@ INSTANTIATE_TEST_CASE_P( OUT_OF_BOUND_INDICES, UNMATCHED_NUM_INDICES_AND_LENGTHS_SUM))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, IndexRemapTest, ::testing::Combine( diff --git a/test/FP16Test.cc b/test/FP16Test.cc index 45526a676f..eaa69e8a27 100644 --- a/test/FP16Test.cc +++ b/test/FP16Test.cc @@ -13,7 +13,7 @@ using FBGemmFP16Test = fbgemm::FBGemmFPTest; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, FBGemmFP16Test, ::testing::Values( diff --git a/test/FP32Test.cc b/test/FP32Test.cc index 69265dcfe2..0bbe28902f 100644 --- a/test/FP32Test.cc +++ b/test/FP32Test.cc @@ -20,7 +20,7 @@ using FBGemmFP32Test = fbgemm::FBGemmFPTest; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, FBGemmFP32Test, ::testing::Values( diff --git a/test/Float16ConvertTest.cc b/test/Float16ConvertTest.cc index e1b46f37a3..e893b7a6cd 100644 --- a/test/Float16ConvertTest.cc +++ b/test/Float16ConvertTest.cc @@ -21,7 +21,7 @@ namespace { class FBGemmFloat16Test : public testing::TestWithParam {}; }; // namespace -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, FBGemmFloat16Test, ::testing::Bool()); diff --git a/test/GConvTest.cc b/test/GConvTest.cc index c1289e62c8..ef354ce969 100644 --- a/test/GConvTest.cc +++ b/test/GConvTest.cc @@ -49,14 +49,14 @@ class fbgemmGConvAcc32WithQuantGranularityTest class fbgemmGConvPackTest : public testing::TestWithParam {}; }; // namespace -// INSTANTIATE_TEST_CASE_P( +// INSTANTIATE_TEST_SUITE_P( // InstantiationName, // fbgemmGConvAcc32Test, // ::testing::Combine( // ::testing::Values(matrix_op_t::NoTranspose), // ::testing::ValuesIn(transposeVals))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, fbgemmGConvAcc32WithQuantGranularityTest, ::testing::Combine( @@ -66,7 +66,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Bool(), // A symmetric ::testing::Bool())); // B symmetric -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, fbgemmGConvPackTest, ::testing::ValuesIn(transposeVals)); diff --git a/test/I8DepthwiseTest.cc b/test/I8DepthwiseTest.cc index d9a9349c54..c077c3aee4 100644 --- a/test/I8DepthwiseTest.cc +++ b/test/I8DepthwiseTest.cc @@ -107,7 +107,7 @@ class FBGemmDepthWisePackUnpackTest } // namespace -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, FBGemmDepthWiseTest, ::testing::Combine( @@ -115,12 +115,12 @@ INSTANTIATE_TEST_CASE_P( ::testing::Bool(), // b_symmetric ::testing::Values(1, 2))); // oc_per_g -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, FBGemmDepthWisePerChannelQuantizationTest, ::testing::Values(1, 2)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, FBGemmDepthWisePackUnpackTest, ::testing::Combine( diff --git a/test/I8DirectconvTest.cc b/test/I8DirectconvTest.cc index 4f01a47ad3..7d66cdec37 100644 --- a/test/I8DirectconvTest.cc +++ b/test/I8DirectconvTest.cc @@ -248,7 +248,7 @@ static void QuantizeDirectConv_ref( } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, FBGemmDirectConvTest, ::testing::Combine( @@ -418,7 +418,7 @@ TEST_P(FBGemmDirectConvTest, Test2D) { */ -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, FBGemmDirectConvTransTest, ::testing::Combine( @@ -608,7 +608,7 @@ TEST_P(FBGemmDirectConvTransTest, Test2D) { } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, FBGemmDirectConvTransFbgemmTest, ::testing::Combine( diff --git a/test/I8SpmdmTest.cc b/test/I8SpmdmTest.cc index 682fedfcbe..d740a85a93 100644 --- a/test/I8SpmdmTest.cc +++ b/test/I8SpmdmTest.cc @@ -35,7 +35,7 @@ class fbgemmSPMDMTest : public testing::TestWithParam> {}; } // namespace -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Instance0, fbgemmSPMDMTest, ::testing::Combine( diff --git a/test/Im2ColFusedRequantizeTest.cc b/test/Im2ColFusedRequantizeTest.cc index 180c967463..0f4bf9e80a 100644 --- a/test/Im2ColFusedRequantizeTest.cc +++ b/test/Im2ColFusedRequantizeTest.cc @@ -36,7 +36,7 @@ class fbgemmIm2colTest : public testing::TestWithParam> {}; }; // namespace -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, fbgemmIm2colTest, ::testing::Combine( diff --git a/test/PackedRequantizeAcc16Test.cc b/test/PackedRequantizeAcc16Test.cc index cb2eba5c82..434c9fccaf 100644 --- a/test/PackedRequantizeAcc16Test.cc +++ b/test/PackedRequantizeAcc16Test.cc @@ -48,7 +48,7 @@ class fbgemmPackUnpackAcc16Test : public testing::TestWithParam> {}; }; // namespace -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, fbgemmu8s8acc16WithQuantGranularityTest, ::testing::Combine( @@ -57,7 +57,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Bool(), ::testing::ValuesIn(qGranularityVals))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, fbgemmu8s8acc16Test, ::testing::Combine( @@ -65,7 +65,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(transposeVals), ::testing::Bool())); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, fbgemmPackUnpackAcc16Test, ::testing::Combine(::testing::ValuesIn(transposeVals), ::testing::Bool())); diff --git a/test/PackedRequantizeTest.cc b/test/PackedRequantizeTest.cc index 91912153cb..22de3f7230 100644 --- a/test/PackedRequantizeTest.cc +++ b/test/PackedRequantizeTest.cc @@ -47,7 +47,7 @@ class fbgemmPackUnpackAcc32Test : public testing::TestWithParam> {}; }; // namespace -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, fbgemmu8s8acc32WithQuantGranularityTest, ::testing::Combine( @@ -56,7 +56,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Bool(), ::testing::ValuesIn(qGranularityVals))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, fbgemmu8s8acc32Test, ::testing::Combine( @@ -64,7 +64,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(transposeVals), ::testing::Bool())); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, fbgemmPackUnpackAcc32Test, ::testing::Combine(::testing::ValuesIn(transposeVals), ::testing::Bool())); diff --git a/test/QuantUtilsTest.cc b/test/QuantUtilsTest.cc index f5f305a263..008be38a3c 100644 --- a/test/QuantUtilsTest.cc +++ b/test/QuantUtilsTest.cc @@ -42,7 +42,7 @@ class EmbeddingQuantizeTest class EmbeddingQuantizeSBFloatTest : public testing::TestWithParam> {}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, QuantizeGroupwiseTest, ::testing::Combine( @@ -52,17 +52,17 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn({1, 4}), // G ::testing::ValuesIn({layout_t::KCX, layout_t::KXC}))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, QuantizeTest, ::testing::Values(1, 2, 5, 8, 9, 16, 20, 28, 32, 33)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, FusedQuantizeDequantizeTest, ::testing::Values(1, 2, 5, 8, 9, 16, 20, 28, 32, 33)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, EmbeddingQuantizeTest, ::testing::Combine( @@ -70,7 +70,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn({1, 2, 3}), ::testing::ValuesIn({4, 8, 16, 20, 28, 32, 64, 84}))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, EmbeddingQuantizeSBFloatTest, ::testing::Combine( @@ -604,7 +604,7 @@ class EmbeddingQuantizeFixedNumberTest : public testing::TestWithParam { std::vector expected_output_float; }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, EmbeddingQuantizeFixedNumberTest, ::testing::ValuesIn({2, 4, 8})); diff --git a/test/RequantizeOnlyTest.cc b/test/RequantizeOnlyTest.cc index 55fd31f98e..10fd8a11f0 100644 --- a/test/RequantizeOnlyTest.cc +++ b/test/RequantizeOnlyTest.cc @@ -35,7 +35,7 @@ class FloatRequantizeTest }; // namespace -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, FloatRequantizeTest, ::testing::Combine( diff --git a/test/RowWiseSparseAdagradFusedTest.cc b/test/RowWiseSparseAdagradFusedTest.cc index c59ddc6820..72925de5de 100644 --- a/test/RowWiseSparseAdagradFusedTest.cc +++ b/test/RowWiseSparseAdagradFusedTest.cc @@ -68,7 +68,7 @@ class RowWiseSparseAdagradFusedTest : public testing::TestWithParam> {}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, SPMMInt8Test, ::testing::Combine( diff --git a/test/SparsePackUnpackTest.cc b/test/SparsePackUnpackTest.cc index 616640b4a9..b22090faa8 100644 --- a/test/SparsePackUnpackTest.cc +++ b/test/SparsePackUnpackTest.cc @@ -20,7 +20,7 @@ using namespace fbgemm; // tuple represents N and K class packUnpackTest : public testing::TestWithParam> {}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, packUnpackTest, ::testing::Combine( diff --git a/test/TransposedRequantizeTest.cc b/test/TransposedRequantizeTest.cc index e0e10ddbb7..fde9dd810e 100644 --- a/test/TransposedRequantizeTest.cc +++ b/test/TransposedRequantizeTest.cc @@ -35,7 +35,7 @@ class RequantizeTest }; // namespace -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, RequantizeTest, ::testing::Combine( diff --git a/test/UniConvTest.cc b/test/UniConvTest.cc index 7c3f01df90..f75f057862 100644 --- a/test/UniConvTest.cc +++ b/test/UniConvTest.cc @@ -165,7 +165,7 @@ class UniConvQGranTest }; // namespace // Combine only allows at most 10 generators. -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, uniConvTest, ::testing::Combine( @@ -180,7 +180,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn({1, 2}), // stride ::testing::ValuesIn({0, 1, 2}))); // pad -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( InstantiationName, UniConvQGranTest, ::testing::Combine( From 1a7529aa818b02e7893cde6c18b12b37149fe519 Mon Sep 17 00:00:00 2001 From: cyy Date: Tue, 15 Jul 2025 09:24:34 +0800 Subject: [PATCH 3/4] Disable MacOS warnings on CLAPACK Signed-off-by: cyy --- bench/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bench/CMakeLists.txt b/bench/CMakeLists.txt index 262bb1df9c..2860137d30 100644 --- a/bench/CMakeLists.txt +++ b/bench/CMakeLists.txt @@ -20,7 +20,7 @@ if (NOT ${MKL_FOUND}) endif() if (USE_SANITIZER) - message(WARNING "USING SANITIZER IN TEST") + message(WARNING "USING SANITIZER IN TEST") endif() if (${OpenMP_FOUND}) @@ -59,6 +59,9 @@ macro(add_benchmark BENCHNAME) "-fsanitize=${USE_SANITIZER}" "-fno-omit-frame-pointer") target_link_options(${BENCHNAME} PRIVATE "-fsanitize=${USE_SANITIZER}") endif() + if (APPLE) + target_link_options(${BENCHNAME} PRIVATE " -Wno-deprecated-declarations") + endif() if(OpenMP_FOUND) target_link_libraries(${BENCHNAME} OpenMP::OpenMP_CXX) From 415199501345ac66a835f7efbd1ce88a6255113a Mon Sep 17 00:00:00 2001 From: cyy Date: Tue, 15 Jul 2025 12:13:20 +0800 Subject: [PATCH 4/4] Recover -Wno-deprecated-declarations due to MacOS errors Signed-off-by: cyy --- CMakeLists.txt | 1 + bench/CMakeLists.txt | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8219362513..63f3eb4171 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -205,6 +205,7 @@ else(MSVC) string(APPEND CMAKE_CXX_FLAGS " -Wall") string(APPEND CMAKE_CXX_FLAGS " -Wextra") string(APPEND CMAKE_CXX_FLAGS " -Werror") + string(APPEND CMAKE_CXX_FLAGS " -Wno-deprecated-declarations") string(APPEND CMAKE_CXX_FLAGS " -Wunknown-pragmas") string(APPEND CMAKE_CXX_FLAGS " -Wimplicit-fallthrough") string(APPEND CMAKE_CXX_FLAGS " -Wno-strict-aliasing") diff --git a/bench/CMakeLists.txt b/bench/CMakeLists.txt index 2860137d30..262bb1df9c 100644 --- a/bench/CMakeLists.txt +++ b/bench/CMakeLists.txt @@ -20,7 +20,7 @@ if (NOT ${MKL_FOUND}) endif() if (USE_SANITIZER) - message(WARNING "USING SANITIZER IN TEST") + message(WARNING "USING SANITIZER IN TEST") endif() if (${OpenMP_FOUND}) @@ -59,9 +59,6 @@ macro(add_benchmark BENCHNAME) "-fsanitize=${USE_SANITIZER}" "-fno-omit-frame-pointer") target_link_options(${BENCHNAME} PRIVATE "-fsanitize=${USE_SANITIZER}") endif() - if (APPLE) - target_link_options(${BENCHNAME} PRIVATE " -Wno-deprecated-declarations") - endif() if(OpenMP_FOUND) target_link_libraries(${BENCHNAME} OpenMP::OpenMP_CXX)