Skip to content

Don't use deprecated asmjit templates #4481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+54 −54
Open

Don't use deprecated asmjit templates #4481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca2f28e
Don't use deprecated asmjit templates
cyyever Jul 13, 2025
5c1d06c
Fix gtest deprecated functions
cyyever Jul 14, 2025
1a7529a
Disable MacOS warnings on CLAPACK
cyyever Jul 15, 2025
7d7fcfd
Merge branch 'main' into deprecated2
cyyever Jul 15, 2025
4151995
Recover -Wno-deprecated-declarations due to MacOS errors
cyyever Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/EmbeddingSpMDM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ GenEmbeddingSpMDMLookup<

if constexpr (ROWWISE_SPARSE) {
func.init(
asmjit::FuncSignatureT<
asmjit::FuncSignature::build<
bool,
int64_t, // output_size
int64_t, // index_size
Expand All @@ -334,7 +334,7 @@ GenEmbeddingSpMDMLookup<
a->environment());
} else {
func.init(
asmjit::FuncSignatureT<
asmjit::FuncSignature::build<
bool,
int64_t, // output_size
int64_t, // index_size
Expand Down
4 changes: 2 additions & 2 deletions src/EmbeddingSpMDMNBit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ GenEmbeddingSpMDMNBitLookup<

if constexpr (ROWWISE_SPARSE) {
func.init(
asmjit::FuncSignatureT<
asmjit::FuncSignature::build<
bool,
int64_t, // output_size
int64_t, // index_size
Expand All @@ -305,7 +305,7 @@ GenEmbeddingSpMDMNBitLookup<
a->environment());
} else {
func.init(
asmjit::FuncSignatureT<
asmjit::FuncSignature::build<
bool,
int64_t, // output_size
int64_t, // index_size
Expand Down
2 changes: 1 addition & 1 deletion src/FbgemmI64.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ CodeGenBase<int64_t, int64_t, int64_t, int64_t>::getOrCreate(

asmjit::FuncDetail func;
func.init(
asmjit::FuncSignatureT<
asmjit::FuncSignature::build<
void,
int64_t*,
int64_t*,
Expand Down
2 changes: 1 addition & 1 deletion src/GenerateI8Depthwise.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*,
Expand Down
4 changes: 2 additions & 2 deletions src/GenerateKernelDirectConvU8S8S32ACC32.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ DirectConvCodeGenBase<uint8_t, int8_t, int32_t, int32_t>::getOrCreateDirectConv(

asmjit::FuncDetail func;
func.init(
asmjit::FuncSignatureT<
asmjit::FuncSignature::build<
void,
uint8_t*,
int8_t*,
Expand Down Expand Up @@ -650,7 +650,7 @@ DirectConvCodeGenBase<uint8_t, int8_t, int32_t, int32_t>::

asmjit::FuncDetail func;
func.init(
asmjit::FuncSignatureT<
asmjit::FuncSignature::build<
void,
uint8_t*,
int8_t*,
Expand Down
2 changes: 1 addition & 1 deletion src/GenerateKernelU8S8S32ACC16.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ CodeGenBase<uint8_t, int8_t, int32_t, int16_t>::getOrCreate<inst_set_t::avx2>(

asmjit::FuncDetail func;
func.init(
asmjit::FuncSignatureT<
asmjit::FuncSignature::build<
void,
uint8_t*,
int8_t*,
Expand Down
2 changes: 1 addition & 1 deletion src/GenerateKernelU8S8S32ACC16Avx512.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ CodeGenBase<uint8_t, int8_t, int32_t, int16_t>::getOrCreate(

asmjit::FuncDetail func;
func.init(
asmjit::FuncSignatureT<
asmjit::FuncSignature::build<
void,
uint8_t*,
int8_t*,
Expand Down
2 changes: 1 addition & 1 deletion src/GenerateKernelU8S8S32ACC32.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ CodeGenBase<uint8_t, int8_t, int32_t, int32_t>::getOrCreate(

asmjit::FuncDetail func;
func.init(
asmjit::FuncSignatureT<
asmjit::FuncSignature::build<
void,
uint8_t*,
int8_t*,
Expand Down
2 changes: 1 addition & 1 deletion src/GenerateKernelU8S8S32ACC32Avx512VNNI.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ CodeGenBase<uint8_t, int8_t, int32_t, int32_t>::getOrCreate(

asmjit::FuncDetail func;
func.init(
asmjit::FuncSignatureT<
asmjit::FuncSignature::build<
void,
uint8_t*,
int8_t*,
Expand Down
2 changes: 1 addition & 1 deletion src/GroupwiseConv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ jit_conv_kernel_fp GenConvKernel<SPATIAL_DIM, INST_SET>::getOrCreate() {
scratchReg2_ = a->gpz(13);

func_.init(
asmjit::FuncSignatureT<
asmjit::FuncSignature::build<
void,
uint8_t*,
int8_t*,
Expand Down
2 changes: 1 addition & 1 deletion src/RowWiseSparseAdagradFused.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ typename ReturnFunctionSignature<indxType, offsetType, dataType>::

asmjit::FuncDetail func;
func.init(
asmjit::FuncSignatureT<
asmjit::FuncSignature::build<
bool, // return type
int64_t, // output_size
int64_t, // index_size
Expand Down
2 changes: 1 addition & 1 deletion src/SparseAdagrad.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ GenSparseAdagrad<indxType, instSet>::getOrCreate(

asmjit::FuncDetail func;
func.init(
asmjit::FuncSignatureT<
asmjit::FuncSignature::build<
int, // return type
int, // num rows
std::uint64_t, // param_size
Expand Down
2 changes: 1 addition & 1 deletion test/EmbeddingSpMDM8BitTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class Fused8BitRowwiseEmbeddingLookupTest
EmbeddingSpMDMOutputDtypeChoice>> {};
}; // namespace

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
Fused8BitRowwiseEmbeddingLookupTest,
::testing::Combine(
Expand Down
2 changes: 1 addition & 1 deletion test/EmbeddingSpMDMNBitTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class FusedNBitRowwiseEmbeddingLookupTest : public testing::TestWithParam<tuple<
EmbeddingSpMDMDtypeChoice>> {};
}; // namespace

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
FusedNBitRowwiseEmbeddingLookupTest,
::testing::Combine(
Expand Down
6 changes: 3 additions & 3 deletions test/EmbeddingSpMDMTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class IndexRemapTest

static vector<int> prefetch_distances = {0, 16, 1000000};

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
EmbeddingSpMDMTest,
::testing::Combine(
Expand All @@ -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(
Expand All @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion test/FP16Test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

using FBGemmFP16Test = fbgemm::FBGemmFPTest<fbgemm::float16>;

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
FBGemmFP16Test,
::testing::Values(
Expand Down
2 changes: 1 addition & 1 deletion test/FP32Test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

using FBGemmFP32Test = fbgemm::FBGemmFPTest<float>;

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
FBGemmFP32Test,
::testing::Values(
Expand Down
2 changes: 1 addition & 1 deletion test/Float16ConvertTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace {
class FBGemmFloat16Test : public testing::TestWithParam<bool> {};
}; // namespace

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
FBGemmFloat16Test,
::testing::Bool());
Expand Down
6 changes: 3 additions & 3 deletions test/GConvTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ class fbgemmGConvAcc32WithQuantGranularityTest
class fbgemmGConvPackTest : public testing::TestWithParam<matrix_op_t> {};
}; // 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(
Expand All @@ -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));
Expand Down
6 changes: 3 additions & 3 deletions test/I8DepthwiseTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,20 +107,20 @@ class FBGemmDepthWisePackUnpackTest

} // namespace

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
FBGemmDepthWiseTest,
::testing::Combine(
::testing::Bool(), // a_symmetric
::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(
Expand Down
6 changes: 3 additions & 3 deletions test/I8DirectconvTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ static void QuantizeDirectConv_ref(
}
}
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
FBGemmDirectConvTest,
::testing::Combine(
Expand Down Expand Up @@ -418,7 +418,7 @@ TEST_P(FBGemmDirectConvTest, Test2D) {
*/


INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
FBGemmDirectConvTransTest,
::testing::Combine(
Expand Down Expand Up @@ -606,7 +606,7 @@ TEST_P(FBGemmDirectConvTransTest, Test2D) {
}


INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
FBGemmDirectConvTransFbgemmTest,
::testing::Combine(
Expand Down
2 changes: 1 addition & 1 deletion test/I8SpmdmTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class fbgemmSPMDMTest
: public testing::TestWithParam<std::tuple<float, bool, bool>> {};
} // namespace

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
Instance0,
fbgemmSPMDMTest,
::testing::Combine(
Expand Down
2 changes: 1 addition & 1 deletion test/Im2ColFusedRequantizeTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class fbgemmIm2colTest
: public testing::TestWithParam<tuple<QuantizationGranularity, bool>> {};
}; // namespace

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
fbgemmIm2colTest,
::testing::Combine(
Expand Down
6 changes: 3 additions & 3 deletions test/PackedRequantizeAcc16Test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class fbgemmPackUnpackAcc16Test
: public testing::TestWithParam<tuple<matrix_op_t, bool>> {};
}; // namespace

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
fbgemmu8s8acc16WithQuantGranularityTest,
::testing::Combine(
Expand All @@ -57,15 +57,15 @@ INSTANTIATE_TEST_CASE_P(
::testing::Bool(),
::testing::ValuesIn(qGranularityVals)));

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
fbgemmu8s8acc16Test,
::testing::Combine(
::testing::Values(matrix_op_t::NoTranspose),
::testing::ValuesIn(transposeVals),
::testing::Bool()));

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
fbgemmPackUnpackAcc16Test,
::testing::Combine(::testing::ValuesIn(transposeVals), ::testing::Bool()));
Expand Down
6 changes: 3 additions & 3 deletions test/PackedRequantizeTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class fbgemmPackUnpackAcc32Test
: public testing::TestWithParam<tuple<matrix_op_t, bool>> {};
}; // namespace

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
fbgemmu8s8acc32WithQuantGranularityTest,
::testing::Combine(
Expand All @@ -55,15 +55,15 @@ INSTANTIATE_TEST_CASE_P(
::testing::Bool(),
::testing::ValuesIn(qGranularityVals)));

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
fbgemmu8s8acc32Test,
::testing::Combine(
::testing::ValuesIn(transposeVals),
::testing::ValuesIn(transposeVals),
::testing::Bool()));

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
InstantiationName,
fbgemmPackUnpackAcc32Test,
::testing::Combine(::testing::ValuesIn(transposeVals), ::testing::Bool()));
Expand Down
Loading