From 8c6d76a4c0c6718405c61d9eb19f9920fc32af35 Mon Sep 17 00:00:00 2001 From: Scott McKay Date: Sat, 30 Jan 2021 06:27:19 +1000 Subject: [PATCH] Update to match new test setup. (#6496) * Update to match new test setup. * Add Gemm(7) manually for now. Will fix properly on Monday. It's used by mnist.ort as that is created by optimizing mnist.onnx to level 1 causing 2 nodes to be replaced by a Gemm and the op to be missing from the required list as that is created using the original onnx model. --- onnxruntime/test/testdata/required_ops.config | 2 +- .../azure-pipelines/win-gpu-reduce-op-ci-pipeline.yml | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/onnxruntime/test/testdata/required_ops.config b/onnxruntime/test/testdata/required_ops.config index d2d4003a04..930f7fa78b 100644 --- a/onnxruntime/test/testdata/required_ops.config +++ b/onnxruntime/test/testdata/required_ops.config @@ -1,5 +1,5 @@ # required ops for ONNX models in testdata -ai.onnx;7;Abs,Add,And,BatchNormalization,Concat,Conv,Dropout,Flatten,Foo,Gather,GlobalAveragePool,Identity,LSTM,MatMul,Max,MaxPool,Min,Mul,Mul16,Multinomial,OptionalOp,RNN,Relu,Reshape,Shape,Slice,Softmax,Sub,Unsqueeze +ai.onnx;7;Abs,Add,And,BatchNormalization,Concat,Conv,Dropout,Flatten,Foo,Gather,Gemm,GlobalAveragePool,Identity,LSTM,MatMul,Max,MaxPool,Min,Mul,Mul16,Multinomial,OptionalOp,RNN,Relu,Reshape,Shape,Slice,Softmax,Sub,Unsqueeze ai.onnx;8;Add,Conv,Flatten,MatMul,MaxPool,Mul,Relu,Reshape ai.onnx;9;Abs,Add,BatchNormalization,Cast,Clip,Concat,Constant,ConstantOfShape,Conv,Div,Equal,Gather,Gemm,Identity,If,LayerNormalization,LeakyRelu,MatMul,Mul,Pow,ReduceMean,Relu,Reshape,Scan,Shape,Sigmoid,Slice,Softmax,Softsign,Sqrt,Sub,Tanh,Transpose,Unsqueeze ai.onnx;10;Add,Cast,Concat,Constant,ConstantOfShape,Div,Dropout,Equal,Erf,Expand,Gather,Gemm,Greater,Identity,If,LayerNormalization,Loop,MatMul,Min,Mul,Neg,NonZero,Not,Pow,ReduceMean,ReduceSum,Reshape,Shape,Slice,Softmax,SparseSoftmaxCrossEntropy,Sqrt,Squeeze,Sub,Tanh,TrainableDropout,Transpose,Unsqueeze diff --git a/tools/ci_build/github/azure-pipelines/win-gpu-reduce-op-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/win-gpu-reduce-op-ci-pipeline.yml index a6fc41fba8..c2a461b48a 100644 --- a/tools/ci_build/github/azure-pipelines/win-gpu-reduce-op-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/win-gpu-reduce-op-ci-pipeline.yml @@ -48,16 +48,11 @@ jobs: workingDirectory: '$(Build.SourcesDirectory)\cmake\external\onnx' displayName: 'Install ONNX' - - powershell: | - Get-Content required_ops.config, reduced_ops_via_config.onnx_model_with_included_ops.config | Set-Content combined_required_ops.config - workingDirectory: '$(Build.SourcesDirectory)\onnxruntime\test\testdata' - displayName: 'Merge required ops config files' - - task: PythonScript@0 displayName: 'Build and test' inputs: scriptPath: '$(Build.SourcesDirectory)\tools\ci_build\build.py' - arguments: '--config $(BuildConfig) --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --cmake_generator "Visual Studio 16 2019" --build_wheel --use_cuda --cuda_version=10.2 --cuda_home="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.2" --cudnn_home="C:\local\cudnn-10.2-windows10-x64-v8.0.3.33\cuda" --cmake_extra_defines CMAKE_SYSTEM_VERSION=10.0.18362.0 --include_ops_by_config="$(Build.SourcesDirectory)\onnxruntime\test\testdata\combined_required_ops.config"' + arguments: '--config $(BuildConfig) --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --cmake_generator "Visual Studio 16 2019" --build_wheel --use_cuda --cuda_version=10.2 --cuda_home="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.2" --cudnn_home="C:\local\cudnn-10.2-windows10-x64-v8.0.3.33\cuda" --cmake_extra_defines CMAKE_SYSTEM_VERSION=10.0.18362.0 --include_ops_by_config="$(Build.SourcesDirectory)\onnxruntime\test\testdata\required_ops.config"' workingDirectory: '$(Build.BinariesDirectory)' - template: templates/component-governance-component-detection-steps.yml