From 366144daf5f3e120ae3848d79a829f6702bb52ef Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Wed, 15 Dec 2021 10:10:45 +0300 Subject: [PATCH 1/6] Remove oneAPI installation --- .github/workflows/conda-package.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 6854107d959f..acd1e46bdf04 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -14,24 +14,6 @@ jobs: python: [3.8, 3.9] steps: - - name: Install Intel repository - run: | - wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB - sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB - rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB - sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main" - sudo apt-get update - - name: Update libstdc++-dev - run: | - sudo apt remove -y gcc-7 g++-7 gcc-8 g++-8 gcc-10 g++-10 - sudo apt remove -y libstdc++-10-dev - sudo apt autoremove - sudo apt install --reinstall -y gcc-9 g++-9 libstdc++-9-dev - - name: Install Intel OneAPI - run: | - sudo apt-get install intel-oneapi-mkl=2021.3.0-520 \ - intel-oneapi-mkl-devel=2021.3.0-520 \ - intel-oneapi-compiler-dpcpp-cpp=2021.3.0-3350 - name: Checkout repo uses: actions/checkout@v2 with: From a65052c5af68a3f133e30fc8a2ddd029a4d291e8 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Wed, 15 Dec 2021 10:26:36 +0300 Subject: [PATCH 2/6] Remove call oneAPI setvars.sh and installing CMake --- .github/workflows/conda-package.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index acd1e46bdf04..5567a5ded57c 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -25,8 +25,6 @@ jobs: run: conda install conda-build - name: Build conda package run: | - . /opt/intel/oneapi/setvars.sh - . ./scripts/install_cmake_lin.sh CHANNELS="-c dppy/label/dev -c intel -c defaults --override-channels" VERSIONS="--python ${{ matrix.python }}" TEST="--no-test" From 8e697d8bb87d550583d4593fc17d256f6bb33ac2 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Wed, 15 Dec 2021 01:09:40 +0300 Subject: [PATCH 3/6] Add dpl-include in conda recipe --- conda-recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index b7c6dd7b98d7..47c54f4a4bf4 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -18,6 +18,7 @@ requirements: build: - {{ compiler('dpcpp') }} - dpcpp-cpp-rt {{ environ.get('DPCPP_VER', '>=2021.1.1') }} + - dpl-include run: - python - dpctl >=0.10 From 9e13bc75db4fc334a8b9aaf505325723c16678f8 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Wed, 2 Mar 2022 14:43:57 +0300 Subject: [PATCH 4/6] Revert "Add dpl-include in conda recipe" This reverts commit 8e697d8bb87d550583d4593fc17d256f6bb33ac2. --- conda-recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 47c54f4a4bf4..b7c6dd7b98d7 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -18,7 +18,6 @@ requirements: build: - {{ compiler('dpcpp') }} - dpcpp-cpp-rt {{ environ.get('DPCPP_VER', '>=2021.1.1') }} - - dpl-include run: - python - dpctl >=0.10 From c3d70a26d3fbbff6a8534eadefd644b7831bb707 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Wed, 2 Mar 2022 15:19:04 +0300 Subject: [PATCH 5/6] Use oneDPL from sources --- .github/workflows/conda-package.yml | 19 +++++++++---------- scripts/build_conda_package.sh | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 10 deletions(-) create mode 100755 scripts/build_conda_package.sh diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 5567a5ded57c..344324e2fee8 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -15,24 +15,23 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 + - name: Checkout oneDPL + uses: actions/checkout@v3 + with: + repository: oneapi-src/oneDPL + path: oneDPL + ref: oneDPL-2021.6.1-release + - name: Add conda to system path run: echo $CONDA/bin >> $GITHUB_PATH - name: Install conda-build run: conda install conda-build - name: Build conda package - run: | - CHANNELS="-c dppy/label/dev -c intel -c defaults --override-channels" - VERSIONS="--python ${{ matrix.python }}" - TEST="--no-test" - conda build \ - $TEST \ - $VERSIONS \ - $CHANNELS \ - conda-recipe + run: ./scripts/build_conda_package.sh ${{ matrix.python }} ${{ env.GITHUB_WORKSPACE }}/oneDPL - name: Upload artifact uses: actions/upload-artifact@v2 diff --git a/scripts/build_conda_package.sh b/scripts/build_conda_package.sh new file mode 100755 index 000000000000..c9ad065b1509 --- /dev/null +++ b/scripts/build_conda_package.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +PYTHON_VERSION=$1 +DPLROOT=$2 + +export DPLROOT + +CHANNELS="-c dppy/label/dev -c intel -c defaults --override-channels" +VERSIONS="--python $PYTHON_VERSION" +TEST="--no-test" + +conda build \ + $TEST \ + $VERSIONS \ + $CHANNELS \ + conda-recipe From 9ea418b601ff5d0e66a694469f6f3582972432af Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Wed, 2 Mar 2022 15:19:04 +0300 Subject: [PATCH 6/6] Fix use $GITHUB_WORKSPACE --- .github/workflows/conda-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 344324e2fee8..e401cf78c837 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -31,7 +31,7 @@ jobs: - name: Install conda-build run: conda install conda-build - name: Build conda package - run: ./scripts/build_conda_package.sh ${{ matrix.python }} ${{ env.GITHUB_WORKSPACE }}/oneDPL + run: ./scripts/build_conda_package.sh ${{ matrix.python }} $GITHUB_WORKSPACE/oneDPL - name: Upload artifact uses: actions/upload-artifact@v2