From 6e2f76266b3cab3d17b62ccc83d0f5d9469da811 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Wed, 31 Aug 2022 16:06:30 +0800 Subject: [PATCH 01/34] add orca horovod tf2 test to github actions --- .../action.yml | 47 +++++++++++++++++++ .../requirements-horovod-tf2.txt | 30 ++++++++++++ .github/workflows/nightly_test.yml | 14 ++++++ 3 files changed, 91 insertions(+) create mode 100644 .github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml create mode 100644 .github/actions/python-requirements/requirements-horovod-tf2.txt diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml new file mode 100644 index 00000000000..e3f95112d27 --- /dev/null +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -0,0 +1,47 @@ +name: 'Run Orca Python Horovod Tf2 Py37 Spark3' +description: 'Run Orca Python Horovod Tf2 Py37 Spark3' +runs: + using: "composite" + steps: + - name: Setup Env + shell: bash + run: | + apt-get update + apt-get install wget + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.7' + + - name: Install dependencies + shell: bash + run: | + python -m pip install --upgrade pip + python -m pip install --upgrade setuptools==58.0.4 + pip uninstall -y bigdl-friesian bigdl-friesian-spark3 bigdl-dllib bigdl-dllib-spark3 bigdl-orca pyspark bigdl-orca-spark3 bigdl-chronos bigdl-chronos-spark3 bigdl-friesian bigdl-friesian-spark3 + pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y + pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r .github/actions/python-requirements/requirements-horovod-tf2.txt + pip install pytest + pip uninstall -y opencv-python-headless + pip install opencv-python-headless + sed -i "s/'bigdl-core=='+VERSION/'bigdl-core==2.1.0b20220811'/g" python/dllib/src/setup.py + bash python/dev/release_default_linux_spark312.sh default false false + + # install dllib + pip install python/dllib/src/dist/bigdl_dllib*-py3-none-manylinux1_x86_64.whl + + # install orca + pip install python/orca/src/dist/bigdl_orca*-py3-none-manylinux1_x86_64.whl + + - name: Run Test + shell: bash + run: | + export SPARK_LOCAL_HOSTNAME=localhost + + chmod a+x python/orca/dev/test/run-pytests-horovod-tf.sh + python/orca/dev/test/run-pytests-horovod-tf.sh + ray stop + env: + BIGDL_ROOT: ${{ github.workspace }} + ANALYTICS_ZOO_ROOT: ${{ github.workspace }} diff --git a/.github/actions/python-requirements/requirements-horovod-tf2.txt b/.github/actions/python-requirements/requirements-horovod-tf2.txt new file mode 100644 index 00000000000..f4466a9bcb1 --- /dev/null +++ b/.github/actions/python-requirements/requirements-horovod-tf2.txt @@ -0,0 +1,30 @@ +torch==1.7.1 +torchvision +torchmetrics +albumentations +scikit-learn==0.22.2.post1 +opencv-python +matplotlib +tqdm +protobuf==3.15.3 +pandas +ray[default]==1.9.2 +dm_tree +gym[atari]==0.17.1 +atari-py==0.2.5 +tabulate==0.8.7 +tensorboard==2.6.0 +tensorboard-data-server==0.6.1 +tensorboard-plugin-wit==1.7.0 +tensorboardX==2.1 +tensorflow==2.3.0 +tensorflow-estimator==2.3.0 +mxnet==1.6.0 +xgboost_ray +argparse +Pillow +pyarrow==4.0.1 +h5py==2.10.0 +fsspec==2021.9.0 +scikit-optimize==0.8.1 +pandas==1.1.5 diff --git a/.github/workflows/nightly_test.yml b/.github/workflows/nightly_test.yml index 39496894524..9a5a63d7c07 100644 --- a/.github/workflows/nightly_test.yml +++ b/.github/workflows/nightly_test.yml @@ -19,6 +19,7 @@ on: - Orca-Python-Ray-Py37-Spark3 - Orca-Python-Py37-Spark3 - Orca-Ray-Ctx-Example + - Orca-Python-Horovod-Tf2-Py37-Spark3 - Dllib-Scala-UT - Friesian-Scala-UT - PPML-Scala-UT @@ -95,6 +96,19 @@ jobs: - name: Run test uses: ./.github/actions/orca-python-py37-spark3-action + Orca-Python-Horovod-Tf2-Py37-Spark3: + if: ${{ github.event.schedule || github.event.inputs.artifact == 'Orca-Python-Horovod-Tf2-Py37-Spark3' || github.event.inputs.artifact == 'all' }} + runs-on: [self-hosted, Gondolin, ubuntu-20.04-lts] + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK8 + uses: ./.github/actions/jdk-setup-action + - name: Set up maven + uses: ./.github/actions/maven-setup-action + - name: Run test + uses: ./.github/actions/Orca-Python-Horovod-Tf2-Py37-Spark3-action + Dllib-Scala-UT: if: ${{ github.event.schedule || github.event.inputs.artifact == 'Dllib-Scala-UT' || github.event.inputs.artifact == 'all' }} runs-on: [ self-hosted, Gondolin, ubuntu-20.04-lts ] From 81d524af5ed97020472017dace7fd79fcd536fbd Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Wed, 31 Aug 2022 16:22:34 +0800 Subject: [PATCH 02/34] update pull_request --- .github/workflows/nightly_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly_test.yml b/.github/workflows/nightly_test.yml index 9a5a63d7c07..79b1c34acfa 100644 --- a/.github/workflows/nightly_test.yml +++ b/.github/workflows/nightly_test.yml @@ -1,7 +1,7 @@ name: Nightly Test on: - #pull_request: + pull_request: schedule: - cron: '0 13 * * *' # GMT time, 13:00 GMT == 21:00 China workflow_dispatch: @@ -97,7 +97,7 @@ jobs: uses: ./.github/actions/orca-python-py37-spark3-action Orca-Python-Horovod-Tf2-Py37-Spark3: - if: ${{ github.event.schedule || github.event.inputs.artifact == 'Orca-Python-Horovod-Tf2-Py37-Spark3' || github.event.inputs.artifact == 'all' }} + #if: ${{ github.event.schedule || github.event.inputs.artifact == 'Orca-Python-Horovod-Tf2-Py37-Spark3' || github.event.inputs.artifact == 'all' }} runs-on: [self-hosted, Gondolin, ubuntu-20.04-lts] steps: From 79c352d5bbeb9f4f7339ea04c6d18388898db378 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Wed, 31 Aug 2022 17:22:14 +0800 Subject: [PATCH 03/34] update --- .github/workflows/nightly_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly_test.yml b/.github/workflows/nightly_test.yml index 79b1c34acfa..8849606a283 100644 --- a/.github/workflows/nightly_test.yml +++ b/.github/workflows/nightly_test.yml @@ -107,7 +107,7 @@ jobs: - name: Set up maven uses: ./.github/actions/maven-setup-action - name: Run test - uses: ./.github/actions/Orca-Python-Horovod-Tf2-Py37-Spark3-action + uses: ./.github/actions/orca-python-horovod-tf2-py37-spark3-action Dllib-Scala-UT: if: ${{ github.event.schedule || github.event.inputs.artifact == 'Dllib-Scala-UT' || github.event.inputs.artifact == 'all' }} From 70cd169ca0ec5905247bad857e86c87cceb12ae5 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Wed, 31 Aug 2022 17:56:34 +0800 Subject: [PATCH 04/34] add keras --- .../actions/python-requirements/requirements-horovod-tf2.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/python-requirements/requirements-horovod-tf2.txt b/.github/actions/python-requirements/requirements-horovod-tf2.txt index f4466a9bcb1..feea5e9d6b1 100644 --- a/.github/actions/python-requirements/requirements-horovod-tf2.txt +++ b/.github/actions/python-requirements/requirements-horovod-tf2.txt @@ -28,3 +28,5 @@ h5py==2.10.0 fsspec==2021.9.0 scikit-optimize==0.8.1 pandas==1.1.5 +Keras-Applications==1.0.8 +Keras-Preprocessing==1.1.2 From 398c8208e6edc5ff9cc3a3c80f68fb5b9d3bcc91 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 1 Sep 2022 09:56:53 +0800 Subject: [PATCH 05/34] update python version --- .../orca-python-horovod-tf2-py37-spark3-action/action.yml | 2 +- .../actions/python-requirements/requirements-horovod-tf2.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml index e3f95112d27..5df66eb23a9 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -12,7 +12,7 @@ runs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.7' + python-version: '3.7.6' - name: Install dependencies shell: bash diff --git a/.github/actions/python-requirements/requirements-horovod-tf2.txt b/.github/actions/python-requirements/requirements-horovod-tf2.txt index feea5e9d6b1..57a890096d0 100644 --- a/.github/actions/python-requirements/requirements-horovod-tf2.txt +++ b/.github/actions/python-requirements/requirements-horovod-tf2.txt @@ -13,7 +13,7 @@ dm_tree gym[atari]==0.17.1 atari-py==0.2.5 tabulate==0.8.7 -tensorboard==2.6.0 +tensorboard==2.3.0 tensorboard-data-server==0.6.1 tensorboard-plugin-wit==1.7.0 tensorboardX==2.1 From 2ce03f1e3a3c48f7f6c99723323a9dd8224f766c Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 1 Sep 2022 11:21:03 +0800 Subject: [PATCH 06/34] update horovod --- .../orca-python-horovod-tf2-py37-spark3-action/action.yml | 1 + .../actions/python-requirements/requirements-horovod-tf2.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml index 5df66eb23a9..a2d652f61bc 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -20,6 +20,7 @@ runs: python -m pip install --upgrade pip python -m pip install --upgrade setuptools==58.0.4 pip uninstall -y bigdl-friesian bigdl-friesian-spark3 bigdl-dllib bigdl-dllib-spark3 bigdl-orca pyspark bigdl-orca-spark3 bigdl-chronos bigdl-chronos-spark3 bigdl-friesian bigdl-friesian-spark3 + HOROVOD_WITH_PYTORCH=1; HOROVOD_WITH_GLOO=1; pip install --no-cache-dir horovod==0.19.2 pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r .github/actions/python-requirements/requirements-horovod-tf2.txt pip install pytest diff --git a/.github/actions/python-requirements/requirements-horovod-tf2.txt b/.github/actions/python-requirements/requirements-horovod-tf2.txt index 57a890096d0..525396bf499 100644 --- a/.github/actions/python-requirements/requirements-horovod-tf2.txt +++ b/.github/actions/python-requirements/requirements-horovod-tf2.txt @@ -9,6 +9,8 @@ tqdm protobuf==3.15.3 pandas ray[default]==1.9.2 +aiohttp==3.8.1 +async-timeout==4.0.1 dm_tree gym[atari]==0.17.1 atari-py==0.2.5 From aa58b5fa543fbcb9ff4b3cf010ba5bb04469c334 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 1 Sep 2022 12:05:46 +0800 Subject: [PATCH 07/34] update cmake --- .../orca-python-horovod-tf2-py37-spark3-action/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml index a2d652f61bc..4ae5f7b12c0 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -20,6 +20,7 @@ runs: python -m pip install --upgrade pip python -m pip install --upgrade setuptools==58.0.4 pip uninstall -y bigdl-friesian bigdl-friesian-spark3 bigdl-dllib bigdl-dllib-spark3 bigdl-orca pyspark bigdl-orca-spark3 bigdl-chronos bigdl-chronos-spark3 bigdl-friesian bigdl-friesian-spark3 + pip install cmake HOROVOD_WITH_PYTORCH=1; HOROVOD_WITH_GLOO=1; pip install --no-cache-dir horovod==0.19.2 pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r .github/actions/python-requirements/requirements-horovod-tf2.txt From 8fd3fd4c0cc0b63d05a9cf4a3c351ca9af828df7 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 1 Sep 2022 13:43:12 +0800 Subject: [PATCH 08/34] install bigdl-orca-spark3 --- .../action.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml index 4ae5f7b12c0..c22829e4a34 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -27,14 +27,15 @@ runs: pip install pytest pip uninstall -y opencv-python-headless pip install opencv-python-headless - sed -i "s/'bigdl-core=='+VERSION/'bigdl-core==2.1.0b20220811'/g" python/dllib/src/setup.py - bash python/dev/release_default_linux_spark312.sh default false false + #sed -i "s/'bigdl-core=='+VERSION/'bigdl-core==2.1.0b20220811'/g" python/dllib/src/setup.py + #bash python/dev/release_default_linux_spark312.sh default false false # install dllib - pip install python/dllib/src/dist/bigdl_dllib*-py3-none-manylinux1_x86_64.whl + #pip install python/dllib/src/dist/bigdl_dllib*-py3-none-manylinux1_x86_64.whl # install orca - pip install python/orca/src/dist/bigdl_orca*-py3-none-manylinux1_x86_64.whl + #pip install python/orca/src/dist/bigdl_orca*-py3-none-manylinux1_x86_64.whl + pip install -i https://pypi.org/simple --pre --upgrade bigdl-orca-spark3 - name: Run Test shell: bash From 1c2dab753742f0755243b30b70163b876ea23631 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 1 Sep 2022 14:16:32 +0800 Subject: [PATCH 09/34] update --- .../action.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml index c22829e4a34..05d7b227697 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -27,15 +27,15 @@ runs: pip install pytest pip uninstall -y opencv-python-headless pip install opencv-python-headless - #sed -i "s/'bigdl-core=='+VERSION/'bigdl-core==2.1.0b20220811'/g" python/dllib/src/setup.py - #bash python/dev/release_default_linux_spark312.sh default false false + sed -i "s/'bigdl-core=='+VERSION/'bigdl-core==2.1.0b20220811'/g" python/dllib/src/setup.py + bash python/dev/release_default_linux_spark312.sh default false false # install dllib - #pip install python/dllib/src/dist/bigdl_dllib*-py3-none-manylinux1_x86_64.whl + pip install python/dllib/src/dist/bigdl_dllib*-py3-none-manylinux1_x86_64.whl # install orca - #pip install python/orca/src/dist/bigdl_orca*-py3-none-manylinux1_x86_64.whl - pip install -i https://pypi.org/simple --pre --upgrade bigdl-orca-spark3 + pip install python/orca/src/dist/bigdl_orca*-py3-none-manylinux1_x86_64.whl + #pip install -i https://pypi.org/simple --pre --upgrade bigdl-orca-spark3 - name: Run Test shell: bash From 0c9ddfd820932cfac319a52ef70a4ebcbdf00025 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 1 Sep 2022 15:10:48 +0800 Subject: [PATCH 10/34] update mxnet --- .../orca-python-horovod-tf2-py37-spark3-action/action.yml | 2 +- .../actions/python-requirements/requirements-horovod-tf2.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml index 05d7b227697..f0290837ad7 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -20,7 +20,7 @@ runs: python -m pip install --upgrade pip python -m pip install --upgrade setuptools==58.0.4 pip uninstall -y bigdl-friesian bigdl-friesian-spark3 bigdl-dllib bigdl-dllib-spark3 bigdl-orca pyspark bigdl-orca-spark3 bigdl-chronos bigdl-chronos-spark3 bigdl-friesian bigdl-friesian-spark3 - pip install cmake + pip install cmake mxnet==1.6.0 HOROVOD_WITH_PYTORCH=1; HOROVOD_WITH_GLOO=1; pip install --no-cache-dir horovod==0.19.2 pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r .github/actions/python-requirements/requirements-horovod-tf2.txt diff --git a/.github/actions/python-requirements/requirements-horovod-tf2.txt b/.github/actions/python-requirements/requirements-horovod-tf2.txt index 525396bf499..5160e3bcdc9 100644 --- a/.github/actions/python-requirements/requirements-horovod-tf2.txt +++ b/.github/actions/python-requirements/requirements-horovod-tf2.txt @@ -21,7 +21,6 @@ tensorboard-plugin-wit==1.7.0 tensorboardX==2.1 tensorflow==2.3.0 tensorflow-estimator==2.3.0 -mxnet==1.6.0 xgboost_ray argparse Pillow From 7036e268fecdc9ccfcda2661a59d545cfdb025ec Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 1 Sep 2022 15:41:26 +0800 Subject: [PATCH 11/34] update --- .../orca-python-horovod-tf2-py37-spark3-action/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml index f0290837ad7..d57037afe42 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -35,8 +35,7 @@ runs: # install orca pip install python/orca/src/dist/bigdl_orca*-py3-none-manylinux1_x86_64.whl - #pip install -i https://pypi.org/simple --pre --upgrade bigdl-orca-spark3 - + - name: Run Test shell: bash run: | From dc17aaf49376237119e5a5934a7d665769b18142 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 1 Sep 2022 16:45:36 +0800 Subject: [PATCH 12/34] update numpy --- .../orca-python-horovod-tf2-py37-spark3-action/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml index d57037afe42..042286af174 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -24,7 +24,7 @@ runs: HOROVOD_WITH_PYTORCH=1; HOROVOD_WITH_GLOO=1; pip install --no-cache-dir horovod==0.19.2 pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r .github/actions/python-requirements/requirements-horovod-tf2.txt - pip install pytest + pip install pytest numpy==1.19.5 prophet==1.0.1 pip uninstall -y opencv-python-headless pip install opencv-python-headless sed -i "s/'bigdl-core=='+VERSION/'bigdl-core==2.1.0b20220811'/g" python/dllib/src/setup.py From 4458bba1694eb42fab3e556c335f65c108445c9c Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 1 Sep 2022 17:15:07 +0800 Subject: [PATCH 13/34] update --- .../action.yml | 4 +- .../requirements-horovod-tf2.txt | 176 +++++++++++++++--- 2 files changed, 150 insertions(+), 30 deletions(-) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml index 042286af174..4412d9a080c 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -20,11 +20,11 @@ runs: python -m pip install --upgrade pip python -m pip install --upgrade setuptools==58.0.4 pip uninstall -y bigdl-friesian bigdl-friesian-spark3 bigdl-dllib bigdl-dllib-spark3 bigdl-orca pyspark bigdl-orca-spark3 bigdl-chronos bigdl-chronos-spark3 bigdl-friesian bigdl-friesian-spark3 - pip install cmake mxnet==1.6.0 + pip install cmake mxnet==1.6.0 tensorflow==2.3.0 HOROVOD_WITH_PYTORCH=1; HOROVOD_WITH_GLOO=1; pip install --no-cache-dir horovod==0.19.2 pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r .github/actions/python-requirements/requirements-horovod-tf2.txt - pip install pytest numpy==1.19.5 prophet==1.0.1 + pip install pytest ray[default]==1.9.1 aiohttp==3.8.1 async-timeout==4.0.1 numpy==1.19.5 prophet==1.0.1 pip uninstall -y opencv-python-headless pip install opencv-python-headless sed -i "s/'bigdl-core=='+VERSION/'bigdl-core==2.1.0b20220811'/g" python/dllib/src/setup.py diff --git a/.github/actions/python-requirements/requirements-horovod-tf2.txt b/.github/actions/python-requirements/requirements-horovod-tf2.txt index 5160e3bcdc9..e1b92fe8e40 100644 --- a/.github/actions/python-requirements/requirements-horovod-tf2.txt +++ b/.github/actions/python-requirements/requirements-horovod-tf2.txt @@ -1,33 +1,153 @@ -torch==1.7.1 -torchvision -torchmetrics -albumentations -scikit-learn==0.22.2.post1 -opencv-python -matplotlib -tqdm -protobuf==3.15.3 -pandas -ray[default]==1.9.2 -aiohttp==3.8.1 -async-timeout==4.0.1 -dm_tree -gym[atari]==0.17.1 -atari-py==0.2.5 -tabulate==0.8.7 -tensorboard==2.3.0 +absl-py==0.10.0 +aiohttp-cors==0.7.0 +aioredis==1.3.1 +argon2-cffi==20.1.0 +astor==0.8.1 +astunparse==1.6.3 +async-generator==1.10 +atari-py==0.2.6 +attrs==20.1.0 +backcall==0.2.0 +beautifulsoup4==4.9.1 +bleach==3.3.0 +blessings==1.7 +cachetools==4.1.1 +certifi==2020.6.20 +cffi==1.14.2 +chardet==3.0.4 +click==7.1.2 +cloudpickle==1.6.0 +colorama==0.4.3 +colorful==0.5.4 +conda-pack==0.3.1 +contextvars==2.4 +cycler==0.10.0 +Cython==0.29.24 +decorator==4.4.2 +defusedxml==0.7.1 +dm-tree==0.1.5 +entrypoints==0.3 +filelock==3.0.12 +future==0.18.2 +gast==0.3.3 +google==3.0.0 +google-api-core==1.26.1 +google-auth==1.27.1 +google-auth-oauthlib==0.4.1 +google-pasta==0.2.0 +googleapis-common-protos==1.53.0 +gpustat==0.6.0 +grpcio==1.31.0 +gym==0.18.0 +h5py==2.10.0 +hiredis==1.1.0 +idna==2.10 +immutables==0.15 +importlib-metadata==1.7.0 +iniconfig==1.0.1 +ipykernel==5.5.0 +ipython==7.21.0 +ipython-genutils==0.2.0 +ipywidgets==7.6.3 +jedi==0.18.0 +Jinja2==2.11.3 +joblib==1.0.1 +jsonschema==3.2.0 +jupyter==1.0.0 +jupyter-client==6.1.11 +jupyter-console==6.2.0 +jupyter-core==4.7.1 +jupyterlab-pygments==0.1.2 +jupyterlab-widgets==1.0.0 +Keras-Applications==1.0.8 +Keras-Preprocessing==1.1.2 +kiwisolver==1.3.1 +lz4==3.1.3 +Markdown==3.2.2 +MarkupSafe==1.1.1 +matplotlib==3.3.4 +mistune==0.8.4 +mkllibs-test==0.0.2 +more-itertools==8.5.0 +msgpack==1.0.2 +multidict==4.7.6 +nbclient==0.5.3 +nbconvert==6.0.7 +nbformat==5.1.2 +nest-asyncio==1.5.1 +notebook==6.2.0 +nvidia-ml-py3==7.352.0 +oauthlib==3.1.0 +opencensus==0.7.12 +opencensus-context==0.1.2 +opencv-python==4.5.1.48 +opencv-python-headless==4.3.0.36 +opt-einsum==3.3.0 +packaging==20.4 +pandas==1.2.3 +pandocfilters==1.4.3 +parso==0.8.1 +patsy==0.5.1 +pexpect==4.8.0 +pickleshare==0.7.5 +Pillow==7.2.0 +pluggy==0.13.1 +prometheus-client==0.9.0 +prompt-toolkit==3.0.16 +protobuf==3.13.0 +psutil==5.7.2 +ptyprocess==0.7.0 +py==1.9.0 +py-spy==0.3.3 +py4j==0.10.7 +pyarrow==0.17.0 +pyasn1==0.4.8 +pyasn1-modules==0.2.8 +pycparser==2.20 +pyglet==1.5.0 +Pygments==2.8.1 +pyparsing==2.4.7 +pyrsistent==0.16.0 +pytest==6.0.1 +python-dateutil==2.8.1 +pytz==2021.1 +PyYAML==5.3.1 +pyzmq==22.0.3 +qtconsole==5.0.2 +QtPy==1.9.0 +redis==3.5.3 +requests==2.24.0 +requests-oauthlib==1.3.0 +rsa==4.6 +scikit-learn==0.24.2 +scipy==1.4.1 +Send2Trash==1.5.0 +setproctitle==1.1.10 +six==1.15.0 +soupsieve==2.0.1 +statsmodels==0.12.2 +tabulate==0.8.9 +tensorboard==2.6.0 tensorboard-data-server==0.6.1 tensorboard-plugin-wit==1.7.0 tensorboardX==2.1 tensorflow==2.3.0 tensorflow-estimator==2.3.0 -xgboost_ray -argparse -Pillow -pyarrow==4.0.1 -h5py==2.10.0 -fsspec==2021.9.0 -scikit-optimize==0.8.1 -pandas==1.1.5 -Keras-Applications==1.0.8 -Keras-Preprocessing==1.1.2 +termcolor==1.1.0 +terminado==0.9.2 +testpath==0.4.4 +tflibs-test==0.0.2 +threadpoolctl==2.2.0 +toml==0.10.1 +torch==1.6.0 +tornado==6.1 +traitlets==5.0.5 +typing-extensions==3.7.4.3 +urllib3==1.25.10 +wcwidth==0.2.5 +webencodings==0.5.1 +Werkzeug==1.0.1 +widgetsnbextension==3.5.1 +wrapt==1.12.1 +yarl==1.5.1 +zipp==3.1.0 \ No newline at end of file From 0aa21a20ee162bb472062ad2eb67c4e4b962821e Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Fri, 2 Sep 2022 13:29:45 +0800 Subject: [PATCH 14/34] update ray version --- .../orca-python-horovod-tf2-py37-spark3-action/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml index 4412d9a080c..2c295877dbb 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -24,7 +24,7 @@ runs: HOROVOD_WITH_PYTORCH=1; HOROVOD_WITH_GLOO=1; pip install --no-cache-dir horovod==0.19.2 pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r .github/actions/python-requirements/requirements-horovod-tf2.txt - pip install pytest ray[default]==1.9.1 aiohttp==3.8.1 async-timeout==4.0.1 numpy==1.19.5 prophet==1.0.1 + pip install pytest ray[default]==0.8.4 aiohttp==3.6.2 async-timeout==3.0.1 numpy==1.19.5 prophet==1.0.1 pip uninstall -y opencv-python-headless pip install opencv-python-headless sed -i "s/'bigdl-core=='+VERSION/'bigdl-core==2.1.0b20220811'/g" python/dllib/src/setup.py From 3ebd4d67c8a36a5df8a145550a6644302eb7f65d Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Fri, 2 Sep 2022 14:11:09 +0800 Subject: [PATCH 15/34] unintsall intel-tensorflow --- .../orca-python-horovod-tf2-py37-spark3-action/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml index 2c295877dbb..1eeb42d5276 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -20,6 +20,7 @@ runs: python -m pip install --upgrade pip python -m pip install --upgrade setuptools==58.0.4 pip uninstall -y bigdl-friesian bigdl-friesian-spark3 bigdl-dllib bigdl-dllib-spark3 bigdl-orca pyspark bigdl-orca-spark3 bigdl-chronos bigdl-chronos-spark3 bigdl-friesian bigdl-friesian-spark3 + pip uninstall -y intel-tensorflow pip install cmake mxnet==1.6.0 tensorflow==2.3.0 HOROVOD_WITH_PYTORCH=1; HOROVOD_WITH_GLOO=1; pip install --no-cache-dir horovod==0.19.2 pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y From 21d09b375ba5ed5e3b56809a52a08ad6891ec00c Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Fri, 2 Sep 2022 17:25:57 +0800 Subject: [PATCH 16/34] add conda env --- .../action.yml | 22 ++- .../requirements-horovod-tf2.txt | 176 +++--------------- .github/workflows/nightly_test.yml | 2 +- 3 files changed, 43 insertions(+), 157 deletions(-) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml index 1eeb42d5276..def092533ae 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -12,22 +12,30 @@ runs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.7.6' + python-version: '3.7.10' - name: Install dependencies shell: bash run: | python -m pip install --upgrade pip python -m pip install --upgrade setuptools==58.0.4 + + - name: Run Test + shell: bash + run: | + conda create -n orca-python-horovod-tf2-py37 -y python==3.7.10 setuptools==58.0.4 + conda info -e + source activate orca-python-horovod-tf2-py37 pip uninstall -y bigdl-friesian bigdl-friesian-spark3 bigdl-dllib bigdl-dllib-spark3 bigdl-orca pyspark bigdl-orca-spark3 bigdl-chronos bigdl-chronos-spark3 bigdl-friesian bigdl-friesian-spark3 pip uninstall -y intel-tensorflow - pip install cmake mxnet==1.6.0 tensorflow==2.3.0 + pip install cmake mxnet==1.6.0 HOROVOD_WITH_PYTORCH=1; HOROVOD_WITH_GLOO=1; pip install --no-cache-dir horovod==0.19.2 pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r .github/actions/python-requirements/requirements-horovod-tf2.txt - pip install pytest ray[default]==0.8.4 aiohttp==3.6.2 async-timeout==3.0.1 numpy==1.19.5 prophet==1.0.1 + pip install pytest pip uninstall -y opencv-python-headless pip install opencv-python-headless + sed -i "s/'bigdl-core=='+VERSION/'bigdl-core==2.1.0b20220811'/g" python/dllib/src/setup.py bash python/dev/release_default_linux_spark312.sh default false false @@ -36,15 +44,13 @@ runs: # install orca pip install python/orca/src/dist/bigdl_orca*-py3-none-manylinux1_x86_64.whl - - - name: Run Test - shell: bash - run: | + export SPARK_LOCAL_HOSTNAME=localhost - chmod a+x python/orca/dev/test/run-pytests-horovod-tf.sh python/orca/dev/test/run-pytests-horovod-tf.sh ray stop + + conda remove -n bigdl-init --all env: BIGDL_ROOT: ${{ github.workspace }} ANALYTICS_ZOO_ROOT: ${{ github.workspace }} diff --git a/.github/actions/python-requirements/requirements-horovod-tf2.txt b/.github/actions/python-requirements/requirements-horovod-tf2.txt index e1b92fe8e40..7fcc550bdb9 100644 --- a/.github/actions/python-requirements/requirements-horovod-tf2.txt +++ b/.github/actions/python-requirements/requirements-horovod-tf2.txt @@ -1,153 +1,33 @@ -absl-py==0.10.0 -aiohttp-cors==0.7.0 -aioredis==1.3.1 -argon2-cffi==20.1.0 -astor==0.8.1 -astunparse==1.6.3 -async-generator==1.10 -atari-py==0.2.6 -attrs==20.1.0 -backcall==0.2.0 -beautifulsoup4==4.9.1 -bleach==3.3.0 -blessings==1.7 -cachetools==4.1.1 -certifi==2020.6.20 -cffi==1.14.2 -chardet==3.0.4 -click==7.1.2 -cloudpickle==1.6.0 -colorama==0.4.3 -colorful==0.5.4 -conda-pack==0.3.1 -contextvars==2.4 -cycler==0.10.0 -Cython==0.29.24 -decorator==4.4.2 -defusedxml==0.7.1 -dm-tree==0.1.5 -entrypoints==0.3 -filelock==3.0.12 -future==0.18.2 -gast==0.3.3 -google==3.0.0 -google-api-core==1.26.1 -google-auth==1.27.1 -google-auth-oauthlib==0.4.1 -google-pasta==0.2.0 -googleapis-common-protos==1.53.0 -gpustat==0.6.0 -grpcio==1.31.0 -gym==0.18.0 -h5py==2.10.0 -hiredis==1.1.0 -idna==2.10 -immutables==0.15 -importlib-metadata==1.7.0 -iniconfig==1.0.1 -ipykernel==5.5.0 -ipython==7.21.0 -ipython-genutils==0.2.0 -ipywidgets==7.6.3 -jedi==0.18.0 -Jinja2==2.11.3 -joblib==1.0.1 -jsonschema==3.2.0 -jupyter==1.0.0 -jupyter-client==6.1.11 -jupyter-console==6.2.0 -jupyter-core==4.7.1 -jupyterlab-pygments==0.1.2 -jupyterlab-widgets==1.0.0 -Keras-Applications==1.0.8 -Keras-Preprocessing==1.1.2 -kiwisolver==1.3.1 -lz4==3.1.3 -Markdown==3.2.2 -MarkupSafe==1.1.1 -matplotlib==3.3.4 -mistune==0.8.4 -mkllibs-test==0.0.2 -more-itertools==8.5.0 -msgpack==1.0.2 -multidict==4.7.6 -nbclient==0.5.3 -nbconvert==6.0.7 -nbformat==5.1.2 -nest-asyncio==1.5.1 -notebook==6.2.0 -nvidia-ml-py3==7.352.0 -oauthlib==3.1.0 -opencensus==0.7.12 -opencensus-context==0.1.2 -opencv-python==4.5.1.48 -opencv-python-headless==4.3.0.36 -opt-einsum==3.3.0 -packaging==20.4 -pandas==1.2.3 -pandocfilters==1.4.3 -parso==0.8.1 -patsy==0.5.1 -pexpect==4.8.0 -pickleshare==0.7.5 -Pillow==7.2.0 -pluggy==0.13.1 -prometheus-client==0.9.0 -prompt-toolkit==3.0.16 -protobuf==3.13.0 -psutil==5.7.2 -ptyprocess==0.7.0 -py==1.9.0 -py-spy==0.3.3 -py4j==0.10.7 -pyarrow==0.17.0 -pyasn1==0.4.8 -pyasn1-modules==0.2.8 -pycparser==2.20 -pyglet==1.5.0 -Pygments==2.8.1 -pyparsing==2.4.7 -pyrsistent==0.16.0 -pytest==6.0.1 -python-dateutil==2.8.1 -pytz==2021.1 -PyYAML==5.3.1 -pyzmq==22.0.3 -qtconsole==5.0.2 -QtPy==1.9.0 -redis==3.5.3 -requests==2.24.0 -requests-oauthlib==1.3.0 -rsa==4.6 -scikit-learn==0.24.2 -scipy==1.4.1 -Send2Trash==1.5.0 -setproctitle==1.1.10 -six==1.15.0 -soupsieve==2.0.1 -statsmodels==0.12.2 -tabulate==0.8.9 -tensorboard==2.6.0 +torch==1.7.1 +torchvision +torchmetrics +albumentations +scikit-learn==0.22.2.post1 +opencv-python +matplotlib +tqdm +protobuf==3.15.3 +pandas +ray[default]==1.9.2 +aiohttp==3.8.1 +async-timeout==4.0.1 +dm_tree +gym[atari]==0.17.1 +atari-py==0.2.5 +tabulate==0.8.7 +tensorboard==2.3.0 tensorboard-data-server==0.6.1 tensorboard-plugin-wit==1.7.0 tensorboardX==2.1 tensorflow==2.3.0 tensorflow-estimator==2.3.0 -termcolor==1.1.0 -terminado==0.9.2 -testpath==0.4.4 -tflibs-test==0.0.2 -threadpoolctl==2.2.0 -toml==0.10.1 -torch==1.6.0 -tornado==6.1 -traitlets==5.0.5 -typing-extensions==3.7.4.3 -urllib3==1.25.10 -wcwidth==0.2.5 -webencodings==0.5.1 -Werkzeug==1.0.1 -widgetsnbextension==3.5.1 -wrapt==1.12.1 -yarl==1.5.1 -zipp==3.1.0 \ No newline at end of file +xgboost_ray +argparse +Pillow +pyarrow==4.0.1 +h5py==2.10.0 +fsspec==2021.9.0 +scikit-optimize==0.8.1 +pandas==1.1.5 +Keras-Applications==1.0.8 +Keras-Preprocessing==1.1.2 \ No newline at end of file diff --git a/.github/workflows/nightly_test.yml b/.github/workflows/nightly_test.yml index 8849606a283..2dc5dd48432 100644 --- a/.github/workflows/nightly_test.yml +++ b/.github/workflows/nightly_test.yml @@ -98,7 +98,7 @@ jobs: Orca-Python-Horovod-Tf2-Py37-Spark3: #if: ${{ github.event.schedule || github.event.inputs.artifact == 'Orca-Python-Horovod-Tf2-Py37-Spark3' || github.event.inputs.artifact == 'all' }} - runs-on: [self-hosted, Gondolin, ubuntu-20.04-lts] + runs-on: [self-hosted, Gondolin-test, ubuntu-20.04-lts] steps: - uses: actions/checkout@v3 From fa0245c8d538223bd2d48749cb3d1989686b8cc0 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Mon, 5 Sep 2022 09:17:48 +0800 Subject: [PATCH 17/34] install horovod --- .../orca-python-horovod-tf2-py37-spark3-action/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml index def092533ae..9e41793f8ca 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -29,10 +29,10 @@ runs: pip uninstall -y bigdl-friesian bigdl-friesian-spark3 bigdl-dllib bigdl-dllib-spark3 bigdl-orca pyspark bigdl-orca-spark3 bigdl-chronos bigdl-chronos-spark3 bigdl-friesian bigdl-friesian-spark3 pip uninstall -y intel-tensorflow pip install cmake mxnet==1.6.0 - HOROVOD_WITH_PYTORCH=1; HOROVOD_WITH_GLOO=1; pip install --no-cache-dir horovod==0.19.2 pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r .github/actions/python-requirements/requirements-horovod-tf2.txt pip install pytest + HOROVOD_WITH_PYTORCH=1; HOROVOD_WITH_GLOO=1; pip install --no-cache-dir horovod==0.19.2 pip uninstall -y opencv-python-headless pip install opencv-python-headless From 11b561476875051934c0f0f4fbe68f6cac26c588 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Mon, 5 Sep 2022 09:48:47 +0800 Subject: [PATCH 18/34] remove conda env --- .../orca-python-horovod-tf2-py37-spark3-action/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml index 9e41793f8ca..2c448aa6580 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -23,6 +23,7 @@ runs: - name: Run Test shell: bash run: | + conda remove -n orca-python-horovod-tf2-py37 -y --all conda create -n orca-python-horovod-tf2-py37 -y python==3.7.10 setuptools==58.0.4 conda info -e source activate orca-python-horovod-tf2-py37 From eaeac8ec5e5f1a09e37a8acf8b1f5b3f1f77af5f Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Mon, 5 Sep 2022 13:13:33 +0800 Subject: [PATCH 19/34] install bigdl-orca-spark3 --- .../action.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml index 2c448aa6580..abac85124c2 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml @@ -37,15 +37,15 @@ runs: pip uninstall -y opencv-python-headless pip install opencv-python-headless - sed -i "s/'bigdl-core=='+VERSION/'bigdl-core==2.1.0b20220811'/g" python/dllib/src/setup.py - bash python/dev/release_default_linux_spark312.sh default false false + #sed -i "s/'bigdl-core=='+VERSION/'bigdl-core==2.1.0b20220811'/g" python/dllib/src/setup.py + #bash python/dev/release_default_linux_spark312.sh default false false # install dllib - pip install python/dllib/src/dist/bigdl_dllib*-py3-none-manylinux1_x86_64.whl + #pip install python/dllib/src/dist/bigdl_dllib*-py3-none-manylinux1_x86_64.whl # install orca - pip install python/orca/src/dist/bigdl_orca*-py3-none-manylinux1_x86_64.whl - + #pip install python/orca/src/dist/bigdl_orca*-py3-none-manylinux1_x86_64.whl + pip install --pre --upgrade bigdl-orca-spark3 export SPARK_LOCAL_HOSTNAME=localhost chmod a+x python/orca/dev/test/run-pytests-horovod-tf.sh python/orca/dev/test/run-pytests-horovod-tf.sh From ff694787512095feac965684b1afd68d8ab00d3f Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Wed, 7 Sep 2022 10:11:43 +0800 Subject: [PATCH 20/34] split conda env --- .../nightly-test/action.yml | 15 +++++++ .../remove-env/action.yml | 14 +++++++ .../setup-env/action.yml | 42 +++++++++++++++++++ .github/workflows/nightly_test.yml | 12 ++++-- 4 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 .github/actions/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml create mode 100644 .github/actions/orca-python-horovod-tf2-py37-spark3-action/remove-env/action.yml create mode 100644 .github/actions/orca-python-horovod-tf2-py37-spark3-action/setup-env/action.yml diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml new file mode 100644 index 00000000000..cbfc0f0276a --- /dev/null +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml @@ -0,0 +1,15 @@ +name: 'Run Orca Python Horovod Tf2 Py37 Spark3' +description: 'Run Orca Python Horovod Tf2 Py37 Spark3' +runs: + using: "composite" + steps: + - name: Run Test + shell: bash + run: | + export SPARK_LOCAL_HOSTNAME=localhost + chmod a+x python/orca/dev/test/run-pytests-horovod-tf.sh + python/orca/dev/test/run-pytests-horovod-tf.sh + ray stop + env: + BIGDL_ROOT: ${{ github.workspace }} + ANALYTICS_ZOO_ROOT: ${{ github.workspace }} diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/remove-env/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/remove-env/action.yml new file mode 100644 index 00000000000..aee3af7158f --- /dev/null +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/remove-env/action.yml @@ -0,0 +1,14 @@ +name: 'Run Orca Python Horovod Tf2 Py37 Spark3' +description: 'Run Orca Python Horovod Tf2 Py37 Spark3' +runs: + using: "composite" + steps: + - name: Remove env + shell: bash + run: | + conda remove -n orca-python-horovod-tf2-py37 -y --all + pip uninstall -y bigdl-friesian bigdl-friesian-spark3 bigdl-dllib bigdl-dllib-spark3 bigdl-orca pyspark bigdl-orca-spark3 bigdl-chronos bigdl-chronos-spark3 bigdl-friesian bigdl-friesian-spark3 + + env: + BIGDL_ROOT: ${{ github.workspace }} + ANALYTICS_ZOO_ROOT: ${{ github.workspace }} diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/setup-env/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/setup-env/action.yml new file mode 100644 index 00000000000..d62a21c6d3d --- /dev/null +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/setup-env/action.yml @@ -0,0 +1,42 @@ +name: 'Run Orca Python Horovod Tf2 Py37 Spark3' +description: 'Run Orca Python Horovod Tf2 Py37 Spark3' +runs: + using: "composite" + steps: + - name: Setup Env + shell: bash + run: | + apt-get update + apt-get install wget + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.7.10' + + - name: Install dependencies + shell: bash + run: | + python -m pip install --upgrade pip + python -m pip install --upgrade setuptools==58.0.4 + + - name: Run Test + shell: bash + run: | + conda remove -n orca-python-horovod-tf2-py37 -y --all + conda create -n orca-python-horovod-tf2-py37 -y python==3.7.10 setuptools==58.0.4 + conda info -e + source activate orca-python-horovod-tf2-py37 + pip uninstall -y intel-tensorflow + pip install cmake mxnet==1.6.0 + pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y + pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r .github/actions/python-requirements/requirements-horovod-tf2.txt + pip install pytest + HOROVOD_WITH_PYTORCH=1; HOROVOD_WITH_GLOO=1; pip install --no-cache-dir horovod==0.19.2 + pip uninstall -y opencv-python-headless + pip install opencv-python-headless + pip install --pre --upgrade bigdl-orca-spark3 + + env: + BIGDL_ROOT: ${{ github.workspace }} + ANALYTICS_ZOO_ROOT: ${{ github.workspace }} diff --git a/.github/workflows/nightly_test.yml b/.github/workflows/nightly_test.yml index 2dc5dd48432..d26cb80b688 100644 --- a/.github/workflows/nightly_test.yml +++ b/.github/workflows/nightly_test.yml @@ -98,7 +98,7 @@ jobs: Orca-Python-Horovod-Tf2-Py37-Spark3: #if: ${{ github.event.schedule || github.event.inputs.artifact == 'Orca-Python-Horovod-Tf2-Py37-Spark3' || github.event.inputs.artifact == 'all' }} - runs-on: [self-hosted, Gondolin-test, ubuntu-20.04-lts] + runs-on: [self-hosted, Gondolin, ubuntu-20.04-lts] steps: - uses: actions/checkout@v3 @@ -106,8 +106,14 @@ jobs: uses: ./.github/actions/jdk-setup-action - name: Set up maven uses: ./.github/actions/maven-setup-action - - name: Run test - uses: ./.github/actions/orca-python-horovod-tf2-py37-spark3-action + - name: Remove env + uses: ./.github/actions/orca-python-horovod-tf2-py37-spark3-action/remove-env + - name: Setup env + uses: ./.github/actions/orca-python-horovod-tf2-py37-spark3-action/setup-env + - name: Run Test + uses: ./.github/actions/orca-python-horovod-tf2-py37-spark3-action/nightly-test + - name: Remove env + uses: ./.github/actions/orca-python-horovod-tf2-py37-spark3-action/remove-env Dllib-Scala-UT: if: ${{ github.event.schedule || github.event.inputs.artifact == 'Dllib-Scala-UT' || github.event.inputs.artifact == 'all' }} From d46f18278b23b4193891cc52b075313a607271c7 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Wed, 7 Sep 2022 10:51:34 +0800 Subject: [PATCH 21/34] source conda --- .../nightly-test/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml index cbfc0f0276a..a45fe083e33 100644 --- a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml +++ b/.github/actions/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml @@ -6,10 +6,12 @@ runs: - name: Run Test shell: bash run: | + source activate orca-python-horovod-tf2-py37 export SPARK_LOCAL_HOSTNAME=localhost chmod a+x python/orca/dev/test/run-pytests-horovod-tf.sh python/orca/dev/test/run-pytests-horovod-tf.sh ray stop + source deactivate env: BIGDL_ROOT: ${{ github.workspace }} ANALYTICS_ZOO_ROOT: ${{ github.workspace }} From 417690067772b06e3cdca946ae5c5e0a9697ab80 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Wed, 7 Sep 2022 15:31:51 +0800 Subject: [PATCH 22/34] split conda env --- .../orca-python-horovod-tf2-py37-spark3-action/action.yml | 0 .../nightly-test/action.yml | 0 .../setup-env/setup-horovod-tf2-py37}/action.yml | 0 .../remove-env/action.yml | 0 .github/workflows/nightly_test.yml | 6 +++--- 5 files changed, 3 insertions(+), 3 deletions(-) rename .github/actions/{ => orca}/orca-python-horovod-tf2-py37-spark3-action/action.yml (100%) rename .github/actions/{ => orca}/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml (100%) rename .github/actions/{orca-python-horovod-tf2-py37-spark3-action/setup-env => orca/setup-env/setup-horovod-tf2-py37}/action.yml (100%) rename .github/actions/{orca-python-horovod-tf2-py37-spark3-action => }/remove-env/action.yml (100%) diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/action.yml similarity index 100% rename from .github/actions/orca-python-horovod-tf2-py37-spark3-action/action.yml rename to .github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/action.yml diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml b/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml similarity index 100% rename from .github/actions/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml rename to .github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/setup-env/action.yml b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml similarity index 100% rename from .github/actions/orca-python-horovod-tf2-py37-spark3-action/setup-env/action.yml rename to .github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml diff --git a/.github/actions/orca-python-horovod-tf2-py37-spark3-action/remove-env/action.yml b/.github/actions/remove-env/action.yml similarity index 100% rename from .github/actions/orca-python-horovod-tf2-py37-spark3-action/remove-env/action.yml rename to .github/actions/remove-env/action.yml diff --git a/.github/workflows/nightly_test.yml b/.github/workflows/nightly_test.yml index d26cb80b688..80769cc6fb6 100644 --- a/.github/workflows/nightly_test.yml +++ b/.github/workflows/nightly_test.yml @@ -109,11 +109,11 @@ jobs: - name: Remove env uses: ./.github/actions/orca-python-horovod-tf2-py37-spark3-action/remove-env - name: Setup env - uses: ./.github/actions/orca-python-horovod-tf2-py37-spark3-action/setup-env + uses: ./.github/actions/orca/setup-env/setup-horovod-tf2-py37 - name: Run Test - uses: ./.github/actions/orca-python-horovod-tf2-py37-spark3-action/nightly-test + uses: ./.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test - name: Remove env - uses: ./.github/actions/orca-python-horovod-tf2-py37-spark3-action/remove-env + uses: ./.github/actions/remove-env Dllib-Scala-UT: if: ${{ github.event.schedule || github.event.inputs.artifact == 'Dllib-Scala-UT' || github.event.inputs.artifact == 'all' }} From e26de8f1adc53a021564d5ef83c3a1ad5fbbdd1b Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Wed, 7 Sep 2022 15:35:38 +0800 Subject: [PATCH 23/34] update --- .github/workflows/nightly_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly_test.yml b/.github/workflows/nightly_test.yml index 80769cc6fb6..8ec9cc17109 100644 --- a/.github/workflows/nightly_test.yml +++ b/.github/workflows/nightly_test.yml @@ -107,7 +107,7 @@ jobs: - name: Set up maven uses: ./.github/actions/maven-setup-action - name: Remove env - uses: ./.github/actions/orca-python-horovod-tf2-py37-spark3-action/remove-env + uses: ./.github/actions/remove-env - name: Setup env uses: ./.github/actions/orca/setup-env/setup-horovod-tf2-py37 - name: Run Test From 27b0ec57b6f5fea8bb21b07839bb66fd8e6945cc Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 8 Sep 2022 13:43:34 +0800 Subject: [PATCH 24/34] update env --- .../nightly-test/action.yml | 2 +- .../setup-env/setup-horovod-tf2-py37/action.yml | 6 +++--- .github/actions/remove-env/action.yml | 2 +- .github/workflows/nightly_test.yml | 16 +++++++++++++--- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml b/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml index a45fe083e33..6e937a73290 100644 --- a/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml +++ b/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml @@ -6,7 +6,7 @@ runs: - name: Run Test shell: bash run: | - source activate orca-python-horovod-tf2-py37 + source activate ${{ conda-env }} export SPARK_LOCAL_HOSTNAME=localhost chmod a+x python/orca/dev/test/run-pytests-horovod-tf.sh python/orca/dev/test/run-pytests-horovod-tf.sh diff --git a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml index d62a21c6d3d..9642b6fcc09 100644 --- a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml +++ b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml @@ -23,10 +23,10 @@ runs: - name: Run Test shell: bash run: | - conda remove -n orca-python-horovod-tf2-py37 -y --all - conda create -n orca-python-horovod-tf2-py37 -y python==3.7.10 setuptools==58.0.4 + conda remove -n ${{ conda-env }} -y --all + conda create -n ${{ conda-env }} -y python==3.7.10 setuptools==58.0.4 conda info -e - source activate orca-python-horovod-tf2-py37 + source activate ${{ conda-env }} pip uninstall -y intel-tensorflow pip install cmake mxnet==1.6.0 pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y diff --git a/.github/actions/remove-env/action.yml b/.github/actions/remove-env/action.yml index aee3af7158f..730a5ae45c7 100644 --- a/.github/actions/remove-env/action.yml +++ b/.github/actions/remove-env/action.yml @@ -6,7 +6,7 @@ runs: - name: Remove env shell: bash run: | - conda remove -n orca-python-horovod-tf2-py37 -y --all + conda remove -n ${{ conda-env }} -y --all pip uninstall -y bigdl-friesian bigdl-friesian-spark3 bigdl-dllib bigdl-dllib-spark3 bigdl-orca pyspark bigdl-orca-spark3 bigdl-chronos bigdl-chronos-spark3 bigdl-friesian bigdl-friesian-spark3 env: diff --git a/.github/workflows/nightly_test.yml b/.github/workflows/nightly_test.yml index 8ec9cc17109..adb45aad38a 100644 --- a/.github/workflows/nightly_test.yml +++ b/.github/workflows/nightly_test.yml @@ -30,6 +30,11 @@ permissions: packages: write jobs: + #env: + #name: conda env + #outputs: + #Orca-Python-Horovod-Tf2-Py37-Spark3: Orca-Python-Horovod-Tf2-Py37-Spark3 + Orca-Python-ExampleTest-Py37-Spark3: if: ${{ github.event.schedule || github.event.inputs.artifact == 'Orca-Python-ExampleTest-Py37-Spark3' || github.event.inputs.artifact == 'all' }} runs-on: [self-hosted, Gondolin, ubuntu-20.04-lts] @@ -105,15 +110,20 @@ jobs: - name: Set up JDK8 uses: ./.github/actions/jdk-setup-action - name: Set up maven - uses: ./.github/actions/maven-setup-action - - name: Remove env - uses: ./.github/actions/remove-env + uses: ./.github/actions/maven-setup-action - name: Setup env uses: ./.github/actions/orca/setup-env/setup-horovod-tf2-py37 + with: + conda-env: Orca-Python-Horovod-Tf2-Py37-Spark3 - name: Run Test uses: ./.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test + with: + conda-env: Orca-Python-Horovod-Tf2-Py37-Spark3 - name: Remove env + if: ${{ always() }} uses: ./.github/actions/remove-env + with: + conda-env: Orca-Python-Horovod-Tf2-Py37-Spark3 Dllib-Scala-UT: if: ${{ github.event.schedule || github.event.inputs.artifact == 'Dllib-Scala-UT' || github.event.inputs.artifact == 'all' }} From 30cb3b4100c76b40d6ed556fa08622e771b9068d Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 8 Sep 2022 14:07:21 +0800 Subject: [PATCH 25/34] remove env --- .../nightly-test/action.yml | 2 +- .../orca/setup-env/setup-horovod-tf2-py37/action.yml | 6 +++--- .github/workflows/nightly_test.yml | 9 --------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml b/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml index 6e937a73290..09ab0b4cf1d 100644 --- a/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml +++ b/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml @@ -6,7 +6,7 @@ runs: - name: Run Test shell: bash run: | - source activate ${{ conda-env }} + source activate orca-oython-horovod-tf2-py37-spark3 export SPARK_LOCAL_HOSTNAME=localhost chmod a+x python/orca/dev/test/run-pytests-horovod-tf.sh python/orca/dev/test/run-pytests-horovod-tf.sh diff --git a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml index 9642b6fcc09..cc2b4d5200f 100644 --- a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml +++ b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml @@ -23,10 +23,10 @@ runs: - name: Run Test shell: bash run: | - conda remove -n ${{ conda-env }} -y --all - conda create -n ${{ conda-env }} -y python==3.7.10 setuptools==58.0.4 + conda remove -n orca-oython-horovod-tf2-py37-spark3 -y --all + conda create -n orca-oython-horovod-tf2-py37-spark3 -y python==3.7.10 setuptools==58.0.4 conda info -e - source activate ${{ conda-env }} + source activate orca-oython-horovod-tf2-py37-spark3 pip uninstall -y intel-tensorflow pip install cmake mxnet==1.6.0 pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y diff --git a/.github/workflows/nightly_test.yml b/.github/workflows/nightly_test.yml index adb45aad38a..230a859f4eb 100644 --- a/.github/workflows/nightly_test.yml +++ b/.github/workflows/nightly_test.yml @@ -113,17 +113,8 @@ jobs: uses: ./.github/actions/maven-setup-action - name: Setup env uses: ./.github/actions/orca/setup-env/setup-horovod-tf2-py37 - with: - conda-env: Orca-Python-Horovod-Tf2-Py37-Spark3 - name: Run Test uses: ./.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test - with: - conda-env: Orca-Python-Horovod-Tf2-Py37-Spark3 - - name: Remove env - if: ${{ always() }} - uses: ./.github/actions/remove-env - with: - conda-env: Orca-Python-Horovod-Tf2-Py37-Spark3 Dllib-Scala-UT: if: ${{ github.event.schedule || github.event.inputs.artifact == 'Dllib-Scala-UT' || github.event.inputs.artifact == 'all' }} From 09a66e42614241e9f9907c1bbd9ac83f7a681ed9 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 8 Sep 2022 14:34:20 +0800 Subject: [PATCH 26/34] update --- .../setup-horovod-tf2-py37/action.yml | 27 +++++++------------ .github/actions/remove-env/action.yml | 14 ---------- 2 files changed, 9 insertions(+), 32 deletions(-) delete mode 100644 .github/actions/remove-env/action.yml diff --git a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml index cc2b4d5200f..d367691f2da 100644 --- a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml +++ b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml @@ -3,30 +3,21 @@ description: 'Run Orca Python Horovod Tf2 Py37 Spark3' runs: using: "composite" steps: - - name: Setup Env + - name: Setup env shell: bash run: | apt-get update apt-get install wget - - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.7.10' - - - name: Install dependencies - shell: bash - run: | python -m pip install --upgrade pip python -m pip install --upgrade setuptools==58.0.4 - - - name: Run Test - shell: bash - run: | - conda remove -n orca-oython-horovod-tf2-py37-spark3 -y --all - conda create -n orca-oython-horovod-tf2-py37-spark3 -y python==3.7.10 setuptools==58.0.4 - conda info -e - source activate orca-oython-horovod-tf2-py37-spark3 + + if conda info --env | grep "orca-oython-horovod-tf2-py37-spark3"; then + source activate orca-oython-horovod-tf2-py37-spark3 + else + conda create -n orca-oython-horovod-tf2-py37-spark3 -y python==3.7.10 setuptools==58.0.4 + conda info --env + source activate orca-oython-horovod-tf2-py37-spark3 + fi pip uninstall -y intel-tensorflow pip install cmake mxnet==1.6.0 pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y diff --git a/.github/actions/remove-env/action.yml b/.github/actions/remove-env/action.yml deleted file mode 100644 index 730a5ae45c7..00000000000 --- a/.github/actions/remove-env/action.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: 'Run Orca Python Horovod Tf2 Py37 Spark3' -description: 'Run Orca Python Horovod Tf2 Py37 Spark3' -runs: - using: "composite" - steps: - - name: Remove env - shell: bash - run: | - conda remove -n ${{ conda-env }} -y --all - pip uninstall -y bigdl-friesian bigdl-friesian-spark3 bigdl-dllib bigdl-dllib-spark3 bigdl-orca pyspark bigdl-orca-spark3 bigdl-chronos bigdl-chronos-spark3 bigdl-friesian bigdl-friesian-spark3 - - env: - BIGDL_ROOT: ${{ github.workspace }} - ANALYTICS_ZOO_ROOT: ${{ github.workspace }} From 63aee4d7f73ca3ddf038a96dafa1cee6b87e77db Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 8 Sep 2022 14:37:56 +0800 Subject: [PATCH 27/34] update --- .../orca/setup-env/setup-horovod-tf2-py37/action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml index d367691f2da..d3f9defdfa2 100644 --- a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml +++ b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml @@ -10,11 +10,11 @@ runs: apt-get install wget python -m pip install --upgrade pip python -m pip install --upgrade setuptools==58.0.4 - + if conda info --env | grep "orca-oython-horovod-tf2-py37-spark3"; then - source activate orca-oython-horovod-tf2-py37-spark3 + source activate orca-oython-horovod-tf2-py37-spark3 else - conda create -n orca-oython-horovod-tf2-py37-spark3 -y python==3.7.10 setuptools==58.0.4 + conda create -n orca-oython-horovod-tf2-py37-spark3 -y python==3.7.10 setuptools==58.0.4 conda info --env source activate orca-oython-horovod-tf2-py37-spark3 fi From 73d8241b615be2d1d6ae129e07175f976a0dd80d Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 8 Sep 2022 15:11:58 +0800 Subject: [PATCH 28/34] uninstall requirements --- .../setup-env/setup-horovod-tf2-py37/action.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml index d3f9defdfa2..8379d4173f7 100644 --- a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml +++ b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml @@ -3,14 +3,22 @@ description: 'Run Orca Python Horovod Tf2 Py37 Spark3' runs: using: "composite" steps: - - name: Setup env + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.7.10' + + - name: Install dependencies shell: bash run: | - apt-get update + apt-get update apt-get install wget python -m pip install --upgrade pip python -m pip install --upgrade setuptools==58.0.4 + - name: Setup env + shell: bash + run: | if conda info --env | grep "orca-oython-horovod-tf2-py37-spark3"; then source activate orca-oython-horovod-tf2-py37-spark3 else @@ -18,6 +26,7 @@ runs: conda info --env source activate orca-oython-horovod-tf2-py37-spark3 fi + pip uninstall -y bigdl-friesian bigdl-friesian-spark3 bigdl-dllib bigdl-dllib-spark3 bigdl-orca pyspark bigdl-orca-spark3 bigdl-chronos bigdl-chronos-spark3 bigdl-friesian bigdl-friesian-spark3 pip uninstall -y intel-tensorflow pip install cmake mxnet==1.6.0 pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y From 8ec9a2ebdda2fee867751d35eac2828da0208594 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 8 Sep 2022 15:16:00 +0800 Subject: [PATCH 29/34] update --- .../actions/orca/setup-env/setup-horovod-tf2-py37/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml index 8379d4173f7..262400a3f95 100644 --- a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml +++ b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml @@ -11,7 +11,7 @@ runs: - name: Install dependencies shell: bash run: | - apt-get update + apt-get update apt-get install wget python -m pip install --upgrade pip python -m pip install --upgrade setuptools==58.0.4 From 42a35602009b52c9aec56e90df77e005e5706566 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Thu, 8 Sep 2022 16:08:16 +0800 Subject: [PATCH 30/34] update install whl --- .../orca/setup-env/setup-horovod-tf2-py37/action.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml index 262400a3f95..4d420f60336 100644 --- a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml +++ b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml @@ -35,7 +35,15 @@ runs: HOROVOD_WITH_PYTORCH=1; HOROVOD_WITH_GLOO=1; pip install --no-cache-dir horovod==0.19.2 pip uninstall -y opencv-python-headless pip install opencv-python-headless - pip install --pre --upgrade bigdl-orca-spark3 + #pip install --pre --upgrade bigdl-orca-spark3 + sed -i "s/'bigdl-core=='+VERSION/'bigdl-core==2.1.0b20220811'/g" python/dllib/src/setup.py + bash python/dev/release_default_linux_spark312.sh default false false + + # install dllib + pip install python/dllib/src/dist/bigdl_dllib*-py3-none-manylinux1_x86_64.whl + + # install orca + pip install python/orca/src/dist/bigdl_orca*-py3-none-manylinux1_x86_64.whl env: BIGDL_ROOT: ${{ github.workspace }} From 6d00823887fb1719bd19bc47e378545f5258d4d0 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Fri, 9 Sep 2022 14:27:24 +0800 Subject: [PATCH 31/34] update --- .../action.yml | 57 ------------------- 1 file changed, 57 deletions(-) delete mode 100644 .github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/action.yml diff --git a/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/action.yml b/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/action.yml deleted file mode 100644 index abac85124c2..00000000000 --- a/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/action.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: 'Run Orca Python Horovod Tf2 Py37 Spark3' -description: 'Run Orca Python Horovod Tf2 Py37 Spark3' -runs: - using: "composite" - steps: - - name: Setup Env - shell: bash - run: | - apt-get update - apt-get install wget - - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.7.10' - - - name: Install dependencies - shell: bash - run: | - python -m pip install --upgrade pip - python -m pip install --upgrade setuptools==58.0.4 - - - name: Run Test - shell: bash - run: | - conda remove -n orca-python-horovod-tf2-py37 -y --all - conda create -n orca-python-horovod-tf2-py37 -y python==3.7.10 setuptools==58.0.4 - conda info -e - source activate orca-python-horovod-tf2-py37 - pip uninstall -y bigdl-friesian bigdl-friesian-spark3 bigdl-dllib bigdl-dllib-spark3 bigdl-orca pyspark bigdl-orca-spark3 bigdl-chronos bigdl-chronos-spark3 bigdl-friesian bigdl-friesian-spark3 - pip uninstall -y intel-tensorflow - pip install cmake mxnet==1.6.0 - pip uninstall -r .github/actions/python-requirements/requirements-horovod-tf2.txt -y - pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r .github/actions/python-requirements/requirements-horovod-tf2.txt - pip install pytest - HOROVOD_WITH_PYTORCH=1; HOROVOD_WITH_GLOO=1; pip install --no-cache-dir horovod==0.19.2 - pip uninstall -y opencv-python-headless - pip install opencv-python-headless - - #sed -i "s/'bigdl-core=='+VERSION/'bigdl-core==2.1.0b20220811'/g" python/dllib/src/setup.py - #bash python/dev/release_default_linux_spark312.sh default false false - - # install dllib - #pip install python/dllib/src/dist/bigdl_dllib*-py3-none-manylinux1_x86_64.whl - - # install orca - #pip install python/orca/src/dist/bigdl_orca*-py3-none-manylinux1_x86_64.whl - pip install --pre --upgrade bigdl-orca-spark3 - export SPARK_LOCAL_HOSTNAME=localhost - chmod a+x python/orca/dev/test/run-pytests-horovod-tf.sh - python/orca/dev/test/run-pytests-horovod-tf.sh - ray stop - - conda remove -n bigdl-init --all - env: - BIGDL_ROOT: ${{ github.workspace }} - ANALYTICS_ZOO_ROOT: ${{ github.workspace }} From bdc0b5bb21eefd438df778bf8389e0ab44ca4260 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Fri, 9 Sep 2022 15:31:38 +0800 Subject: [PATCH 32/34] add remove env --- .../nightly-test/action.yml | 2 +- .../setup-env/setup-horovod-tf2-py37/action.yml | 8 ++++---- .github/actions/remove-env/action.yml | 15 +++++++++++++++ .github/workflows/nightly_test.yml | 4 ++++ 4 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 .github/actions/remove-env/action.yml diff --git a/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml b/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml index 09ab0b4cf1d..53a61dc2d9b 100644 --- a/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml +++ b/.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test/action.yml @@ -6,7 +6,7 @@ runs: - name: Run Test shell: bash run: | - source activate orca-oython-horovod-tf2-py37-spark3 + source activate py37 export SPARK_LOCAL_HOSTNAME=localhost chmod a+x python/orca/dev/test/run-pytests-horovod-tf.sh python/orca/dev/test/run-pytests-horovod-tf.sh diff --git a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml index 4d420f60336..0b06a4589a1 100644 --- a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml +++ b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml @@ -19,12 +19,12 @@ runs: - name: Setup env shell: bash run: | - if conda info --env | grep "orca-oython-horovod-tf2-py37-spark3"; then - source activate orca-oython-horovod-tf2-py37-spark3 + if conda info --env | grep "py37"; then + source activate py37 else - conda create -n orca-oython-horovod-tf2-py37-spark3 -y python==3.7.10 setuptools==58.0.4 + conda create -n py37 -y python==3.7.10 setuptools==58.0.4 conda info --env - source activate orca-oython-horovod-tf2-py37-spark3 + source activate py37 fi pip uninstall -y bigdl-friesian bigdl-friesian-spark3 bigdl-dllib bigdl-dllib-spark3 bigdl-orca pyspark bigdl-orca-spark3 bigdl-chronos bigdl-chronos-spark3 bigdl-friesian bigdl-friesian-spark3 pip uninstall -y intel-tensorflow diff --git a/.github/actions/remove-env/action.yml b/.github/actions/remove-env/action.yml new file mode 100644 index 00000000000..0fc7325b002 --- /dev/null +++ b/.github/actions/remove-env/action.yml @@ -0,0 +1,15 @@ +name: 'Remove Env' +description: 'Remove Env' +runs: + using: "composite" + steps: + - name: Remove Env + shell: bash + run: | + source activate py37 + pip uninstall -y pyspark bigdl-friesian bigdl bigdl-dllib-spark3 bigdl-orca-spark3 bigdl-tf bigdl-math bigdl-orca bigdl-dllib bigdl-tf bigdl-chronos bigdl-nano + source deactivate + conda remove -n py37 -y --all + env: + BIGDL_ROOT: ${{ github.workspace }} + ANALYTICS_ZOO_ROOT: ${{ github.workspace }} \ No newline at end of file diff --git a/.github/workflows/nightly_test.yml b/.github/workflows/nightly_test.yml index 230a859f4eb..a63acf2f5f3 100644 --- a/.github/workflows/nightly_test.yml +++ b/.github/workflows/nightly_test.yml @@ -115,6 +115,10 @@ jobs: uses: ./.github/actions/orca/setup-env/setup-horovod-tf2-py37 - name: Run Test uses: ./.github/actions/orca/orca-python-horovod-tf2-py37-spark3-action/nightly-test + - name: Remove Env + if: ${{ always() }} + uses: ./.github/actions/remove-env + Dllib-Scala-UT: if: ${{ github.event.schedule || github.event.inputs.artifact == 'Dllib-Scala-UT' || github.event.inputs.artifact == 'all' }} From 1d92e93199e6a9295482f0ae6c2fdac1fd2961be Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Fri, 9 Sep 2022 16:07:10 +0800 Subject: [PATCH 33/34] install bigdl-orca-spark3 --- .../orca/setup-env/setup-horovod-tf2-py37/action.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml index 0b06a4589a1..cdc53cb3e07 100644 --- a/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml +++ b/.github/actions/orca/setup-env/setup-horovod-tf2-py37/action.yml @@ -35,15 +35,15 @@ runs: HOROVOD_WITH_PYTORCH=1; HOROVOD_WITH_GLOO=1; pip install --no-cache-dir horovod==0.19.2 pip uninstall -y opencv-python-headless pip install opencv-python-headless - #pip install --pre --upgrade bigdl-orca-spark3 - sed -i "s/'bigdl-core=='+VERSION/'bigdl-core==2.1.0b20220811'/g" python/dllib/src/setup.py - bash python/dev/release_default_linux_spark312.sh default false false + pip install --pre --upgrade bigdl-orca-spark3 + #sed -i "s/'bigdl-core=='+VERSION/'bigdl-core==2.1.0b20220811'/g" python/dllib/src/setup.py + #bash python/dev/release_default_linux_spark312.sh default false false # install dllib - pip install python/dllib/src/dist/bigdl_dllib*-py3-none-manylinux1_x86_64.whl + #pip install python/dllib/src/dist/bigdl_dllib*-py3-none-manylinux1_x86_64.whl # install orca - pip install python/orca/src/dist/bigdl_orca*-py3-none-manylinux1_x86_64.whl + #pip install python/orca/src/dist/bigdl_orca*-py3-none-manylinux1_x86_64.whl env: BIGDL_ROOT: ${{ github.workspace }} From 9ab6fa466dfedbf9cdc04ba2c3a9cb1d180bb312 Mon Sep 17 00:00:00 2001 From: pinggao187 Date: Tue, 13 Sep 2022 10:35:40 +0800 Subject: [PATCH 34/34] update --- .github/workflows/nightly_test.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/nightly_test.yml b/.github/workflows/nightly_test.yml index a63acf2f5f3..babe8c5ecc6 100644 --- a/.github/workflows/nightly_test.yml +++ b/.github/workflows/nightly_test.yml @@ -1,7 +1,7 @@ name: Nightly Test on: - pull_request: + #pull_request: schedule: - cron: '0 13 * * *' # GMT time, 13:00 GMT == 21:00 China workflow_dispatch: @@ -30,11 +30,6 @@ permissions: packages: write jobs: - #env: - #name: conda env - #outputs: - #Orca-Python-Horovod-Tf2-Py37-Spark3: Orca-Python-Horovod-Tf2-Py37-Spark3 - Orca-Python-ExampleTest-Py37-Spark3: if: ${{ github.event.schedule || github.event.inputs.artifact == 'Orca-Python-ExampleTest-Py37-Spark3' || github.event.inputs.artifact == 'all' }} runs-on: [self-hosted, Gondolin, ubuntu-20.04-lts] @@ -102,7 +97,7 @@ jobs: uses: ./.github/actions/orca-python-py37-spark3-action Orca-Python-Horovod-Tf2-Py37-Spark3: - #if: ${{ github.event.schedule || github.event.inputs.artifact == 'Orca-Python-Horovod-Tf2-Py37-Spark3' || github.event.inputs.artifact == 'all' }} + if: ${{ github.event.schedule || github.event.inputs.artifact == 'Orca-Python-Horovod-Tf2-Py37-Spark3' || github.event.inputs.artifact == 'all' }} runs-on: [self-hosted, Gondolin, ubuntu-20.04-lts] steps: