Skip to content

Commit ed2d54c

Browse files
Modularize setting up steps into a script, and deploy it
Skipping test_sycl_event::test_backend in OS-LLVM-build workflow to work around intel/llvm#9264
1 parent fdc7b19 commit ed2d54c

File tree

1 file changed

+18
-26
lines changed

1 file changed

+18
-26
lines changed

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

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -107,57 +107,49 @@ jobs:
107107
with:
108108
fetch-depth: 0
109109

110-
- name: Report compiler version
110+
- name: Create set_allvars.sh
111111
shell: bash -l {0}
112112
run: |
113+
cat << EOF > set_allvars.sh
114+
#!/usr/bin/bash
113115
export SYCL_BUNDLE_FOLDER=/home/runner/work/sycl_bundle
114116
source ${SYCL_BUNDLE_FOLDER}/dpcpp_compiler/startup.sh
115117
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/oclcpuexp/x64:${LD_LIBRARY_PATH}
116118
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/fpgaemu/x64:${LD_LIBRARY_PATH}
117119
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/${TBB_INSTALL_DIR}/lib/intel64/gcc4.8:${LD_LIBRARY_PATH}
120+
export OCL_ICD_VENDORS=
118121
export OCL_ICD_FILENAMES=libintelocl.so:libintelocl_emu.so
122+
EOF
123+
chmod +x set_allvars.sh
124+
cat set_allvars.sh
125+
126+
- name: Report compiler version
127+
shell: bash -l {0}
128+
run: |
129+
source set_allvars.sh
119130
clang++ --version
120131
121132
- name: Run sycl-ls
122133
shell: bash -l {0}
123134
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
135+
source set_allvars.sh
130136
sycl-ls
131137
132138
- name: build dpctl
133139
shell: bash -l {0}
134140
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
141+
source set_allvars.sh
141142
CC=clang CXX=clang++ python setup.py develop -G Ninja
142143
143144
- name: Run lsplatforms
144145
shell: bash -l {0}
145146
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
147+
source set_allvars.sh
152148
python -m dpctl -f || exit 1
153149
154150
- name: Run dpctl/tests
155151
shell: bash -l {0}
156152
run: |
157-
export SYCL_BUNDLE_FOLDER=/home/runner/work/sycl_bundle
158-
source ${SYCL_BUNDLE_FOLDER}/dpcpp_compiler/startup.sh
159-
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/oclcpuexp/x64:${LD_LIBRARY_PATH}
160-
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/fpgaemu/x64:${LD_LIBRARY_PATH}
161-
export LD_LIBRARY_PATH=${SYCL_BUNDLE_FOLDER}/${TBB_INSTALL_DIR}/lib/intel64/gcc4.8:${LD_LIBRARY_PATH}
162-
export OCL_ICD_FILENAMES=libintelocl.so:libintelocl_emu.so
163-
python -m pytest -v dpctl/tests
153+
source set_allvars.sh
154+
# skip test due to https://github.com/intel/llvm/issues/9264
155+
python -m pytest -v dpctl/tests -k "not test_sycl_event::test_backend"

0 commit comments

Comments
 (0)