Skip to content

Commit 884cc6a

Browse files
authored
Merge branch 'master' into random_cfd
2 parents 10399e7 + 35e28a4 commit 884cc6a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1899
-614
lines changed

.github/workflows/build-sphinx.yml

Lines changed: 45 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,90 +3,110 @@ on:
33
push:
44
branches:
55
- master
6+
pull_request:
67

78
jobs:
89
build-and-deploy:
910
name: Build and Deploy Docs
11+
1012
runs-on: ubuntu-20.04
13+
14+
defaults:
15+
run:
16+
shell: bash -l {0}
17+
18+
env:
19+
python-ver: '3.9'
20+
1121
steps:
1222
- name: Cancel Previous Runs
13-
uses: styfle/cancel-workflow-action@0.6.0
23+
uses: styfle/cancel-workflow-action@0.11.0
1424
with:
1525
access_token: ${{ github.token }}
26+
1627
- name: Install Intel repository
1728
run: |
1829
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
1930
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
2031
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
2132
sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
2233
sudo apt-get update
34+
2335
- name: Update libstdc++-dev
2436
run: |
2537
sudo apt remove -y gcc-7 g++-7 gcc-8 g++-8 gcc-10 g++-10
2638
sudo apt remove -y libstdc++-10-dev
2739
sudo apt autoremove
2840
sudo apt install --reinstall -y gcc-9 g++-9 libstdc++-9-dev
41+
2942
- name: Install Intel OneAPI
3043
run: |
3144
sudo apt-get install intel-oneapi-mkl \
3245
intel-oneapi-mkl-devel \
3346
intel-oneapi-dpcpp-cpp-compiler
47+
3448
# https://github.com/marketplace/actions/checkout
3549
- name: Install nvidia-cuda support drivers
3650
run: |
3751
sudo add-apt-repository ppa:graphics-drivers/ppa
3852
sudo apt-get update
3953
sudo apt-get install -y libnvidia-gl-450
4054
sudo apt-get install -y nvidia-cuda-toolkit clinfo
55+
4156
- name: Checkout repo
42-
uses: actions/checkout@v2
57+
uses: actions/[email protected]
58+
4359
# https://github.com/marketplace/actions/setup-miniconda
4460
- name: Setup miniconda
45-
uses: conda-incubator/setup-miniconda@v2
61+
uses: conda-incubator/setup-miniconda@v2.1.1
4662
with:
47-
activate-environment: dpnp
48-
python-version: 3.8
49-
channels: intel,conda-forge
50-
auto-activate-base: false
51-
- name: Conda info
52-
shell: bash -l {0}
53-
run: |
54-
conda info
55-
conda list
63+
auto-update-conda: true
64+
python-version: ${{ env.python-ver }}
65+
miniconda-version: 'latest'
66+
activate-environment: 'docs'
67+
channels: intel, conda-forge
68+
5669
- name: Install sphinx dependencies
57-
shell: bash -l {0}
58-
run: |
59-
conda install sphinx sphinx_rtd_theme
70+
run: conda install sphinx sphinx_rtd_theme
71+
6072
- name: Install dpnp dependencies
61-
shell: bash -l {0}
6273
run: |
63-
conda install dpctl mkl-devel-dpcpp tbb-devel dpcpp_linux-64 cmake=3.19 cython pytest \
74+
conda install dpctl mkl-devel-dpcpp tbb-devel dpcpp_linux-64 cmake cython pytest \
6475
-c dppy/label/dev -c intel -c conda-forge
76+
6577
- name: Install cuPy dependencies
66-
shell: bash -l {0}
78+
run: conda install -c conda-forge cupy cudatoolkit=10.0
79+
80+
- name: Conda info
6781
run: |
68-
conda install -c conda-forge cupy cudatoolkit=10.0
82+
conda info
83+
conda list
84+
6985
- name: Build library
70-
shell: bash -l {0}
7186
run: |
7287
DPLROOT=/opt/intel/oneapi/dpl/latest python setup.py build_clib
7388
CC=dpcpp python setup.py build_ext --inplace
7489
python setup.py develop
90+
7591
- name: Build docs
76-
shell: bash -l {0}
77-
run: |
78-
make html
92+
run: make html
7993
working-directory: doc
94+
8095
# https://github.com/marketplace/actions/doxygen-action
8196
- name: Build backend docs
82-
uses: mattnotmitt/doxygen-action@v1
97+
uses: mattnotmitt/doxygen-action@v1.9.4
8398
with:
8499
working-directory: 'dpnp/backend/doc'
100+
85101
- name: Copy backend docs
86102
run: cp -r dpnp/backend/doc/html doc/_build/html/backend_doc
103+
87104
# https://github.com/marketplace/actions/github-pages-action
88105
- name: Deploy docs
89-
uses: peaceiris/actions-gh-pages@v3
106+
if: |
107+
!github.event.pull_request.head.repo.fork &&
108+
(github.ref == 'refs/heads/master' || (startsWith(github.ref, 'refs/heads/release') == true) || github.event_name == 'push' && contains(github.ref, 'refs/tags/'))
109+
uses: peaceiris/[email protected]
90110
with:
91111
github_token: ${{ secrets.GITHUB_TOKEN }}
92112
publish_dir: doc/_build/html/

0 commit comments

Comments
 (0)