Disable Attention fusion tests when DISABLE_CONTRIB_OPS is defined (#2529)

tianleiwu · Changming Sun · commit b50878dcf053 · 2019-12-03T14:21:21.000-08:00
diff --git a/onnxruntime/test/optimizer/graph_transform_test.cc b/onnxruntime/test/optimizer/graph_transform_test.cc
@@ -929,6 +929,8 @@ TEST(GraphTransformationTests, ReshapeFusionOneConstTest) {
   }
 }
 
+#ifndef DISABLE_CONTRIB_OPS
+
 static void ValidateAttention(Graph& graph) {
   // Validate the merged weights (initializer) input for Attention node.
   for (const Node& node : graph.Nodes()) {
@@ -1089,7 +1091,6 @@ TEST(GraphTransformationTests, AttentionFusionInt64Test) {
   ValidateAttention(graph);
 }
 
-#ifndef DISABLE_CONTRIB_OPS
 TEST(GraphTransformationTests, GeluFusionTest) {
   auto model_uri = MODEL_FOLDER "fusion/gelu.onnx";
   std::shared_ptr<Model> p_model;

Original file line number	Diff line number	Diff line change
`@@ -929,6 +929,8 @@ TEST(GraphTransformationTests, ReshapeFusionOneConstTest) {`
`929`	`929`	`}`
`930`	`930`	`}`
`931`	`931`
	`932`	`+#ifndef DISABLE_CONTRIB_OPS`
	`933`	`+`
`932`	`934`	`static void ValidateAttention(Graph& graph) {`
`933`	`935`	`// Validate the merged weights (initializer) input for Attention node.`
`934`	`936`	`for (const Node& node : graph.Nodes()) {`
`@@ -1089,7 +1091,6 @@ TEST(GraphTransformationTests, AttentionFusionInt64Test) {`
`1089`	`1091`	`ValidateAttention(graph);`
`1090`	`1092`	`}`
`1091`	`1093`
`1092`		`-#ifndef DISABLE_CONTRIB_OPS`
`1093`	`1094`	`TEST(GraphTransformationTests, GeluFusionTest) {`
`1094`	`1095`	`auto model_uri = MODEL_FOLDER "fusion/gelu.onnx";`
`1095`	`1096`	`std::shared_ptr<Model> p_model;`