diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 5bfb805ce23af..01fc672d75a0c 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -1214,13 +1214,13 @@ committed. LICENSE Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. + list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. + and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -2318,7 +2318,7 @@ modification, are permitted provided that the following conditions are met: c. Neither the name of the Scikit-learn Developers nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written - permission. + permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" @@ -2350,17 +2350,17 @@ Wave Computing Inc. Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ - + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - + 1. Definitions. - + "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. - + "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. - + "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, @@ -2368,24 +2368,24 @@ Apache License direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - + "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. - + "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. - + "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. - + "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). - + "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications @@ -2393,7 +2393,7 @@ Apache License of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. - + "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally @@ -2407,18 +2407,18 @@ Apache License Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." - + "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. - + 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. - + 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable @@ -2434,24 +2434,24 @@ Apache License or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. - + 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: - + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and - + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and - + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and - + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained @@ -2468,14 +2468,14 @@ Apache License or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. - + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. - + 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of @@ -2483,12 +2483,12 @@ Apache License Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. - + 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. - + 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, @@ -2498,7 +2498,7 @@ Apache License PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. - + 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly @@ -2510,7 +2510,7 @@ Apache License work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. - + 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, @@ -2521,11 +2521,11 @@ Apache License defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - + END OF TERMS AND CONDITIONS - + APPENDIX: How to apply the Apache License to your work. - + To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include @@ -2534,15 +2534,15 @@ Apache License file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. - + Copyright [yyyy] [name of copyright owner] - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -2556,17 +2556,17 @@ google/nsync Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ - + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - + 1. Definitions. - + "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. - + "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. - + "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, @@ -2574,24 +2574,24 @@ Apache License direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - + "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. - + "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. - + "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. - + "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). - + "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications @@ -2599,7 +2599,7 @@ Apache License of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. - + "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally @@ -2613,18 +2613,18 @@ Apache License Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." - + "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. - + 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. - + 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable @@ -2640,24 +2640,24 @@ Apache License or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. - + 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: - + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and - + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and - + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and - + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained @@ -2674,14 +2674,14 @@ Apache License or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. - + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. - + 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of @@ -2689,12 +2689,12 @@ Apache License Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. - + 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. - + 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, @@ -2704,7 +2704,7 @@ Apache License PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. - + 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly @@ -2716,7 +2716,7 @@ Apache License work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. - + 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, @@ -2727,11 +2727,11 @@ Apache License defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - + END OF TERMS AND CONDITIONS - + APPENDIX: How to apply the Apache License to your work. - + To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include @@ -2740,15 +2740,15 @@ Apache License file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. - + Copyright [yyyy] [name of copyright owner] - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -3019,3 +3019,30 @@ Copyright 2016-2019 Intel Corporation WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + +_____ +Boost + +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/cgmanifest.json b/cgmanifest.json index b7c8433f0a245..382fe45c05fa1 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -232,7 +232,7 @@ "commitHash":"7389dbac82d362f296dc2746f10e43ffa1615660", "repositoryUrl":"https://github.com/scikit-learn/scikit-learn.git" } - } + } }, { "component":{ @@ -298,7 +298,17 @@ "repositoryUrl":"https://github.com/NervanaSystems/ngraph.git" } } - } + }, + { + "component":{ + "Type":"other", + "Other":{ + "Name":"Boost", + "Version":"1.69.0", + "DownloadUrl":"http://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.bz2" + } + } + }, ], "Version":1 } diff --git a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker-gpu.sh b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker-gpu.sh index f08e027f89cfe..ab50111bcc125 100755 --- a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker-gpu.sh +++ b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker-gpu.sh @@ -39,7 +39,7 @@ docker run -h $HOSTNAME \ -e "IsReleaseBuild=$IsReleaseBuild" \ "onnxruntime-$IMAGE" \ /bin/bash /onnxruntime_src/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-gpu.sh \ - /home/onnxruntimedev/$NUGET_REPO_DIRNAME /onnxruntime_src /home/onnxruntimedev $TestDataUrl $TestDataChecksum & + /home/onnxruntimedev/$NUGET_REPO_DIRNAME /onnxruntime_src /home/onnxruntimedev & wait -n diff --git a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker.sh b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker.sh index f7bb480674a6b..63ec87585bce7 100755 --- a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker.sh +++ b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-docker.sh @@ -4,7 +4,6 @@ # build docker image for CPU -#TODO: Get this working, not tested yet set -x SOURCE_ROOT=$1 @@ -44,7 +43,7 @@ docker run -h $HOSTNAME \ -e "RunTestNative=$RunTestNative" \ "onnxruntime-$IMAGE" \ /bin/bash /onnxruntime_src/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest.sh \ - /home/onnxruntimedev/$NUGET_REPO_DIRNAME /onnxruntime_src /home/onnxruntimedev $TestDataUrl $TestDataChecksum & + /home/onnxruntimedev/$NUGET_REPO_DIRNAME /onnxruntime_src /home/onnxruntimedev & wait -n diff --git a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-gpu.sh b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-gpu.sh index 127630cc851e8..9fc2f9b34e775 100644 --- a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-gpu.sh +++ b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest-gpu.sh @@ -5,18 +5,19 @@ LocalNuGetRepo=$1 SourceRoot=$2 BuildDir=$3 -TestDataUrl=$4 -TestDataChecksum=$5 +#TestDataUrl=$4 +#TestDataChecksum=$5 #TestDataUrl and TestDataChecksum comes from the build env variable -set -x -echo "Downloading test data" -python3 $SourceRoot/tools/ci_build/build.py --update --download_test_data --build_dir $BuildDir --test_data_url $TestDataUrl --test_data_checksum $TestDataChecksum -if [ $? -ne 0 ]; then - echo "Failed to download test data" - exit 1 -fi +#echo "Downloading test data" +#python3 $SourceRoot/tools/ci_build/build.py --update --download_test_data --build_dir $BuildDir --test_data_url $TestDataUrl --test_data_checksum $TestDataChecksum +#if [ $? -ne 0 ]; then +# echo "Failed to download test data" +# exit 1 +#fi + +set -x OldDir=`pwd` cd $SourceRoot diff --git a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest.sh b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest.sh index 62001ae297f5a..6b209a166f72f 100755 --- a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest.sh +++ b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest.sh @@ -5,17 +5,18 @@ LocalNuGetRepo=$1 SourceRoot=$2 BuildDir=$3 -TestDataUrl=$4 -TestDataChecksum=$5 +#TestDataUrl=$4 +#TestDataChecksum=$5 #TestDataUrl and TestDataChecksum comes from the build env variable -echo "Downloading test data" -python3 $SourceRoot/tools/ci_build/build.py --update --download_test_data --build_dir $BuildDir --test_data_url $TestDataUrl --test_data_checksum $TestDataChecksum -if [ $? -ne 0 ]; then - echo "Failed to download test data" - exit 1 -fi +#echo "Downloading test data" +#python3 $SourceRoot/tools/ci_build/build.py --update --download_test_data --build_dir $BuildDir --test_data_url $TestDataUrl --test_data_checksum $TestDataChecksum +#if [ $? -ne 0 ]; then +# echo "Failed to download test data" +# exit 1 +#fi +set -x OldDir=`pwd` cd $SourceRoot diff --git a/onnxruntime/test/perftest/ort_test_session.cc b/onnxruntime/test/perftest/ort_test_session.cc index b7947731f28c5..3d7d53ad26328 100644 --- a/onnxruntime/test/perftest/ort_test_session.cc +++ b/onnxruntime/test/perftest/ort_test_session.cc @@ -79,7 +79,9 @@ OnnxRuntimeTestSession::OnnxRuntimeTestSession(Ort::Env& env, std::random_device else session_options.DisableSequentialExecution(); fprintf(stdout, "Setting thread pool size to %d\n", performance_test_config.run_config.session_thread_pool_size); - session_options.SetThreadPoolSize(performance_test_config.run_config.session_thread_pool_size); + // Don't set the thread pool size unless it has been changed from our zero default value (as zero will fail) + if (performance_test_config.run_config.session_thread_pool_size != 0) + session_options.SetThreadPoolSize(performance_test_config.run_config.session_thread_pool_size); // Set optimization level. session_options.SetGraphOptimizationLevel(performance_test_config.run_config.optimization_level); if (!performance_test_config.run_config.profile_file.empty()) diff --git a/onnxruntime/test/python/onnx_backend_test_series.py b/onnxruntime/test/python/onnx_backend_test_series.py index 7923e6c73c845..b3dd22418a09f 100644 --- a/onnxruntime/test/python/onnx_backend_test_series.py +++ b/onnxruntime/test/python/onnx_backend_test_series.py @@ -14,6 +14,7 @@ pytest_plugins = 'onnx.backend.test.report', + class OrtBackendTest(onnx.backend.test.BackendTest): def __init__(self, backend, parent_module=None): @@ -33,8 +34,55 @@ def assert_similar_outputs(cls, ref_outputs, outputs, rtol, atol): rtol=1e-3, atol=1e-5) -def CreateBackendTest(testname=None): +# ORT first supported opset 7, so models with nodes that require versions prior to opset 7 are not supported +def tests_with_pre_opset7_dependencies_filters(): + filters = ('^test_AvgPool1d_cpu.*', + '^test_AvgPool1d_stride_cpu.*', + '^test_AvgPool2d_cpu.*', + '^test_AvgPool2d_stride_cpu.*', + '^test_AvgPool3d_cpu.*', + '^test_AvgPool3d_stride1_pad0_gpu_input_cpu.*', + '^test_AvgPool3d_stride_cpu.*', + '^test_BatchNorm1d_3d_input_eval_cpu.*', + '^test_BatchNorm2d_eval_cpu.*', + '^test_BatchNorm2d_momentum_eval_cpu.*', + '^test_BatchNorm3d_eval_cpu.*', + '^test_BatchNorm3d_momentum_eval_cpu.*', + '^test_GLU_cpu.*', + '^test_GLU_dim_cpu.*', + '^test_Linear_cpu.*', + '^test_PReLU_1d_cpu.*', + '^test_PReLU_1d_multiparam_cpu.*', + '^test_PReLU_2d_cpu.*', + '^test_PReLU_2d_multiparam_cpu.*', + '^test_PReLU_3d_cpu.*', + '^test_PReLU_3d_multiparam_cpu.*', + '^test_PoissonNLLLLoss_no_reduce_cpu.*', + '^test_Softsign_cpu.*', + '^test_operator_add_broadcast_cpu.*', + '^test_operator_add_size1_broadcast_cpu.*', + '^test_operator_add_size1_right_broadcast_cpu.*', + '^test_operator_add_size1_singleton_broadcast_cpu.*', + '^test_operator_addconstant_cpu.*', + '^test_operator_addmm_cpu.*', + '^test_operator_basic_cpu.*', + '^test_operator_mm_cpu.*', + '^test_operator_non_float_params_cpu.*', + '^test_operator_params_cpu.*', + '^test_operator_pow_cpu.*') + + return filters + + +def unsupported_usages_filters(): + filters = ('^test_convtranspose_1d_cpu.*', # ConvTransponse supports 4-D only + '^test_convtranspose_3d_cpu.*') + + return filters + + +def create_backend_test(testname=None): backend_test = OrtBackendTest(c2, __name__) # Type not supported @@ -43,61 +91,19 @@ def CreateBackendTest(testname=None): if testname: backend_test.include(testname + '.*') else: - backend_test.exclude(r'(' - '^test_cast_DOUBLE_to_FLOAT_cpu.*' - '|^test_cast_FLOAT_to_DOUBLE_cpu.*' - '|^test_cast_FLOAT_to_STRING_cpu.*' - '|^test_cast_STRING_to_FLOAT_cpu.*' - '|^test_convtranspose_1d_cpu.*' - '|^test_convtranspose_3d_cpu.*' - '|^test_constantofshape_*.*' - '|^test_dequantizelinear_cpu.*' - - '|^test_AvgPool1d_cpu.*' - '|^test_AvgPool1d_stride_cpu.*' - '|^test_AvgPool2d_cpu.*' - '|^test_AvgPool2d_stride_cpu.*' - '|^test_AvgPool3d_cpu.*' - '|^test_AvgPool3d_stride1_pad0_gpu_input_cpu.*' - '|^test_AvgPool3d_stride_cpu.*' - '|^test_BatchNorm1d_3d_input_eval_cpu.*' - '|^test_BatchNorm2d_eval_cpu.*' - '|^test_BatchNorm2d_momentum_eval_cpu.*' - '|^test_BatchNorm3d_eval_cpu.*' - '|^test_BatchNorm3d_momentum_eval_cpu.*' - '|^test_GLU_cpu.*' - '|^test_GLU_dim_cpu.*' - '|^test_Linear_cpu.*' - '|^test_PReLU_1d_cpu.*' - '|^test_PReLU_1d_multiparam_cpu.*' - '|^test_PReLU_2d_cpu.*' - '|^test_PReLU_2d_multiparam_cpu.*' - '|^test_PReLU_3d_cpu.*' - '|^test_PReLU_3d_multiparam_cpu.*' - '|^test_PoissonNLLLLoss_no_reduce_cpu.*' - '|^test_Softsign_cpu.*' - '|^test_operator_add_broadcast_cpu.*' - '|^test_operator_add_size1_broadcast_cpu.*' - '|^test_operator_add_size1_right_broadcast_cpu.*' - '|^test_operator_add_size1_singleton_broadcast_cpu.*' - '|^test_operator_addconstant_cpu.*' - '|^test_operator_addmm_cpu.*' - '|^test_operator_basic_cpu.*' - '|^test_operator_mm_cpu.*' - '|^test_operator_non_float_params_cpu.*' - '|^test_operator_params_cpu.*' - '|^test_operator_pow_cpu.*' - '|^test_shrink_cpu.*' - '|^test_vgg19_cpu.*' - '|^test_zfnet512_cpu.*' - '|^test_qlinearconv_cpu.*' - '|^test_quantizelinear_cpu.*' - '|^test_roialign_cpu.*' - '|^test_operator_repeat_dim_overflow_cpu.*' - '|^test_operator_symbolic_override_nested_cpu.*' #Nuphar: Same input used by multiple XP is not supported - '|^test_scan_sum_cpu.*' #Nuphar: Graph output (sum_out) does not exist in the graph - '|^test_scan9_sum_cpu.*' #Nuphar: Graph output (sum_out) does not exist in the graph - ')') + # Tests that are failing temporarily and should be fixed + current_failing_tests = ('^test_cast_FLOAT_to_STRING_cpu.*', + '^test_constantofshape_*.*', + '^test_dequantizelinear_cpu.*', + '^test_shrink_cpu.*', + '^test_qlinearconv_cpu.*', + '^test_quantizelinear_cpu.*') + + filters = current_failing_tests + \ + tests_with_pre_opset7_dependencies_filters() + \ + unsupported_usages_filters() + + backend_test.exclude('(' + '|'.join(filters) + ')') # import all test cases at global scope to make # them visible to python.unittest. @@ -105,6 +111,7 @@ def CreateBackendTest(testname=None): return backend_test + def parse_args(): parser = argparse.ArgumentParser(os.path.basename(__file__), description='Run the ONNX backend tests using ONNXRuntime.') @@ -125,5 +132,5 @@ def parse_args(): if __name__ == '__main__': args = parse_args() - backend_test = CreateBackendTest(args.testname) + backend_test = create_backend_test(args.testname) unittest.main()