Skip to content

Commit 620238f

Browse files
authored
Merge pull request #2417 from IntelPython/revert-gh-2411
Revert gh-2411
2 parents 0a2b834 + d3cac5a commit 620238f

2 files changed

Lines changed: 15 additions & 11 deletions

File tree

‎.github/sycl-build-deps.env‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Open source SYCL build deps, loaded by os-llvm-sycl-build.yml and bumped by
22
# bump-sycl-deps.yml from intel/llvm devops/dependencies.json.
33
# Kept out of .github/workflows/ since GITHUB_TOKEN can't push workflow files.
4-
DRIVER_PATH=2026-WW42
5-
OCLCPUEXP_FN=oclcpuexp-2026.23.10.0.02_160000_rel.tar.gz
6-
TBB_URL=https://github.com/uxlfoundation/oneTBB/releases/download/v2023.2.0/
7-
TBB_INSTALL_DIR=oneapi-tbb-2023.2.0
8-
TBB_FN=oneapi-tbb-2023.2.0-lin.tgz
4+
DRIVER_PATH=2026-WW28
5+
OCLCPUEXP_FN=oclcpuexp-2026.22.6.1.17_160000_rel.tar.gz
6+
TBB_URL=https://github.com/uxlfoundation/oneTBB/releases/download/v2023.1.0/
7+
TBB_INSTALL_DIR=oneapi-tbb-2023.1.0
8+
TBB_FN=oneapi-tbb-2023.1.0-lin.tgz

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,19 +128,23 @@ jobs:
128128
fi
129129
130130
# pinned deps are fetched independently of the nightly, so a pin
131-
# change replaces whatever the cache restored
131+
# change replaces whatever the cache restored; the oclcpuexp
132+
# tarball extracts read-only directories, so restore write access
133+
# before removing them
132134
if [ ! -f "${OCLCPUEXP_FN}" ]; then
133-
rm -rf oclcpuexp oclcpuexp-*.tar.gz
135+
chmod -R u+w oclcpuexp 2>/dev/null
136+
rm -rf oclcpuexp oclcpuexp-*.tar.gz || exit 1
134137
wget "${DOWNLOAD_URL_PREFIX}/${DRIVER_PATH}/${OCLCPUEXP_FN}" || exit 1
135138
fi
136139
if [ ! -f "${TBB_FN}" ]; then
137-
rm -rf oneapi-tbb-*
140+
chmod -R u+w oneapi-tbb-* 2>/dev/null
141+
rm -rf oneapi-tbb-* || exit 1
138142
wget "${TBB_URL}/${TBB_FN}" || exit 1
139143
fi
140144
mkdir -p oclcpuexp
141-
[ -d oclcpuexp/x64 ] || tar xf "${OCLCPUEXP_FN}" -C oclcpuexp
142-
[ -d "${TBB_INSTALL_DIR}/lib" ] || tar xf "${TBB_FN}"
143-
cp oclcpuexp/x64/libOpenCL.so* dpcpp_compiler/lib/
145+
[ -d oclcpuexp/x64 ] || tar xf "${OCLCPUEXP_FN}" -C oclcpuexp || exit 1
146+
[ -d "${TBB_INSTALL_DIR}/lib" ] || tar xf "${TBB_FN}" || exit 1
147+
cp -f oclcpuexp/x64/libOpenCL.so* dpcpp_compiler/lib/ || exit 1
144148
145149
- name: Setup Python
146150
uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0

0 commit comments

Comments
 (0)