Skip to content
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.

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

Update subgraph test classes functions to use parameters passed by reference #7383

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ using ActivationConcatsEltwiseParamsTuple = typename std::tuple<
class ActivationConcatsEltwise : public testing::WithParamInterface<ActivationConcatsEltwiseParamsTuple>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<ParamType> obj);
static std::string getTestCaseName(const testing::TestParamInfo<ParamType>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ typedef std::tuple<
class ActivationFakeQuantizeSubgraphTest : public testing::WithParamInterface<fqSubgraphTestParamsSet>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<fqSubgraphTestParamsSet> obj);
static std::string getTestCaseName(const testing::TestParamInfo<fqSubgraphTestParamsSet>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ typedef std::tuple<
class Basic_LSTM_S : public testing::WithParamInterface<basicLstmParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<basicLstmParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<basicLstmParams>& obj);

void Run() override;
static std::shared_ptr<ngraph::Function> GetNetwork(size_t thirdDimOut,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ typedef std::tuple<
class BroadcastPowerTest : public testing::WithParamInterface<BroadCastPowerTuple>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<BroadCastPowerTuple> obj);
static std::string getTestCaseName(const testing::TestParamInfo<BroadCastPowerTuple>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ typedef std::tuple<
class ClampFakeQuantizeSubgraphTest : public testing::WithParamInterface<fqSubgraphTestParamsSet>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<fqSubgraphTestParamsSet> obj);
static std::string getTestCaseName(const testing::TestParamInfo<fqSubgraphTestParamsSet>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ typedef std::tuple<
class ConcatConvTest : public testing::WithParamInterface<ConcatConvParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<ConcatConvParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<ConcatConvParams>& obj);
InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override;

protected:
void SetUp() override;
};

} // namespace SubgraphTestsDefinitions
} // namespace SubgraphTestsDefinitions
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ConcatMultiInput : public testing::WithParamInterface<concatMultiParams>,
void GenerateStridedSliceModel();
void GenerateConstOnlyModel();
void GenerateMemoryModel();
static std::string getTestCaseName(testing::TestParamInfo<concatMultiParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<concatMultiParams>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ typedef std::tuple<
class ConcatQuantization : public testing::WithParamInterface<concatQuantizationParams>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<concatQuantizationParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<concatQuantizationParams>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ typedef std::tuple<
class ConstConvConcatTest : public testing::WithParamInterface<ConstConvConcatParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<ConstConvConcatParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<ConstConvConcatParams>& obj);
InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override;

protected:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ typedef std::tuple<
class ConstStridedSliceConcatTest : public testing::WithParamInterface<ConstStridedSliceConcatParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<ConstStridedSliceConcatParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<ConstStridedSliceConcatParams>& obj);
InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override;

protected:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ typedef std::tuple <
class ConstantResultSubgraphTest : public testing::WithParamInterface<constResultParams>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<constResultParams> obj);
void createGraph(ConstantSubgraphType type, const InferenceEngine::SizeVector &inputShape, const InferenceEngine::Precision &inputPrecision);
static std::string getTestCaseName(const testing::TestParamInfo<constResultParams>& obj);
void createGraph(const ConstantSubgraphType& type, const InferenceEngine::SizeVector &inputShape, const InferenceEngine::Precision &inputPrecision);
protected:
void SetUp() override;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ typedef std::tuple<
class ConvFqEltwiseTest : public testing::WithParamInterface<ConvFqEltwiseTestParamsSet>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<ConvFqEltwiseTestParamsSet> obj);
static std::string getTestCaseName(const testing::TestParamInfo<ConvFqEltwiseTestParamsSet>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ typedef std::tuple<
class ConvFqReluTest : public testing::WithParamInterface<ConvFqReluTestParamsSet>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<ConvFqReluTestParamsSet> obj);
static std::string getTestCaseName(const testing::TestParamInfo<ConvFqReluTestParamsSet>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ typedef std::tuple<
class ConvolutionReluSequenceTest : public testing::WithParamInterface<convReluSequenceTestParamsSet>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<convReluSequenceTestParamsSet> obj);
static std::string getTestCaseName(const testing::TestParamInfo<convReluSequenceTestParamsSet>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ class EltwiseBeforeConvTest : public testing::WithParamInterface<EltwiseConvEltw
class EltwiseWithTwoConvsAsInputsTest : public testing::WithParamInterface<EltwiseConvEltwiseParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<EltwiseConvEltwiseParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<EltwiseConvEltwiseParams>& obj);
InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override;

protected:
void SetUp() override;
};

} // namespace SubgraphTestsDefinitions
} // namespace SubgraphTestsDefinitions
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ using EltwiseReshapeActivationParams = typename std::tuple<
class EltwiseReshapeActivation : public testing::WithParamInterface<EltwiseReshapeActivationParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<ParamType> obj);
static std::string getTestCaseName(const testing::TestParamInfo<ParamType>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ typedef std::tuple<
class FcAfterConvTest : public testing::WithParamInterface<FcConvFcParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<FcConvFcParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<FcConvFcParams>& obj);
InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override;

protected:
Expand All @@ -43,7 +43,7 @@ class FcAfterConvTest : public testing::WithParamInterface<FcConvFcParams>,
class FcBeforeConvTest : public testing::WithParamInterface<FcConvFcParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<FcConvFcParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<FcConvFcParams>& obj);
InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override;

protected:
Expand All @@ -53,7 +53,7 @@ class FcBeforeConvTest : public testing::WithParamInterface<FcConvFcParams>,
class FcBetweenConvsTest : public testing::WithParamInterface<FcConvFcParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<FcConvFcParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<FcConvFcParams>& obj);
InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override;

protected:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ typedef std::tuple<
class ConcatFirstInputTest : public testing::WithParamInterface<concatFirstInputParams>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<concatFirstInputParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<concatFirstInputParams>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ typedef std::tuple<
class FqConvFqAffineTest : public testing::WithParamInterface<FqConvFqAffineTestParamsSet>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<FqConvFqAffineTestParamsSet> obj);
static std::string getTestCaseName(const testing::TestParamInfo<FqConvFqAffineTestParamsSet>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ typedef std::tuple<
class InputConvTest : public testing::WithParamInterface<inputConvParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<inputConvParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<inputConvParams>& obj);
InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override;

protected:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ typedef std::tuple<
class InputSplitConcatTest : public testing::WithParamInterface<InputSplitConcatParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<InputSplitConcatParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<InputSplitConcatParams>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ typedef std::tuple<
class MatmulSqueezeAddTest : public testing::WithParamInterface<matmulSqueezeAddParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<matmulSqueezeAddParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<matmulSqueezeAddParams>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ typedef std::tuple<
class ParameterResultSubgraphTest : public testing::WithParamInterface<parameterResultParams>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<parameterResultParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<parameterResultParams>& obj);
protected:
void SetUp() override;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ typedef std::tuple<
class ParameterShapeOfResultSubgraphTest : public testing::WithParamInterface<parameterShapeOfResultParams>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<parameterShapeOfResultParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<parameterShapeOfResultParams>& obj);
protected:
void SetUp() override;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ typedef std::tuple<
class PermConvPermConcat : public testing::WithParamInterface<PermConvPermConcatParams>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<PermConvPermConcatParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<PermConvPermConcatParams>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ typedef std::tuple<
class QuantConvBackpropDataLayerTest : public testing::WithParamInterface<quantConvBackpropDataLayerTestParamsSet>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<quantConvBackpropDataLayerTestParamsSet> obj);
static std::string getTestCaseName(const testing::TestParamInfo<quantConvBackpropDataLayerTestParamsSet>& obj);

protected:
void SetUp() override;
};

} // namespace SubgraphTestsDefinitions
} // namespace SubgraphTestsDefinitions
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ typedef std::tuple<
class QuantGroupConvLayerTest : public testing::WithParamInterface<quantGroupConvLayerTestParamsSet>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<quantGroupConvLayerTestParamsSet> obj);
static std::string getTestCaseName(const testing::TestParamInfo<quantGroupConvLayerTestParamsSet>& obj);

protected:
void SetUp() override;
};

} // namespace SubgraphTestsDefinitions
} // namespace SubgraphTestsDefinitions
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ typedef std::tuple<
class QuantGroupConvBackpropDataLayerTest : public testing::WithParamInterface<quantGroupConvBackpropDataLayerTestParamsSet>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<quantGroupConvBackpropDataLayerTestParamsSet> obj);
static std::string getTestCaseName(const testing::TestParamInfo<quantGroupConvBackpropDataLayerTestParamsSet>& obj);

protected:
void SetUp() override;
};

} // namespace SubgraphTestsDefinitions
} // namespace SubgraphTestsDefinitions
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace SubgraphTestsDefinitions {
class RangeAddSubgraphTest : public testing::WithParamInterface<LayerTestsDefinitions::RangeParams>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<LayerTestsDefinitions::RangeParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<LayerTestsDefinitions::RangeParams>& obj);
protected:
void SetUp() override;
};
Expand All @@ -31,7 +31,7 @@ class RangeAddSubgraphTest : public testing::WithParamInterface<LayerTestsDefini
class RangeNumpyAddSubgraphTest : public testing::WithParamInterface<LayerTestsDefinitions::RangeParams>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<LayerTestsDefinitions::RangeParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<LayerTestsDefinitions::RangeParams>& obj);
protected:
void SetUp() override;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ namespace SubgraphTestsDefinitions {
class ReluShapeOfSubgraphTest : public testing::WithParamInterface<LayerTestsDefinitions::shapeOfParams>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<LayerTestsDefinitions::shapeOfParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<LayerTestsDefinitions::shapeOfParams>& obj);
protected:
void SetUp() override;
};
} // namespace SubgraphTestsDefinitions
} // namespace SubgraphTestsDefinitions
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace SubgraphTestsDefinitions {
class ConvReshapeAct : public testing::WithParamInterface<ConvReshapeActParams>,
virtual public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<ConvReshapeActParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<ConvReshapeActParams>& obj);

protected:
void SetUp() override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ typedef std::tuple<
class ScaleShiftAfterConvTest : public testing::WithParamInterface<ScaleShiftConvScaleShiftParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<ScaleShiftConvScaleShiftParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<ScaleShiftConvScaleShiftParams>& obj);
InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override;

protected:
Expand All @@ -43,7 +43,7 @@ class ScaleShiftAfterConvTest : public testing::WithParamInterface<ScaleShiftCon
class ScaleShiftBeforeConvTest : public testing::WithParamInterface<ScaleShiftConvScaleShiftParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<ScaleShiftConvScaleShiftParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<ScaleShiftConvScaleShiftParams>& obj);
InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override;

protected:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ typedef std::tuple<
class SoftsignTest : public testing::WithParamInterface<softsignParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<softsignParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<softsignParams>& obj);

void Run() override;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ using SplitConcatMemoryParamsTuple = typename std::tuple<
class SplitConcatMemory : public testing::WithParamInterface<SplitConcatMemoryParamsTuple>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<ParamType> obj);
static std::string getTestCaseName(const testing::TestParamInfo<ParamType>& obj);

protected:
void SetUp() override;

int axis;
};

} // namespace SubgraphTestsDefinitions
} // namespace SubgraphTestsDefinitions
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ typedef std::tuple<
class SplitConvTest : public testing::WithParamInterface<SplitConvParams>,
public LayerTestsUtils::LayerTestsCommon {
public:
static std::string getTestCaseName(testing::TestParamInfo<SplitConvParams> obj);
static std::string getTestCaseName(const testing::TestParamInfo<SplitConvParams>& obj);
InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo& info) const override;

protected:
void SetUp() override;
};

} // namespace SubgraphTestsDefinitions
} // namespace SubgraphTestsDefinitions
Loading