From fbd790f70323f39885aa7838fb047fa4ac1bba75 Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Fri, 16 Aug 2019 18:06:16 -0700 Subject: [PATCH] Add AutoML to 3 main builds. (#1631) Add AutoML to 3 main builds. Fix unit tests. Enable copy elision, do not move movable object on return by value. --- .../automl_ops/cpu/datetime_transformer.cc | 2 +- .../FeaturizerPrep/Featurizers/SampleAdd.h | 23 ---- .../DateTimeFeaturizer_UnitTests.cpp | 100 +++++++++--------- .../UnitTests/SampleAdd_UnitTest.cpp | 12 +-- .../featurizers/src/FeaturizerPrep/Traits.h | 5 +- .../UnitTests/Featurizer_UnitTest.cpp | 39 +++---- .../automl_ops/datetimetransformer_test.cc | 73 +++++++++---- .../azure-pipelines/linux-ci-pipeline.yml | 2 +- .../azure-pipelines/mac-ci-pipeline.yml | 2 +- .../azure-pipelines/win-ci-pipeline.yml | 2 +- 10 files changed, 125 insertions(+), 135 deletions(-) diff --git a/onnxruntime/automl_ops/cpu/datetime_transformer.cc b/onnxruntime/automl_ops/cpu/datetime_transformer.cc index 08b23e57f1..05a655f8d7 100644 --- a/onnxruntime/automl_ops/cpu/datetime_transformer.cc +++ b/onnxruntime/automl_ops/cpu/datetime_transformer.cc @@ -25,7 +25,7 @@ Status DateTimeTransformer::Compute(OpKernelContext* ctx) const { int64_t tp = *input_tensor->Data(); std::chrono::system_clock::time_point sys_time{std::chrono::seconds(tp)}; - *output = std::move(dtf::SystemToDPTimePoint(sys_time)); + *output = dtf::SystemToDPTimePoint(sys_time); return s; } diff --git a/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Featurizers/SampleAdd.h b/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Featurizers/SampleAdd.h index 5c333fd7e4..f4ca7601e5 100644 --- a/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Featurizers/SampleAdd.h +++ b/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Featurizers/SampleAdd.h @@ -89,29 +89,6 @@ private: // ---------------------------------------------------------------------- // ---------------------------------------------------------------------- // ---------------------------------------------------------------------- - -// ---------------------------------------------------------------------- -// | -// | Transformer -// | -// ---------------------------------------------------------------------- -template -void Transformer::serialize(ArchiveT &ar, unsigned int const version) { - ar & boost::serialization::base_object(*this); - ar & boost::serialization::make_nvp("delta", _delta); -} - -// ---------------------------------------------------------------------- -// | -// | Estimator -// | -// ---------------------------------------------------------------------- -template -void Estimator::serialize(ArchiveT &ar, unsigned int const version) { - ar & boost::serialization::base_object(*this); - ar & boost::serialization::make_nvp("accumulated_delta", _accumulated_delta); -} - } // namespace SampleAdd } // namespace Featurizer diff --git a/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Featurizers/UnitTests/DateTimeFeaturizer_UnitTests.cpp b/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Featurizers/UnitTests/DateTimeFeaturizer_UnitTests.cpp index a1c6ac2f29..d81bb22964 100644 --- a/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Featurizers/UnitTests/DateTimeFeaturizer_UnitTests.cpp +++ b/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Featurizers/UnitTests/DateTimeFeaturizer_UnitTests.cpp @@ -19,31 +19,31 @@ using SysClock = std::chrono::system_clock; TEST(DateTimeFeaturizer_DateTime, Past_1976_Nov_17__12_27_04) { const time_t date = 217081624; SysClock::time_point stp = SysClock::from_time_t(date); - + // Constructor TimePoint tp(stp); - ASSERT_TRUE(tp.year == 1976); - ASSERT_TRUE(tp.month == TimePoint::NOVEMBER); - ASSERT_TRUE(tp.day == 17); - ASSERT_TRUE(tp.hour == 12); - ASSERT_TRUE(tp.minute == 27); - ASSERT_TRUE(tp.second == 4); - ASSERT_TRUE(tp.dayOfWeek == TimePoint::WEDNESDAY); - ASSERT_TRUE(tp.dayOfYear == 321); - ASSERT_TRUE(tp.quarterOfYear == 4); - ASSERT_TRUE(tp.weekOfMonth == 2); + ASSERT_EQ(tp.year, 1976); + ASSERT_EQ(tp.month, TimePoint::NOVEMBER); + ASSERT_EQ(tp.day, 17); + ASSERT_EQ(tp.hour, 12); + ASSERT_EQ(tp.minute, 27); + ASSERT_EQ(tp.second, 4); + ASSERT_EQ(tp.dayOfWeek, TimePoint::WEDNESDAY); + ASSERT_EQ(tp.dayOfYear, 321); + ASSERT_EQ(tp.quarterOfYear, 4); + ASSERT_EQ(tp.weekOfMonth, 2); // assignment TimePoint tp1 = stp; - ASSERT_TRUE(tp1.year == 1976); - ASSERT_TRUE(tp1.month == TimePoint::NOVEMBER); - ASSERT_TRUE(tp1.day == 17); + ASSERT_EQ(tp1.year, 1976); + ASSERT_EQ(tp1.month, TimePoint::NOVEMBER); + ASSERT_EQ(tp1.day, 17); // function TimePoint tp2 = SystemToDPTimePoint(stp); - ASSERT_TRUE(tp2.year == 1976); - ASSERT_TRUE(tp2.month == TimePoint::NOVEMBER); - ASSERT_TRUE(tp2.day == 17); + ASSERT_EQ(tp2.year, 1976); + ASSERT_EQ(tp2.month, TimePoint::NOVEMBER); + ASSERT_EQ(tp2.day, 17); } TEST(DateTimeFeaturizer_Transformer , Past_1976_Nov_17__12_27_05) { @@ -52,16 +52,16 @@ TEST(DateTimeFeaturizer_Transformer , Past_1976_Nov_17__12_27_05) { Transformer dt; TimePoint tp = dt.transform(stp); - ASSERT_TRUE(tp.year == 1976); - ASSERT_TRUE(tp.month == TimePoint::NOVEMBER); - ASSERT_TRUE(tp.day == 17); - ASSERT_TRUE(tp.hour == 12); - ASSERT_TRUE(tp.minute == 27); - ASSERT_TRUE(tp.second == 5); - ASSERT_TRUE(tp.dayOfWeek == TimePoint::WEDNESDAY); - ASSERT_TRUE(tp.dayOfYear == 321); - ASSERT_TRUE(tp.quarterOfYear == 4); - ASSERT_TRUE(tp.weekOfMonth == 2); + ASSERT_EQ(tp.year, 1976); + ASSERT_EQ(tp.month, TimePoint::NOVEMBER); + ASSERT_EQ(tp.day, 17); + ASSERT_EQ(tp.hour, 12); + ASSERT_EQ(tp.minute, 27); + ASSERT_EQ(tp.second, 5); + ASSERT_EQ(tp.dayOfWeek, TimePoint::WEDNESDAY); + ASSERT_EQ(tp.dayOfYear, 321); + ASSERT_EQ(tp.quarterOfYear, 4); + ASSERT_EQ(tp.weekOfMonth, 2); } @@ -71,16 +71,16 @@ TEST(DateTimeFeaturizer_Transformer , Future_2025_June_30) { Transformer dt; TimePoint tp = dt.transform(stp); - ASSERT_TRUE(tp.year == 2025); - ASSERT_TRUE(tp.month == TimePoint::JUNE); - ASSERT_TRUE(tp.day == 30); - ASSERT_TRUE(tp.hour == 0); - ASSERT_TRUE(tp.minute == 0); - ASSERT_TRUE(tp.second == 0); - ASSERT_TRUE(tp.dayOfWeek == TimePoint::MONDAY); - ASSERT_TRUE(tp.dayOfYear == 180); - ASSERT_TRUE(tp.quarterOfYear == 2); - ASSERT_TRUE(tp.weekOfMonth == 4); + ASSERT_EQ(tp.year, 2025); + ASSERT_EQ(tp.month, TimePoint::JUNE); + ASSERT_EQ(tp.day, 30); + ASSERT_EQ(tp.hour, 0); + ASSERT_EQ(tp.minute, 0); + ASSERT_EQ(tp.second, 0); + ASSERT_EQ(tp.dayOfWeek, TimePoint::MONDAY); + ASSERT_EQ(tp.dayOfYear, 180); + ASSERT_EQ(tp.quarterOfYear, 2); + ASSERT_EQ(tp.weekOfMonth, 4); } #ifdef _MSC_VER @@ -92,16 +92,16 @@ TEST(DateTimeFeaturizer_Transformer , Far_Future__2998_March_2__14_03_02) { Transformer dt; TimePoint tp = dt.transform(stp); - ASSERT_TRUE(tp.year == 2998); - ASSERT_TRUE(tp.month == TimePoint::MARCH); - ASSERT_TRUE(tp.day == 2); - ASSERT_TRUE(tp.hour == 14); - ASSERT_TRUE(tp.minute == 3); - ASSERT_TRUE(tp.second == 2); - ASSERT_TRUE(tp.dayOfWeek == TimePoint::FRIDAY); - ASSERT_TRUE(tp.dayOfYear == 60); - ASSERT_TRUE(tp.quarterOfYear == 1); - ASSERT_TRUE(tp.weekOfMonth == 0); + ASSERT_EQ(tp.year, 2998); + ASSERT_EQ(tp.month, TimePoint::MARCH); + ASSERT_EQ(tp.day, 2); + ASSERT_EQ(tp.hour, 14); + ASSERT_EQ(tp.minute, 3); + ASSERT_EQ(tp.second, 2); + ASSERT_EQ(tp.dayOfWeek, TimePoint::FRIDAY); + ASSERT_EQ(tp.dayOfYear, 60); + ASSERT_EQ(tp.quarterOfYear, 1); + ASSERT_EQ(tp.weekOfMonth, 0); } #else @@ -115,9 +115,9 @@ TEST(DateTimeFeaturizer_Transformer, Pre_Epoch__1776_July_4) { // Constructor Transformer dt; TimePoint tp = dt.transform(stp); - ASSERT_TRUE(tp.year == 1776); - ASSERT_TRUE(tp.month == TimePoint::JULY); - ASSERT_TRUE(tp.day == 4); + ASSERT_EQ(tp.year, 1776); + ASSERT_EQ(tp.month, TimePoint::JULY); + ASSERT_EQ(tp.day, 4); } #endif /* _MSC_VER */ } // namespace DateTimeFeaturizer diff --git a/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Featurizers/UnitTests/SampleAdd_UnitTest.cpp b/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Featurizers/UnitTests/SampleAdd_UnitTest.cpp index 40e7336b8a..b3796ec3c4 100644 --- a/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Featurizers/UnitTests/SampleAdd_UnitTest.cpp +++ b/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Featurizers/UnitTests/SampleAdd_UnitTest.cpp @@ -9,14 +9,14 @@ #include "../SampleAdd.h" TEST(SampleAddTests, Transformer) { - ASSERT_TRUE(Microsoft::Featurizer::SampleAdd::Transformer(10).transform(20) == 30); - ASSERT_TRUE(Microsoft::Featurizer::SampleAdd::Transformer(20).transform(1) == 21); + ASSERT_EQ(Microsoft::Featurizer::SampleAdd::Transformer(10).transform(20), 30U); + ASSERT_EQ(Microsoft::Featurizer::SampleAdd::Transformer(20).transform(1), 21U); } TEST(SampleAddTests, Estimator) { - ASSERT_TRUE(Microsoft::Featurizer::SampleAdd::Estimator().fit(10).commit()->transform(20) == 30); - ASSERT_TRUE(Microsoft::Featurizer::SampleAdd::Estimator().fit(20).commit()->transform(1) == 21); + ASSERT_EQ(Microsoft::Featurizer::SampleAdd::Estimator().fit(10).commit()->transform(20), 30U); + ASSERT_EQ(Microsoft::Featurizer::SampleAdd::Estimator().fit(20).commit()->transform(1), 21U); - ASSERT_TRUE(Microsoft::Featurizer::SampleAdd::Estimator().fit(10).fit(20).commit()->transform(20) == 50); - ASSERT_TRUE(Microsoft::Featurizer::SampleAdd::Estimator().fit(10).fit(20).fit(30).commit()->transform(20) == 80); + ASSERT_EQ(Microsoft::Featurizer::SampleAdd::Estimator().fit(10).fit(20).commit()->transform(20), 50U); + ASSERT_EQ(Microsoft::Featurizer::SampleAdd::Estimator().fit(10).fit(20).fit(30).commit()->transform(20), 80U); } diff --git a/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Traits.h b/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Traits.h index f097956403..37a70a059d 100644 --- a/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Traits.h +++ b/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/Traits.h @@ -5,6 +5,7 @@ #pragma once #include +#include #include #include #include @@ -67,7 +68,7 @@ template <> struct Traits : public TraitsImpl { using nullable_type = float; static bool IsNull(nullable_type const& value) { - return isnan(value); + return std::isnan(value); } // static std::string ToString(nullable_type const& value) { @@ -79,7 +80,7 @@ template <> struct Traits : public TraitsImpl { using nullable_type = double; static bool IsNull(nullable_type const& value) { - return isnan(value); + return std::isnan(value); } // static std::string ToString(nullable_type const& value) { diff --git a/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/UnitTests/Featurizer_UnitTest.cpp b/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/UnitTests/Featurizer_UnitTest.cpp index caed233f48..c0340e738c 100644 --- a/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/UnitTests/Featurizer_UnitTest.cpp +++ b/onnxruntime/core/automl/featurizers/src/FeaturizerPrep/UnitTests/Featurizer_UnitTest.cpp @@ -33,14 +33,6 @@ private: // ---------------------------------------------------------------------- // | Private Data bool const _true_on_odd; - - // ---------------------------------------------------------------------- - // | Private Methods - template - void serialize(ArchiveT &ar, unsigned int const /*version*/) { - ar & boost::serialization::base_object(*this); - ar & boost::serialization::make_nvp("true_on_odd", const_cast(_true_on_odd)); - } }; class MyEstimator : public Microsoft::Featurizer::Estimator { @@ -78,27 +70,20 @@ private: return std::make_unique(_true_on_odd_state); } - - template - void serialize(ArchiveT &ar, unsigned int const /*version*/) { - ar & boost::serialization::base_object(*this); - ar & boost::serialization::make_nvp("return_invalid_transformer", const_cast(_return_invalid_transformer)); - ar & boost::serialization::make_nvp("true_on_odd_state", const_cast(_true_on_odd_state)); - } }; TEST(FeaturizerTests, TransformerFunctionality) { - ASSERT_TRUE(MyTransformer(true).transform(1) == true); - ASSERT_TRUE(MyTransformer(false).transform(1) == false); - ASSERT_TRUE(MyTransformer(true).transform(2) == false); - ASSERT_TRUE(MyTransformer(false).transform(2) == true); + ASSERT_TRUE(MyTransformer(true).transform(1)); + ASSERT_FALSE(MyTransformer(false).transform(1)); + ASSERT_FALSE(MyTransformer(true).transform(2)); + ASSERT_TRUE(MyTransformer(false).transform(2)); } TEST(FeaturizerTests, EstimatorFunctionality) { - ASSERT_TRUE(MyEstimator().fit(1).commit()->transform(1) == true); - ASSERT_TRUE(MyEstimator().fit(0).commit()->transform(1) == false); - ASSERT_TRUE(MyEstimator().fit(1).commit()->transform(2) == false); - ASSERT_TRUE(MyEstimator().fit(0).commit()->transform(2) == true); + ASSERT_TRUE(MyEstimator().fit(1).commit()->transform(1)); + ASSERT_FALSE(MyEstimator().fit(0).commit()->transform(1)); + ASSERT_FALSE(MyEstimator().fit(1).commit()->transform(2)); + ASSERT_TRUE(MyEstimator().fit(0).commit()->transform(2)); } TEST(FeaturizerTests, EstimatorErrors) { @@ -112,8 +97,8 @@ TEST(FeaturizerTests, EstimatorErrors) { } TEST(FeaturizerTests, EstimatorFitAndCommit) { - ASSERT_TRUE(Microsoft::Featurizer::fit_and_commit(1, false)->transform(1) == true); - ASSERT_TRUE(Microsoft::Featurizer::fit_and_commit(0, false)->transform(1) == false); - ASSERT_TRUE(Microsoft::Featurizer::fit_and_commit(1, false)->transform(2) == false); - ASSERT_TRUE(Microsoft::Featurizer::fit_and_commit(0, false)->transform(2) == true); + ASSERT_TRUE(Microsoft::Featurizer::fit_and_commit(1, false)->transform(1)); + ASSERT_FALSE(Microsoft::Featurizer::fit_and_commit(0, false)->transform(1)); + ASSERT_FALSE(Microsoft::Featurizer::fit_and_commit(1, false)->transform(2)); + ASSERT_TRUE(Microsoft::Featurizer::fit_and_commit(0, false)->transform(2)); } diff --git a/onnxruntime/test/automl_ops/datetimetransformer_test.cc b/onnxruntime/test/automl_ops/datetimetransformer_test.cc index d0d82a1fbc..6f8fd7edad 100644 --- a/onnxruntime/test/automl_ops/datetimetransformer_test.cc +++ b/onnxruntime/test/automl_ops/datetimetransformer_test.cc @@ -13,7 +13,7 @@ using SysClock = std::chrono::system_clock; namespace onnxruntime { namespace test { -TEST(DateTimeFeaturizer_DateTime, Past_1976_Nov_17__12_27_04) { +TEST(DateTimeTransformer, Past_1976_Nov_17__12_27_04) { const time_t date = 217081624; OpTester test("DateTimeTransformer", 1, onnxruntime::kMSAutoMLDomain); @@ -23,24 +23,24 @@ TEST(DateTimeFeaturizer_DateTime, Past_1976_Nov_17__12_27_04) { SysClock::time_point stp = SysClock::from_time_t(date); dft::TimePoint tp(stp); - ASSERT_TRUE(tp.year == 1976); - ASSERT_TRUE(tp.month == dft::TimePoint::NOVEMBER); - ASSERT_TRUE(tp.day == 17); - ASSERT_TRUE(tp.hour == 12); - ASSERT_TRUE(tp.minute == 27); - ASSERT_TRUE(tp.second == 4); - ASSERT_TRUE(tp.dayOfWeek == dft::TimePoint::WEDNESDAY); - ASSERT_TRUE(tp.dayOfYear == 321); - ASSERT_TRUE(tp.quarterOfYear == 4); - ASSERT_TRUE(tp.weekOfMonth == 2); + ASSERT_EQ(tp.year, 1976); + ASSERT_EQ(tp.month, dft::TimePoint::NOVEMBER); + ASSERT_EQ(tp.day, 17); + ASSERT_EQ(tp.hour, 12); + ASSERT_EQ(tp.minute, 27); + ASSERT_EQ(tp.second, 4); + ASSERT_EQ(tp.dayOfWeek, dft::TimePoint::WEDNESDAY); + ASSERT_EQ(tp.dayOfYear, 321); + ASSERT_EQ(tp.quarterOfYear, 4); + ASSERT_EQ(tp.weekOfMonth, 2); // Expected output. test.AddOutput("Y", std::move(tp)); test.Run(OpTester::ExpectResult::kExpectSuccess); } -TEST(DateTimeFeaturizer_Transformer, Past_1976_Nov_17__12_27_05) { - const time_t date = 32445842582; +TEST(DateTimeTransformer, Past_1976_Nov_17__12_27_05) { + const time_t date = 217081625; OpTester test("DateTimeTransformer", 1, onnxruntime::kMSAutoMLDomain); // We are adding a scalar Tensor in this instance @@ -50,21 +50,48 @@ TEST(DateTimeFeaturizer_Transformer, Past_1976_Nov_17__12_27_05) { dft::Transformer dt; dft::TimePoint tp = dt.transform(stp); - ASSERT_TRUE(tp.year == 2998); - ASSERT_TRUE(tp.month == dft::TimePoint::MARCH); - ASSERT_TRUE(tp.day == 2); - ASSERT_TRUE(tp.hour == 14); - ASSERT_TRUE(tp.minute == 3); - ASSERT_TRUE(tp.second == 2); - ASSERT_TRUE(tp.dayOfWeek == dft::TimePoint::FRIDAY); - ASSERT_TRUE(tp.dayOfYear == 60); - ASSERT_TRUE(tp.quarterOfYear == 1); - ASSERT_TRUE(tp.weekOfMonth == 0); + ASSERT_EQ(tp.year, 1976); + ASSERT_EQ(tp.month, dft::TimePoint::NOVEMBER); + ASSERT_EQ(tp.day, 17); + ASSERT_EQ(tp.hour, 12); + ASSERT_EQ(tp.minute, 27); + ASSERT_EQ(tp.second, 5); + ASSERT_EQ(tp.dayOfWeek, dft::TimePoint::WEDNESDAY); + ASSERT_EQ(tp.dayOfYear, 321); + ASSERT_EQ(tp.quarterOfYear, 4); + ASSERT_EQ(tp.weekOfMonth, 2); // Expected output. test.AddOutput("Y", std::move(tp)); test.Run(OpTester::ExpectResult::kExpectSuccess); } +TEST(DateTimeTransformer, Future_2025_June_30) { + const time_t date = 1751241600; + + OpTester test("DateTimeTransformer", 1, onnxruntime::kMSAutoMLDomain); + // We are adding a scalar Tensor in this instance + test.AddInput("X", {1}, {date}); + + SysClock::time_point stp = SysClock::from_time_t(date); + + dft::Transformer dt; + dft::TimePoint tp = dt.transform(stp); + ASSERT_EQ(tp.year, 2025); + ASSERT_EQ(tp.month, dft::TimePoint::JUNE); + ASSERT_EQ(tp.day, 30); + ASSERT_EQ(tp.hour, 0); + ASSERT_EQ(tp.minute, 0); + ASSERT_EQ(tp.second, 0); + ASSERT_EQ(tp.dayOfWeek, dft::TimePoint::MONDAY); + ASSERT_EQ(tp.dayOfYear, 180); + ASSERT_EQ(tp.quarterOfYear, 2); + ASSERT_EQ(tp.weekOfMonth, 4); + + test.AddOutput("Y", std::move(tp)); + test.Run(OpTester::ExpectResult::kExpectSuccess); +} + + } // namespace test } // namespace onnxruntime diff --git a/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml index d14dd53a43..6269240962 100644 --- a/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml @@ -3,6 +3,6 @@ jobs: parameters: AgentPool : 'Linux-CPU' JobName: 'Linux_CI_Dev' - BuildCommand: 'tools/ci_build/github/linux/run_dockerbuild.sh -o ubuntu16.04 -d cpu -r $(Build.BinariesDirectory) -x "--use_mklml --use_tvm --build_wheel --enable_language_interop_ops"' + BuildCommand: 'tools/ci_build/github/linux/run_dockerbuild.sh -o ubuntu16.04 -d cpu -r $(Build.BinariesDirectory) -x "--use_mklml --use_tvm --use_automl --build_wheel --enable_language_interop_ops"' DoNugetPack: 'false' ArtifactName: 'drop-linux' diff --git a/tools/ci_build/github/azure-pipelines/mac-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/mac-ci-pipeline.yml index b48df88340..c3b3f8922a 100644 --- a/tools/ci_build/github/azure-pipelines/mac-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/mac-ci-pipeline.yml @@ -3,4 +3,4 @@ jobs: parameters: AgentPool : 'Hosted macOS High Sierra' DoNugetPack: 'false' - BuildCommand: 'python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --use_openmp --build_dir $(Build.BinariesDirectory) --build_wheel --skip_submodule_sync --parallel --build_shared_lib --enable_language_interop_ops --enable_onnx_tests --config Debug RelWithDebInfo' + BuildCommand: 'python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --use_openmp --build_dir $(Build.BinariesDirectory) --build_wheel --skip_submodule_sync --use_automl --parallel --build_shared_lib --enable_language_interop_ops --enable_onnx_tests --config Debug RelWithDebInfo' diff --git a/tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml index d844c6c586..46a334bb0e 100644 --- a/tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml @@ -4,7 +4,7 @@ jobs: AgentPool : 'Win-CPU' DoDebugBuild: 'true' DoCompliance: 'false' - BuildCommand: '$(Build.SourcesDirectory)\tools\ci_build\build.py --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --cmake_path $(Build.BinariesDirectory)\cmake\bin\cmake.exe --ctest_path $(Build.BinariesDirectory)\cmake\bin\ctest.exe --use_tvm --enable_pybind --use_mkldnn --use_openmp --build_shared_lib --build_csharp --enable_onnx_tests' + BuildCommand: '$(Build.SourcesDirectory)\tools\ci_build\build.py --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --cmake_path $(Build.BinariesDirectory)\cmake\bin\cmake.exe --ctest_path $(Build.BinariesDirectory)\cmake\bin\ctest.exe --use_tvm --use_automl --enable_pybind --use_mkldnn --use_openmp --build_shared_lib --build_csharp --enable_onnx_tests' JobName: 'Windows_CI_Dev' DoNugetPack: 'false' NuPackScript : ''