From 36f2449e37f09bd650c45f5856364ca561e693c0 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Wed, 29 Sep 2021 19:48:30 +0300 Subject: [PATCH 1/5] Use Python 3.9 in conda-package.yml --- .github/workflows/conda-package.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 756251f2243..cf384a49b97 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -8,6 +8,11 @@ env: jobs: build: runs-on: ubuntu-20.04 + + strategy: + matrix: + python: [3.8, 3.9] + steps: - name: Install Intel repository run: | @@ -41,7 +46,7 @@ jobs: . /opt/intel/oneapi/setvars.sh . ./scripts/install_cmake_lin.sh CHANNELS="-c dppy/label/dev -c intel -c defaults --override-channels" - VERSIONS="--python 3.8" + VERSIONS="--python ${{ matrix.python }}" TEST="--no-test" conda build \ $TEST \ @@ -52,18 +57,23 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v2 with: - name: dpnp ${{ runner.os }} + name: dpnp ${{ runner.os }} ${{ matrix.python }} path: /usr/share/miniconda/conda-bld/linux-64/dpnp-*.tar.bz2 upload: needs: build if: ${{ github.ref == 'refs/heads/master' }} runs-on: ubuntu-latest + + strategy: + matrix: + python: [3.8, 3.9] + steps: - name: Download artifact uses: actions/download-artifact@v2 with: - name: dpnp ${{ runner.os }} + name: dpnp ${{ runner.os }} ${{ matrix.python }} - name: Install anaconda-client run: conda install anaconda-client From 9112eac75910522e26b22c21eb8d5b3e85a8af44 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Wed, 29 Sep 2021 19:55:30 +0300 Subject: [PATCH 2/5] Update conda recipe --- conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 8e860c80bcb..6ea1470a509 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -8,7 +8,7 @@ requirements: host: - python - setuptools - - numpy >=1.15 # [win or osx or py==38] + - numpy >=1.15 # [win or osx or py>=38] - numpy 1.17 # [linux and py==37] - cython - cmake >=3.16.5 From 6a177a44c12c38817d5cf75f155383f351c25686 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Thu, 30 Sep 2021 17:52:26 +0300 Subject: [PATCH 3/5] Use oneAPI 2021.3 --- .github/workflows/conda-package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 756251f2243..525a7574986 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -24,9 +24,9 @@ jobs: sudo apt install --reinstall -y gcc-9 g++-9 libstdc++-9-dev - name: Install Intel OneAPI run: | - sudo apt-get install intel-oneapi-mkl \ - intel-oneapi-mkl-devel \ - intel-oneapi-dpcpp-cpp-compiler + sudo apt-get install intel-oneapi-mkl=2021.3.0* \ + intel-oneapi-mkl-devel=2021.3.0* \ + intel-oneapi-dpcpp-cpp-compiler=2021.3.0* - name: Checkout repo uses: actions/checkout@v2 with: From 68f224f2971dc803fbc033eaf70a723e5e914b7a Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Thu, 30 Sep 2021 17:57:08 +0300 Subject: [PATCH 4/5] Fix versions --- .github/workflows/conda-package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 525a7574986..03b02e4c59b 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -24,9 +24,9 @@ jobs: 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* \ - intel-oneapi-mkl-devel=2021.3.0* \ - intel-oneapi-dpcpp-cpp-compiler=2021.3.0* + sudo apt-get install intel-oneapi-mkl=2021.3.0-520 \ + intel-oneapi-mkl-devel=2021.3.0-520 \ + intel-oneapi-dpcpp-cpp-compiler=2021.3.0-3350 - name: Checkout repo uses: actions/checkout@v2 with: From 1194c42e9589688fc7c8ab2ab3d88359632626ae Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Thu, 30 Sep 2021 18:06:16 +0300 Subject: [PATCH 5/5] Fix versions --- .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 03b02e4c59b..648691c46eb 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -26,7 +26,7 @@ jobs: run: | sudo apt-get install intel-oneapi-mkl=2021.3.0-520 \ intel-oneapi-mkl-devel=2021.3.0-520 \ - intel-oneapi-dpcpp-cpp-compiler=2021.3.0-3350 + intel-oneapi-compiler-dpcpp-cpp=2021.3.0-3350 - name: Checkout repo uses: actions/checkout@v2 with: