From 3ae6ea4dfb0009243fda46c7fb996b243755bcfa Mon Sep 17 00:00:00 2001 From: Dmitry Chigarev Date: Sun, 13 Feb 2022 20:56:36 +0300 Subject: [PATCH 1/2] MODIN: fix samples testing in CI Signed-off-by: Dmitry Chigarev --- .../IntelModin_GettingStarted/sample.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/AI-and-Analytics/Getting-Started-Samples/IntelModin_GettingStarted/sample.json b/AI-and-Analytics/Getting-Started-Samples/IntelModin_GettingStarted/sample.json index bc5ad6bdca..25908bcbec 100755 --- a/AI-and-Analytics/Getting-Started-Samples/IntelModin_GettingStarted/sample.json +++ b/AI-and-Analytics/Getting-Started-Samples/IntelModin_GettingStarted/sample.json @@ -10,11 +10,18 @@ "ciTests": { "linux": [ { - "env": ["source /opt/intel/oneapi/setvars.sh --force", "conda create -n aikit-modin-test -c intel -c conda-forge matplotlib runipy intel-aikit-modin", "source activate aikit-modin-test"], + "env": [ + "set -e # Terminate the script on first error", + "source $(conda info --base)/etc/profile.d/conda.sh # Bypassing conda's disability to activate environments inside a bash script: https://github.com/conda/conda/issues/7980", + "conda create -y -n intel-aikit-modin intel-aikit-modin -c intel", + "conda activate intel-aikit-modin", + "pip install -r requirements.txt # Installing notebook's dependencies", + "pip install runipy # Installing 'runipy' for extended abilities to execute the notebook" + ], "id": "Intel_Modin_GS_py", "steps": [ - "runipy IntelModin_GettingStarted.ipynb" - ] + "runipy IntelModin_GettingStarted.ipynb" + ] } ] } From 8f21ecf996e964852b020272ad5a6ec805bf5219 Mon Sep 17 00:00:00 2001 From: Dmitry Chigarev Date: Mon, 14 Feb 2022 21:28:51 +0300 Subject: [PATCH 2/2] Try to combine env setup steps into a single cell Signed-off-by: Dmitry Chigarev --- .../IntelModin_GettingStarted/sample.json | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/AI-and-Analytics/Getting-Started-Samples/IntelModin_GettingStarted/sample.json b/AI-and-Analytics/Getting-Started-Samples/IntelModin_GettingStarted/sample.json index 25908bcbec..b4493a557f 100755 --- a/AI-and-Analytics/Getting-Started-Samples/IntelModin_GettingStarted/sample.json +++ b/AI-and-Analytics/Getting-Started-Samples/IntelModin_GettingStarted/sample.json @@ -10,17 +10,16 @@ "ciTests": { "linux": [ { - "env": [ - "set -e # Terminate the script on first error", - "source $(conda info --base)/etc/profile.d/conda.sh # Bypassing conda's disability to activate environments inside a bash script: https://github.com/conda/conda/issues/7980", - "conda create -y -n intel-aikit-modin intel-aikit-modin -c intel", - "conda activate intel-aikit-modin", - "pip install -r requirements.txt # Installing notebook's dependencies", - "pip install runipy # Installing 'runipy' for extended abilities to execute the notebook" - ], + "env": [], "id": "Intel_Modin_GS_py", "steps": [ - "runipy IntelModin_GettingStarted.ipynb" + "set -e # Terminate the script on first error", + "source $(conda info --base)/etc/profile.d/conda.sh # Bypassing conda's disability to activate environments inside a bash script: https://github.com/conda/conda/issues/7980", + "conda create -y -n intel-aikit-modin intel-aikit-modin -c intel", + "conda activate intel-aikit-modin", + "pip install -r requirements.txt # Installing notebook's dependencies", + "pip install runipy # Installing 'runipy' for extended abilities to execute the notebook", + "runipy IntelModin_GettingStarted.ipynb" ] } ]