Skip to content

Commit 74de25e

Browse files
Separated long script running tests into individual steps
Replaced overlooked literal oneapi-tbb-2021.5.0 with TBB_INSTALL_DIR variable set next to TBB_FN.
1 parent 61adaed commit 74de25e

File tree

1 file changed

+46
-4
lines changed

1 file changed

+46
-4
lines changed

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

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
OCLCPUEXP_FN: oclcpuexp-2022.15.12.0.01_rel.tar.gz
1616
FPGAEMU_FN: fpgaemu-2022.15.12.0.01_rel.tar.gz
1717
TBB_URL: https://github.com/oneapi-src/oneTBB/releases/download/v2021.7.0/
18+
TBB_INSTALL_DIR: oneapi-tbb-2021.7.0
1819
TBB_FN: oneapi-tbb-2021.7.0-lin.tgz
1920

2021
steps:
@@ -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
@@ -106,17 +107,58 @@ jobs:
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)