Skip to content

Commit

Permalink
Transformation tests API 2.0 transition (#707)
Browse files Browse the repository at this point in the history
  • Loading branch information
@itikhono
itikhono authored Aug 24, 2023
1 parent a58d23c commit cd15db7
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions modules/nvidia_plugin/tests/unit/transformations/cuda_transformations_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using namespace testing;
TEST(TransformationTests, cuda_transformations_f16) {
std::shared_ptr<ov::Model> model, model_ref;
{
// Example function
// Example model
auto data = std::make_shared<ov::opset10::Parameter>(ov::element::f32, ov::Shape{3, 1, 2});
auto divide_constant = ov::opset10::Constant::create(ov::element::f32, ov::Shape{1}, {2});
auto divide = std::make_shared<ov::opset10::Divide>(data, divide_constant);
Expand All @@ -37,7 +37,7 @@ TEST(TransformationTests, cuda_transformations_f16) {
}

{
// Example reference function
// Example reference model
auto data = std::make_shared<ov::op::v0::Parameter>(ov::element::f32, ov::Shape{3, 1, 2});
auto convert_f16 = std::make_shared<ov::opset10::Convert>(data, ov::element::f16);
auto mul_constant = ov::opset10::Constant::create(ov::element::f16, ov::Shape{1, 1, 1}, {0.5});
Expand Down
26 changes: 13 additions & 13 deletions modules/nvidia_plugin/tests/unit/transformations/fuse_conv_biasadd_activation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ struct ConvParams {
ov::op::PadType pad_type;
};

std::shared_ptr<ov::Model> createFunction(const ModelType& model_type,
std::shared_ptr<ov::Model> createModel(const ModelType& model_type,
const ActivationMode& act_type,
const ConvParams& conv_params) {
std::shared_ptr<ov::Node> last_op = nullptr;
Expand Down Expand Up @@ -160,7 +160,7 @@ std::shared_ptr<ov::Model> createFunction(const ModelType& model_type,
}

template <typename TFusedConvolution>
std::shared_ptr<ov::Model> createRefFunction(const ModelType& model_type,
std::shared_ptr<ov::Model> createRefModel(const ModelType& model_type,
const ActivationMode& act_type,
const ConvParams& conv_params) {
std::shared_ptr<ov::Node> last_op = nullptr;
Expand Down Expand Up @@ -242,15 +242,15 @@ class FuseConvTestCommonFixture: public ::testing::WithParamInterface<std::tuple
ConvParams conv_params;
std::tie(model_type, act_type, conv_params) = this->GetParam();
{
function = createFunction(model_type, act_type, conv_params);
model = createModel(model_type, act_type, conv_params);
}

{
function_ref = (conv_params.bias_shape == conv_params.eltwise_shape) ? function->clone() :
createRefFunction<TFusedConvolution>(model_type, act_type, conv_params);
model_ref = (conv_params.bias_shape == conv_params.eltwise_shape) ? model->clone() :
createRefModel<TFusedConvolution>(model_type, act_type, conv_params);
}
manager.register_pass<ov::nvidia_gpu::pass::CudaConvolutionFusion>();
manager.run_passes(function);
manager.run_passes(model);
}
static std::string getTestCaseName(testing::TestParamInfo<std::tuple<ModelType /* model type */,
ActivationMode /* act type */,
Expand Down Expand Up @@ -367,7 +367,7 @@ struct ConvBackPropParams {
ov::CoordinateDiff output_pad;
};

std::shared_ptr<Result> createFunctionBackprop(const ModelType& model_type,
std::shared_ptr<Result> createModelBackprop(const ModelType& model_type,
const ov::Output<ov::Node>& input_node,
const ConvBackPropParams& conv_params) {
std::shared_ptr<ov::Node> last_op = nullptr;
Expand All @@ -390,7 +390,7 @@ std::shared_ptr<Result> createFunctionBackprop(const ModelType& model_type,
return std::make_shared<Result>(last_op);
}

std::shared_ptr<Result> createRefFunctionBackprop(const ModelType& model_type,
std::shared_ptr<Result> createRefModelBackprop(const ModelType& model_type,
const ov::Output<ov::Node>& input_node,
const ConvBackPropParams& conv_params) {
std::shared_ptr<ov::Node> last_op = nullptr;
Expand Down Expand Up @@ -421,17 +421,17 @@ class FuseConvBackPropTestFixture: public ::testing::WithParamInterface<std::tup
std::tie(model_type, conv_params) = this->GetParam();
{
auto input_params = std::make_shared<Parameter>(ov::element::f32, conv_params.input_shape);
auto result = createFunctionBackprop(model_type, input_params, conv_params);
function = std::make_shared<ov::Model>(ov::ResultVector{result}, ov::ParameterVector{input_params});
auto result = createModelBackprop(model_type, input_params, conv_params);
model = std::make_shared<ov::Model>(ov::ResultVector{result}, ov::ParameterVector{input_params});
}

{
auto input_params = std::make_shared<Parameter>(ov::element::f32, conv_params.input_shape);
auto result = createRefFunctionBackprop(model_type, input_params, conv_params);
function_ref = std::make_shared<ov::Model>(ov::ResultVector{result}, ov::ParameterVector{input_params});
auto result = createRefModelBackprop(model_type, input_params, conv_params);
model_ref = std::make_shared<ov::Model>(ov::ResultVector{result}, ov::ParameterVector{input_params});
}
manager.register_pass<ov::nvidia_gpu::pass::CudaConvolutionFusion>();
manager.run_passes(function);
manager.run_passes(model);
}
static std::string getTestCaseName(testing::TestParamInfo<std::tuple<ModelType /* model type */,
ConvBackPropParams /* conv params */>> obj) {
Expand Down

0 comments on commit cd15db7

Please sign in to comment.