Skip to content

Commit 83ad22d

Browse files
oleksandr-pavlykoleksandr-pavlyk
authored
Merge pull request #1037 from IntelPython/update-ocl-cpu-fpga-drivers
Updated TBB, OCL-CPU, OCL-FPGAEMU versions in os-llvm-sycl-build workflow
2 parents b4cecd3 + 74de25e commit 83ad22d

File tree

3 files changed

+58
-16
lines changed

3 files changed

+58
-16
lines changed

‎.github/workflows/generate-coverage.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
3535
- name: Install CMake and Ninja
3636
run: |
37-
sudo apt-get install cmake ninja-build
37+
sudo apt-get install ninja-build
3838
3939
- name: Setup Python
4040
uses: actions/setup-python@v4
@@ -79,7 +79,7 @@ jobs:
7979
- name: Install dpctl dependencies
8080
shell: bash -l {0}
8181
run: |
82-
pip install numpy cython setuptools pytest pytest-cov scikit-build coverage[toml]
82+
pip install numpy cython setuptools pytest pytest-cov scikit-build cmake coverage[toml]
8383
8484
- name: Build dpctl with coverage
8585
shell: bash -l {0}

‎.github/workflows/generate-docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535
if: ${{ !github.event.pull_request || github.event.action != 'closed' }}
3636
run: |
3737
sudo apt-get install doxygen
38-
- name: Install CMake and Ninja
38+
- name: Install Ninja
3939
if: ${{ !github.event.pull_request || github.event.action != 'closed' }}
4040
run: |
41-
sudo apt-get install cmake ninja-build
41+
sudo apt-get install ninja-build
4242
- name: Setup Python
4343
if: ${{ !github.event.pull_request || github.event.action != 'closed' }}
4444
uses: actions/setup-python@v4
@@ -49,7 +49,7 @@ jobs:
4949
if: ${{ !github.event.pull_request || github.event.action != 'closed' }}
5050
shell: bash -l {0}
5151
run: |
52-
pip install numpy cython setuptools scikit-build sphinx sphinx_rtd_theme pydot graphviz sphinxcontrib-programoutput
52+
pip install numpy cython setuptools scikit-build cmake sphinx sphinx_rtd_theme pydot graphviz sphinxcontrib-programoutput
5353
- name: Checkout repo
5454
uses: actions/checkout@v3
5555
with:

‎.github/workflows/os-llvm-sycl-build.yml‎

Lines changed: 53 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ jobs:
1111

1212
env:
1313
DOWNLOAD_URL_PREFIX: https://github.com/intel/llvm/releases/download
14-
DRIVER_PATH: 2022-WW13
15-
OCLCPUEXP_FN: oclcpuexp-2022.13.3.0.16_rel.tar.gz
16-
FPGAEMU_FN: fpgaemu-2022.13.3.0.16_rel.tar.gz
17-
TBB_URL: https://github.com/oneapi-src/oneTBB/releases/download/v2021.5.0
18-
TBB_FN: oneapi-tbb-2021.5.0-lin.tgz
14+
DRIVER_PATH: 2022-WW50
15+
OCLCPUEXP_FN: oclcpuexp-2022.15.12.0.01_rel.tar.gz
16+
FPGAEMU_FN: fpgaemu-2022.15.12.0.01_rel.tar.gz
17+
TBB_URL: https://github.com/oneapi-src/oneTBB/releases/download/v2021.7.0/
18+
TBB_INSTALL_DIR: oneapi-tbb-2021.7.0
19+
TBB_FN: oneapi-tbb-2021.7.0-lin.tgz
1920

2021
steps:
2122
- name: Cancel Previous Runs
@@ -79,7 +80,7 @@ jobs:
7980
mkdir -p fpgaemu
8081
[ -d oclcpuexp/x64 ] || tar xf ${OCLCPUEXP_FN} -C oclcpuexp
8182
[ -d fpgaemu/x64 ] || tar xf ${FPGAEMU_FN} -C fpgaemu
82-
[ -d oneapi-tbb-2021.5.0/lib ] || tar xf ${TBB_FN}
83+
[ -d ${TBB_INSTALL_DIR}/lib ] || tar xf ${TBB_FN}
8384
mkdir -p dpcpp_compiler/lib
8485
mkdir -p dpcpp_compiler/lib/oclfpga
8586
touch dpcpp_compiler/lib/oclfpga/fpgavars.sh
@@ -88,7 +89,7 @@ jobs:
8889
- name: Install system components
8990
shell: bash -l {0}
9091
run: |
91-
sudo apt-get install cmake ninja-build libtinfo5
92+
sudo apt-get install ninja-build libtinfo5
9293
9394
- name: Setup Python
9495
uses: actions/setup-python@v4
@@ -99,24 +100,65 @@ jobs:
99100
- name: Install dpctl dependencies
100101
shell: bash -l {0}
101102
run: |
102-
pip install numpy cython setuptools pytest scikit-build
103+
pip install numpy cython setuptools pytest scikit-build cmake
103104
104105
- name: Checkout repo
105106
uses: actions/checkout@v3
106107
with:
107108
fetch-depth: 0
108109

109-
- name: build dpctl
110+
- name: Report compiler version
110111
shell: bash -l {0}
111112
run: |
112113
export SYCL_BUNDLE_FOLDER=/home/runner/work/sycl_bundle
113114
source ${SYCL_BUNDLE_FOLDER}/dpcpp_compiler/startup.sh
114115
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/oclcpuexp/x64:${LD_LIBRARY_PATH}
115116
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/fpgaemu/x64:${LD_LIBRARY_PATH}
116-
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/oneapi-tbb-2021.5.0/lib/intel64/gcc4.8:${LD_LIBRARY_PATH}
117+
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/${TBB_INSTALL_DIR}/lib/intel64/gcc4.8:${LD_LIBRARY_PATH}
117118
export OCL_ICD_FILENAMES=libintelocl.so:libintelocl_emu.so
118119
clang++ --version
120+
121+
- name: Run sycl-ls
122+
shell: bash -l {0}
123+
run: |
124+
export SYCL_BUNDLE_FOLDER=/home/runner/work/sycl_bundle
125+
source ${SYCL_BUNDLE_FOLDER}/dpcpp_compiler/startup.sh
126+
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/oclcpuexp/x64:${LD_LIBRARY_PATH}
127+
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/fpgaemu/x64:${LD_LIBRARY_PATH}
128+
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/${TBB_INSTALL_DIR}/lib/intel64/gcc4.8:${LD_LIBRARY_PATH}
129+
export OCL_ICD_FILENAMES=libintelocl.so:libintelocl_emu.so
119130
sycl-ls
131+
132+
- name: build dpctl
133+
shell: bash -l {0}
134+
run: |
135+
export SYCL_BUNDLE_FOLDER=/home/runner/work/sycl_bundle
136+
source ${SYCL_BUNDLE_FOLDER}/dpcpp_compiler/startup.sh
137+
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/oclcpuexp/x64:${LD_LIBRARY_PATH}
138+
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/fpgaemu/x64:${LD_LIBRARY_PATH}
139+
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/${TBB_INSTALL_DIR}/lib/intel64/gcc4.8:${LD_LIBRARY_PATH}
140+
export OCL_ICD_FILENAMES=libintelocl.so:libintelocl_emu.so
120141
CC=clang CXX=clang++ python setup.py develop -G Ninja
121-
python -c "import dpctl; dpctl.lsplatform()" || exit 1
142+
143+
- name: Run lsplatforms
144+
shell: bash -l {0}
145+
run: |
146+
export SYCL_BUNDLE_FOLDER=/home/runner/work/sycl_bundle
147+
source ${SYCL_BUNDLE_FOLDER}/dpcpp_compiler/startup.sh
148+
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/oclcpuexp/x64:${LD_LIBRARY_PATH}
149+
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/fpgaemu/x64:${LD_LIBRARY_PATH}
150+
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/${TBB_INSTALL_DIR}/lib/intel64/gcc4.8:${LD_LIBRARY_PATH}
151+
export OCL_ICD_FILENAMES=libintelocl.so:libintelocl_emu.so
152+
python -m dpctl -f || exit 1
153+
python -m pytest -v dpctl/tests
154+
155+
- name: Run dpctl/tests
156+
shell: bash -l {0}
157+
run: |
158+
export SYCL_BUNDLE_FOLDER=/home/runner/work/sycl_bundle
159+
source ${SYCL_BUNDLE_FOLDER}/dpcpp_compiler/startup.sh
160+
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/oclcpuexp/x64:${LD_LIBRARY_PATH}
161+
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/fpgaemu/x64:${LD_LIBRARY_PATH}
162+
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/${TBB_INSTALL_DIR}/lib/intel64/gcc4.8:${LD_LIBRARY_PATH}
163+
export OCL_ICD_FILENAMES=libintelocl.so:libintelocl_emu.so
122164
python -m pytest -v dpctl/tests

0 commit comments

Comments
 (0)