Resolve issue recommenders-team#2018 (recommenders-team#2022)

* Issue with TF Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Comment out the PR gate affected tests with the upgrade to TF>2.10.1 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Comment out the nightly builds affected tests with the upgrade to TF>2.10.1 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 🐛 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Comment out the nightly builds affected tests with the upgrade to TF>2.10.1 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * revert the breaking tests with TF 2.10.1 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * temporary pin to TF=2.8.4 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Update security tests Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Try to resolve recommenders-team#2018 Signed-off-by: Simon Zhao <[email protected]> * Exclude tensorflow versions that are not supported Signed-off-by: Simon Zhao <[email protected]> * Correct version comparison using packaging.version.Version Signed-off-by: Simon Zhao <[email protected]> * Capture importerror Signed-off-by: Simon Zhao <[email protected]> * Restrict tensorflow < 2.13 Signed-off-by: Simon Zhao <[email protected]> * Set tensorflow < 2.12 Signed-off-by: Simon Zhao <[email protected]> * Not triggering unit tests on Draft PR (recommenders-team#2033) * Not triggering unit tests on Draft PR Signed-off-by: Jun Ki Min <[email protected]> * Change a PR-triggering file to test Signed-off-by: Jun Ki Min <[email protected]> --------- Signed-off-by: Jun Ki Min <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Refactor ranking metric `map` to be the same as Spark's (recommenders-team#2004) * Announcement LF Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Update email Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Update README.md Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * security Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * license and contribution notice Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * update author link Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Add new code of conduct from LF Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Replacing references GRU4Rec to GRU Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Replacing references GRU4Rec to GRU Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Replacing references GRU4Rec in config files Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Update references Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Delete conda.md Signed-off-by: Jun Ki Min <[email protected]> * refactor map_at_k and map to be the same as Spark's Signed-off-by: Jun Ki Min <[email protected]> * list of test failing to fix Signed-off-by: Jun Ki Min <[email protected]> * Update readme LF feedback @wutaomsft Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Update NEWS.md Co-authored-by: Andreas Argyriou <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Update README.md Co-authored-by: Andreas Argyriou <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Fix test errors, Refactor column check utils to be simpler Signed-off-by: Jun Ki Min <[email protected]> * Rename ranking tests to be _at_k suffixed Signed-off-by: Jun Ki Min <[email protected]> * Change test names in the test group Signed-off-by: Jun Ki Min <[email protected]> * add comment to mocked fn in a test Signed-off-by: Jun Ki Min <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * remove unused input Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * no need to output the logs twice Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * packages Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * skipping flaky test Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Issue with TF Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Comment out the PR gate affected tests with the upgrade to TF>2.10.1 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Comment out the nightly builds affected tests with the upgrade to TF>2.10.1 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * 🐛 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Comment out the nightly builds affected tests with the upgrade to TF>2.10.1 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * revert the breaking tests with TF 2.10.1 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * temporary pin to TF=2.8.4 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Update security tests Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Update expected values to not use fixture Signed-off-by: Jun Ki Min <[email protected]> * list of test failing to fix Signed-off-by: Jun Ki Min <[email protected]> * Fix missing fixture error Signed-off-by: Jun Ki Min <[email protected]> --------- Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> Co-authored-by: miguelgfierro <[email protected]> Co-authored-by: Andreas Argyriou <[email protected]> Co-authored-by: Miguel Fierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Add missing kernelspec language Signed-off-by: Simon Zhao <[email protected]> * Remove scrapbook and papermill deps Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * notebook utils programmatic execution Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Test notebook programmatic Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Added test notebook for utils Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * data notebooks Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Replace papermill and scrapbook for new internal function Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Replace papermill and scrapbook for new internal function Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Update new programmatic execution code Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Update new programmatic execution code Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Update notebooks with new utility Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 🐛 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Issue with xDeepFM WIP Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 🐛 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 🐛 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Document the tests in programmatic notebook Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * WIP Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * WIP Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Import missing store_metadata Signed-off-by: Simon Zhao <[email protected]> * Correct pattern matching and substitution Signed-off-by: Simon Zhao <[email protected]> * Merge multiline parameters into one line Signed-off-by: Simon Zhao <[email protected]> * Increase timeout Signed-off-by: Simon Zhao <[email protected]> * Fix nightly test errors (recommenders-team#2045) * Revert tests tolerance * Fix notebook parameter parsing * Add notebook utils tests to test groups * Fix notebooks * Fix notebook unit tests * Update evaluation metrics name map. Handle None for exp_var * Fix smoke tests * cleanup * Fix functional test errors * make notebook parameter update function to be private * Fix benchmark notebook bug * fix remaining bugs --------- Signed-off-by: Jun Ki Min <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Fix benchmarks last cell to store value, not [value] Signed-off-by: Jun Ki Min <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 remove papermill and scrapbook references Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 remove papermill and scrapbook references Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 remove papermill and scrapbook references Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 remove papermill and scrapbook references Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 remove papermill and scrapbook references Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Updated PR template Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Updated contributing Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Updated PR template and contributing Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Updated contributing Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * [Fix] correct MIND data construction of user behavior history Signed-off-by: Simon Zhao <[email protected]> * change path hybrid Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Update hybrid to CF Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * change path hybrid Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * change path hybrid Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Replace LayerRNNCell with AbstractRNNCell Signed-off-by: Simon Zhao <[email protected]> * Stop testing for deeprec Signed-off-by: Simon Zhao <[email protected]> * Refactor ranking metric `map` to be the same as Spark's (recommenders-team#2004) * Announcement LF Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Update email Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Update README.md Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * security Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * license and contribution notice Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * update author link Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Add new code of conduct from LF Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Replacing references GRU4Rec to GRU Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Replacing references GRU4Rec to GRU Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Replacing references GRU4Rec in config files Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Update references Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Delete conda.md Signed-off-by: Jun Ki Min <[email protected]> * refactor map_at_k and map to be the same as Spark's Signed-off-by: Jun Ki Min <[email protected]> * list of test failing to fix Signed-off-by: Jun Ki Min <[email protected]> * Update readme LF feedback @wutaomsft Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Update NEWS.md Co-authored-by: Andreas Argyriou <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Update README.md Co-authored-by: Andreas Argyriou <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Fix test errors, Refactor column check utils to be simpler Signed-off-by: Jun Ki Min <[email protected]> * Rename ranking tests to be _at_k suffixed Signed-off-by: Jun Ki Min <[email protected]> * Change test names in the test group Signed-off-by: Jun Ki Min <[email protected]> * add comment to mocked fn in a test Signed-off-by: Jun Ki Min <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * remove unused input Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * no need to output the logs twice Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * packages Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * skipping flaky test Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Issue with TF Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Comment out the PR gate affected tests with the upgrade to TF>2.10.1 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Comment out the nightly builds affected tests with the upgrade to TF>2.10.1 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * 🐛 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Comment out the nightly builds affected tests with the upgrade to TF>2.10.1 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * revert the breaking tests with TF 2.10.1 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * temporary pin to TF=2.8.4 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Update security tests Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> * Update expected values to not use fixture Signed-off-by: Jun Ki Min <[email protected]> * list of test failing to fix Signed-off-by: Jun Ki Min <[email protected]> * Fix missing fixture error Signed-off-by: Jun Ki Min <[email protected]> --------- Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> Co-authored-by: miguelgfierro <[email protected]> Co-authored-by: Andreas Argyriou <[email protected]> Co-authored-by: Miguel Fierro <[email protected]> * notebook utils programmatic execution Signed-off-by: miguelgfierro <[email protected]> * Test notebook programmatic Signed-off-by: miguelgfierro <[email protected]> * Added test notebook for utils Signed-off-by: miguelgfierro <[email protected]> * Replace papermill and scrapbook for new internal function Signed-off-by: miguelgfierro <[email protected]> * Replace papermill and scrapbook for new internal function Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Update new programmatic execution code Signed-off-by: miguelgfierro <[email protected]> * Update new programmatic execution code Signed-off-by: miguelgfierro <[email protected]> * Update notebooks with new utility Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 🐛 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Issue with xDeepFM WIP Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 🐛 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 🐛 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Document the tests in programmatic notebook Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * WIP Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * WIP Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Import missing store_metadata Signed-off-by: Simon Zhao <[email protected]> * Correct pattern matching and substitution Signed-off-by: Simon Zhao <[email protected]> * Increase timeout Signed-off-by: Simon Zhao <[email protected]> * Fix nightly test errors (recommenders-team#2045) * Revert tests tolerance * Fix notebook parameter parsing * Add notebook utils tests to test groups * Fix notebooks * Fix notebook unit tests * Update evaluation metrics name map. Handle None for exp_var * Fix smoke tests * cleanup * Fix functional test errors * make notebook parameter update function to be private * Fix benchmark notebook bug * fix remaining bugs --------- Signed-off-by: Jun Ki Min <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Fix benchmarks last cell to store value, not [value] Signed-off-by: Jun Ki Min <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 remove papermill and scrapbook references Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 remove papermill and scrapbook references Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 remove papermill and scrapbook references Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Updated PR template Signed-off-by: miguelgfierro <[email protected]> * Updated contributing Signed-off-by: miguelgfierro <[email protected]> * Updated PR template and contributing Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Updated contributing Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * change path hybrid Signed-off-by: miguelgfierro <[email protected]> * change path hybrid Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Creating a jupyter book Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Creating documentation Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * WIP Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Added rst files Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * license Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Weird warning with a link in the docstrings Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Fix docstring errors and replace .. note:: with Note: Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Automatic build of documentation Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Automatic build of documentation dev Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Automatic build of documentation deps Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Automatic build of documentation deps Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Automatic build of documentation deps Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Delete workflow and try via UI Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Added again the workflow Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * git add * -rf Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * git add * -f Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * add git info Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * actions to automatically update documentation Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * actions to automatically update documentation Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * actions to automatically update documentation 🐛 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * actions to automatically update documentation 🐛 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * trying github token Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * trying github token Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * trying github token and pull before pushing Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * pull rebase Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * pull rebase and -Xtheirs Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * clean Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Update documentation badge Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * install all deps Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * try adding other sphinx extensions Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Refact model rst Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * comment geoimc and rlrmc docs until issue is fixed Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * 📝 Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Adding init and other special members Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Adding init and other special members Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Reviewing other rst Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Change sphinx version Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Change sphinx version and jupyter book Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Change the way we compile the documentation Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Using the latest JB release Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Documentation working Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Update docs/_config.yml Co-authored-by: Simon Zhao <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Update docs/requirements-doc.txt Co-authored-by: Simon Zhao <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Update docs/_config.yml Co-authored-by: Simon Zhao <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Added comments by @SimonYansenZhao Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Upgrade versions of GitHub Actions See https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/ Signed-off-by: Simon Zhao <[email protected]> * Update setup.py Co-authored-by: Miguel Fierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> * Try to disable sum and sum_component only Signed-off-by: Simon Zhao <[email protected]> * Upgrade AzureML docker image Signed-off-by: Simon Zhao <[email protected]> * Correct variable names Signed-off-by: Simon Zhao <[email protected]> * Install git in the Conda env Signed-off-by: Simon Zhao <[email protected]> * Disable test_xdeepfm_component_definition Signed-off-by: Simon Zhao <[email protected]> * Use latest CUDA Signed-off-by: Simon Zhao <[email protected]> * Correct GPU selection Signed-off-by: Simon Zhao <[email protected]> * Remove leading whitespaces in Dockerfile Signed-off-by: Simon Zhao <[email protected]> * Simplify azureml-test/action.yml Signed-off-by: Simon Zhao <[email protected]> * Install wget in Docker image Signed-off-by: Simon Zhao <[email protected]> * Update Signed-off-by: Simon Zhao <[email protected]> --------- Signed-off-by: miguelgfierro <[email protected]> Signed-off-by: Simon Zhao <[email protected]> Signed-off-by: Jun Ki Min <[email protected]> Co-authored-by: miguelgfierro <[email protected]> Co-authored-by: Jun Ki Min <[email protected]> Co-authored-by: Andreas Argyriou <[email protected]> Co-authored-by: Miguel Fierro <[email protected]> Co-authored-by: thaiminhpv <[email protected]>
gogetron · Apr 11, 2024 · a9b3df1 · a9b3df1
1 parent 00e9d19
commit a9b3df1
Show file tree

Hide file tree

Showing 13 changed files with 118 additions and 72 deletions.
diff --git a/.github/actions/azureml-test/action.yml b/.github/actions/azureml-test/action.yml
@@ -69,7 +69,7 @@ runs:
   using: "composite"
   steps:
     - name: Setup python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: "3.8"
     - name: Install azureml-core and azure-cli on a GitHub hosted server
@@ -82,43 +82,32 @@ runs:
     - name: Install wheel package
       shell: bash
       run: pip install --quiet wheel
-    - name: Submit CPU tests to AzureML
+    - name: Submit tests to AzureML
       shell: bash
-      if: contains(inputs.TEST_GROUP, 'cpu')
       run: >-
-          python tests/ci/azureml_tests/submit_groupwise_azureml_pytest.py --clustername ${{inputs.CPU_CLUSTER_NAME}}
-          --subid ${{inputs.AZUREML_TEST_SUBID}} --reponame "recommenders" --branch ${{ github.ref }}
-          --rg ${{inputs.RG}} --wsname ${{inputs.WS}} --expname ${{inputs.EXP_NAME}}_${{inputs.TEST_GROUP}}
-          --testlogs ${{inputs.TEST_LOGS_PATH}} --testkind ${{inputs.TEST_KIND}}
-          --conda_pkg_python ${{inputs.PYTHON_VERSION}} --testgroup ${{inputs.TEST_GROUP}}
-          --disable-warnings --sha "${GITHUB_SHA}"
-    - name: Submit GPU tests to AzureML
-      shell: bash
-      if: contains(inputs.TEST_GROUP, 'gpu')
-      run: >-
-          python tests/ci/azureml_tests/submit_groupwise_azureml_pytest.py --clustername ${{inputs.GPU_CLUSTER_NAME}}
-          --subid ${{inputs.AZUREML_TEST_SUBID}} --reponame "recommenders" --branch ${{ github.ref }}
-          --rg ${{inputs.RG}} --wsname ${{inputs.WS}} --expname ${{inputs.EXP_NAME}}_${{inputs.TEST_GROUP}}
-          --testlogs ${{inputs.TEST_LOGS_PATH}} --add_gpu_dependencies --testkind ${{inputs.TEST_KIND}}
-          --conda_pkg_python ${{inputs.PYTHON_VERSION}} --testgroup ${{inputs.TEST_GROUP}}
-          --disable-warnings --sha "${GITHUB_SHA}"
-    - name: Submit PySpark tests to AzureML
-      shell: bash
-      if: contains(inputs.TEST_GROUP, 'spark')
-      run: >-
-          python tests/ci/azureml_tests/submit_groupwise_azureml_pytest.py --clustername ${{inputs.CPU_CLUSTER_NAME}}
-          --subid ${{inputs.AZUREML_TEST_SUBID}} --reponame "recommenders" --branch ${{ github.ref }}
-          --rg ${{inputs.RG}} --wsname ${{inputs.WS}} --expname ${{inputs.EXP_NAME}}_${{inputs.TEST_GROUP}}
-          --testlogs ${{inputs.TEST_LOGS_PATH}} --add_spark_dependencies --testkind ${{inputs.TEST_KIND}}
-          --conda_pkg_python ${{inputs.PYTHON_VERSION}} --testgroup ${{inputs.TEST_GROUP}}
-          --disable-warnings --sha "${GITHUB_SHA}"
+        python tests/ci/azureml_tests/submit_groupwise_azureml_pytest.py \
+          --subid ${{inputs.AZUREML_TEST_SUBID}} \
+          --reponame "recommenders" \
+          --branch ${{ github.ref }} \
+          --rg ${{inputs.RG}} \
+          --wsname ${{inputs.WS}} \
+          --expname ${{inputs.EXP_NAME}}_${{inputs.TEST_GROUP}} \
+          --testlogs ${{inputs.TEST_LOGS_PATH}} \
+          --testkind ${{inputs.TEST_KIND}} \
+          --conda_pkg_python ${{inputs.PYTHON_VERSION}} \
+          --testgroup ${{inputs.TEST_GROUP}} \
+          --disable-warnings \
+          --sha "${GITHUB_SHA}" \
+          --clustername $(if [[ ${{inputs.TEST_GROUP}} =~ "gpu" ]]; then echo "${{inputs.GPU_CLUSTER_NAME}}"; else echo "${{inputs.CPU_CLUSTER_NAME}}"; fi) \
+          $(if [[ ${{inputs.TEST_GROUP}} =~ "gpu" ]]; then echo "--add_gpu_dependencies"; fi) \
+          $(if [[ ${{inputs.TEST_GROUP}} =~ "spark" ]]; then echo "--add_spark_dependencies"; fi)
     - name: Get exit status
       shell: bash
       id: exit_status
       run: echo "code=$(cat ${{inputs.PYTEST_EXIT_CODE}})" >> $GITHUB_OUTPUT
     - name: Check Success/Failure
       if: ${{ steps.exit_status.outputs.code != 0 }}
-      uses: actions/github-script@v3
+      uses: actions/github-script@v7
       with:
         script: |
             core.setFailed('All tests did not pass!')
diff --git a/.github/workflows/azureml-cpu-nightly.yml b/.github/workflows/azureml-cpu-nightly.yml
@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get test group names
         id: get_test_groups
         uses: ./.github/actions/get-test-groups
@@ -87,7 +87,7 @@ jobs:
         test-group:  ${{ fromJSON(needs.get-test-groups.outputs.test_groups) }}
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Execute tests
         uses: ./.github/actions/azureml-test
         id: execute_tests

diff --git a/.github/workflows/azureml-gpu-nightly.yml b/.github/workflows/azureml-gpu-nightly.yml
@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get test group names
         id: get_test_groups
         uses: ./.github/actions/get-test-groups
@@ -87,7 +87,7 @@ jobs:
         test-group:  ${{ fromJSON(needs.get-test-groups.outputs.test_groups) }}
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Execute tests
         uses: ./.github/actions/azureml-test
         id: execute_tests

diff --git a/.github/workflows/azureml-release-pipeline.yml b/.github/workflows/azureml-release-pipeline.yml
@@ -33,9 +33,9 @@ jobs:
     needs: [unit-test-workflow, cpu-nightly-workflow, gpu-nightly-workflow, spark-nightly-workflow]
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with: 
           python-version: "3.8"
       - name: Install wheel package

diff --git a/.github/workflows/azureml-spark-nightly.yml b/.github/workflows/azureml-spark-nightly.yml
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get test group names
         id: get_test_groups
         uses: ./.github/actions/get-test-groups
@@ -86,7 +86,7 @@ jobs:
         test-group:  ${{ fromJSON(needs.get-test-groups.outputs.test_groups) }}
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Execute tests
         uses: ./.github/actions/azureml-test
         id: execute_tests

diff --git a/.github/workflows/azureml-unit-tests.yml b/.github/workflows/azureml-unit-tests.yml
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get test group names
         id: get_test_groups
         uses: ./.github/actions/get-test-groups
@@ -76,7 +76,7 @@ jobs:
         test-group:  ${{ fromJSON(needs.get-test-groups.outputs.test_groups) }}
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Execute tests
         uses: ./.github/actions/azureml-test
         id: execute_tests

diff --git a/.github/workflows/sarplus.yml b/.github/workflows/sarplus.yml
@@ -60,10 +60,10 @@ jobs:
         python-version: ["3.8", "3.9", "3.10"]
 >>>>>>> c3a70302 (Remove python 3.11)
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -115,15 +115,15 @@ jobs:
       - name: Upload Python wheel as GitHub artifact when merged into main
         # Upload the whl file of the specific python version
         if: github.ref == 'refs/heads/main'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: pysarplus-${{ env.sarplus_version }}-cp${{ matrix.python-version }}-wheel
           path: ${{ env.PYTHON_ROOT }}/dist/*.whl
 
       - name: Upload Python source as GitHub artifact when merged into main
         # Only one pysarplus source tar file is needed
         if: github.ref == 'refs/heads/main' && matrix.python-version == '3.10'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: pysarplus-${{ env.sarplus_version }}-source
           path: ${{ env.PYTHON_ROOT }}/dist/*.tar.gz
@@ -150,7 +150,7 @@ jobs:
             hadoop-version: "3.3.1"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Test
         run: |
@@ -199,7 +199,7 @@ jobs:
 
       - name: Upload Scala bundle as GitHub artifact when merged into main
         if: github.ref == 'refs/heads/main'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: sarplus-${{ env.sarplus_version }}-bundle_2.12-spark-${{ matrix.spark-version }}-jar
           path: ${{ env.SCALA_ROOT }}/target/scala-2.12/*bundle*.jar
diff --git a/.github/workflows/update_documentation.yml b/.github/workflows/update_documentation.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 

diff --git a/recommenders/models/deeprec/models/sequential/rnn_cell_implement.py b/recommenders/models/deeprec/models/sequential/rnn_cell_implement.py
@@ -601,9 +601,9 @@ def __init__(
     ):
         self._build_bias = build_bias
 
-        if args is None or (nest.is_sequence(args) and not args):
+        if args is None or (nest.is_nested(args) and not args):
             raise ValueError("`args` must be specified")
-        if not nest.is_sequence(args):
+        if not nest.is_nested(args):
             args = [args]
             self._is_sequence = False
         else:

diff --git a/setup.py b/setup.py
@@ -109,9 +109,14 @@
         "locust>=2.15.1,<3",
     ],
     "gpu": [
+<<<<<<< HEAD
         "nvidia-ml-py>=11.510.69",
         # TensorFlow compiled with CUDA 11.8, cudnn 8.6.0.163
         "tensorflow~=2.12.0",
+=======
+        "nvidia-ml-py3>=7.352.0",
+        "tensorflow>=2.8.4,!=2.9.0.*,!=2.9.1,!=2.9.2,!=2.10.0.*,<3",
+>>>>>>> c736241b (Resolve issue #2018 (#2022))
         "tf-slim>=1.1.0",
         "torch>=2.0.1",
         "fastai>=2.7.11,<3",
@@ -122,11 +127,19 @@
         "pyspark>=3.0.1,<=3.4.0",
     ],
     "dev": [
+<<<<<<< HEAD
         "black>=23.3.0,<24",
         "pytest>=7.2.1",
         "pytest-cov>=4.1.0",
         "pytest-mock>=3.10.0",  # for access to mock fixtures in pytest
         "pytest-rerunfailures>=11.1.2",  # to mark flaky tests
+=======
+        "black>=18.6b4,<21",
+        "pytest>=3.6.4",
+        "pytest-cov>=2.12.1",
+        "pytest-mock>=3.6.1",  # for access to mock fixtures in pytest
+        "packaging>=20.9",     # for version comparison in test_dependency_security.py
+>>>>>>> c736241b (Resolve issue #2018 (#2022))
     ],
 }
 # For the brave of heart

diff --git a/tests/ci/azureml_tests/submit_groupwise_azureml_pytest.py b/tests/ci/azureml_tests/submit_groupwise_azureml_pytest.py
@@ -145,11 +145,14 @@ def setup_persistent_compute_target(workspace, cluster_name, vm_size, max_nodes)
 
 def create_run_config(
     cpu_cluster,
+<<<<<<< HEAD
 <<<<<<< HEAD
     docker_proc_type,
 =======
     docker_image,
 >>>>>>> 09069f7c (Install dependencies for scipy in docker image)
+=======
+>>>>>>> c736241b (Resolve issue #2018 (#2022))
     add_gpu_dependencies,
     add_spark_dependencies,
     conda_pkg_jdk,
@@ -168,11 +171,14 @@ def create_run_config(
                                                 the following:
                                                 - Reco_cpu_test
                                                 - Reco_gpu_test
+<<<<<<< HEAD
 <<<<<<< HEAD
             docker_proc_type (str)          : processor type, cpu or gpu
 =======
             docker_image (str)              : docker image for cpu or gpu
 >>>>>>> 09069f7c (Install dependencies for scipy in docker image)
+=======
+>>>>>>> c736241b (Resolve issue #2018 (#2022))
             add_gpu_dependencies (bool)     : True if gpu packages should be
                                         added to the conda environment, else False
             add_spark_dependencies (bool)   : True if PySpark packages should be
@@ -186,6 +192,7 @@ def create_run_config(
     run_azuremlcompute = RunConfiguration()
     run_azuremlcompute.target = cpu_cluster
     run_azuremlcompute.environment.docker.enabled = True
+<<<<<<< HEAD
     # See https://learn.microsoft.com/en-us/azure/machine-learning/how-to-train-with-custom-image?view=azureml-api-1#use-a-custom-dockerfile-optional
     run_azuremlcompute.environment.docker.base_image = None
     run_azuremlcompute.environment.docker.base_dockerfile = f"""
@@ -200,6 +207,41 @@ def create_run_config(
         pkg-config
     RUN apt-get install -y git
     """
+=======
+    if not add_gpu_dependencies:
+        # https://github.com/Azure/AzureML-Containers/blob/master/base/cpu/openmpi4.1.0-ubuntu22.04
+        run_azuremlcompute.environment.docker.base_image = "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04"
+    else:
+        run_azuremlcompute.environment.docker.base_image = None
+        # Use the latest CUDA
+        # See
+        # * https://learn.microsoft.com/en-us/azure/machine-learning/how-to-train-with-custom-image?view=azureml-api-1#use-a-custom-dockerfile-optional
+        # * https://github.com/Azure/AzureML-Containers/blob/master/base/gpu/openmpi4.1.0-cuda11.8-cudnn8-ubuntu22.04
+        run_azuremlcompute.environment.docker.base_dockerfile = r"""
+FROM nvcr.io/nvidia/cuda:12.3.1-devel-ubuntu22.04
+USER root:root
+ENV NVIDIA_VISIBLE_DEVICES all
+ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
+ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && \
+    apt-get install -y wget git-all && \
+    apt-get clean -y && \
+    rm -rf /var/lib/apt/lists/*
+# Conda Environment
+ENV MINICONDA_VERSION py38_23.3.1-0
+ENV PATH /opt/miniconda/bin:$PATH
+ENV CONDA_PACKAGE 23.5.0
+RUN wget -qO /tmp/miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh && \
+    bash /tmp/miniconda.sh -bf -p /opt/miniconda && \
+    conda install conda=${CONDA_PACKAGE} -y && \
+    conda update --all -c conda-forge -y && \
+    conda clean -ay && \
+    rm -rf /opt/miniconda/pkgs && \
+    rm /tmp/miniconda.sh && \
+    find / -type d -name __pycache__ | xargs rm -rf
+"""
+>>>>>>> c736241b (Resolve issue #2018 (#2022))
 
     # Use conda_dependencies.yml to create a conda environment in
     # the Docker image for execution
@@ -215,6 +257,7 @@ def create_run_config(
 
     # install recommenders
     reco_extras = "dev"
+    conda_dep.add_conda_package("anaconda::git")
     if add_gpu_dependencies and add_spark_dependencies:
         conda_dep.add_channel("conda-forge")
         conda_dep.add_conda_package(conda_pkg_jdk)
@@ -346,13 +389,6 @@ def create_arg_parser():
         default="STANDARD_D3_V2",
         help="Set the size of the VM either STANDARD_D3_V2",
     )
-    # cpu or gpu
-    parser.add_argument(
-        "--dockerproc",
-        action="store",
-        default="cpu",
-        help="Base image used in docker container",
-    )
     # Azure subscription id, when used in a pipeline, it is stored in keyvault
     parser.add_argument(
         "--subid", action="store", default="123456", help="Azure Subscription ID"
@@ -441,6 +477,7 @@ def create_arg_parser():
 
     logger = logging.getLogger("submit_groupwise_azureml_pytest.py")
     args = create_arg_parser()
+<<<<<<< HEAD
 
     if args.dockerproc == "cpu":
         # https://github.com/Azure/AzureML-Containers/blob/master/base/cpu/openmpi4.1.0-ubuntu22.04
@@ -449,6 +486,8 @@ def create_arg_parser():
         # https://github.com/Azure/AzureML-Containers/blob/master/base/gpu/openmpi4.1.0-cuda11.8-cudnn8-ubuntu22.04
         docker_image = "mcr.microsoft.com/azureml/openmpi4.1.0-cuda11.8-cudnn8-ubuntu22.04"
 
+=======
+>>>>>>> c736241b (Resolve issue #2018 (#2022))
     cli_auth = AzureCliAuthentication()
 
     workspace = setup_workspace(
@@ -468,11 +507,14 @@ def create_arg_parser():
 
     run_config = create_run_config(
         cpu_cluster=cpu_cluster,
+<<<<<<< HEAD
 <<<<<<< HEAD
         docker_proc_type=docker_proc_type,
 =======
         docker_image=docker_image,
 >>>>>>> 09069f7c (Install dependencies for scipy in docker image)
+=======
+>>>>>>> c736241b (Resolve issue #2018 (#2022))
         add_gpu_dependencies=args.add_gpu_dependencies,
         add_spark_dependencies=args.add_spark_dependencies,
         conda_pkg_jdk=args.conda_pkg_jdk,