Skip to content

Commit ca546cc

Browse files
committed
fix: typos, code cleanup, noarch incorrectness
1 parent be2e127 commit ca546cc

3 files changed

Lines changed: 21 additions & 18 deletions

File tree

conda-recipe/meta.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ package:
66
version: {{ version }}
77

88
build:
9-
noarch: generic
10-
number: 2
11-
skip: True # [not linux]
9+
number: 3
10+
skip: true # [not linux]
1211

1312
requirements:
1413
run:
@@ -18,6 +17,7 @@ test:
1817
commands:
1918
- export ICD_FN=${CONDA_PREFIX}/etc/OpenCL/vendors/intel-ocl-gpu.icd
2019
- test -h ${ICD_FN}
20+
- test -e "$(readlink ${ICD_FN})"
2121

2222
about:
2323
home: https://github.com/IntelPython/{{ name|lower }}-feedstock
@@ -45,3 +45,4 @@ about:
4545
extra:
4646
recipe-maintainers:
4747
- ndgrigorian
48+
- jharlow-intel

conda-recipe/post-link.sh

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,23 @@ systemwide_vendors=/etc/OpenCL/vendors
1818
env_vendors=${PREFIX}/etc/OpenCL/vendors
1919
env_icd_fn=$env_vendors/intel-ocl-gpu.icd
2020

21-
if [[ -d $systemwide_vendors ]]
21+
mkdir -p "$env_vendors"
22+
23+
if [[ -d "$systemwide_vendors" ]]
2224
then
23-
systemwide_icd_fn=$(grep -rl "libigdrcl" ${systemwide_vendors})
24-
if [[ -f $systemwide_icd_fn ]]
25+
systemwide_icd_fn=$(grep -rl "libigdrcl" "${systemwide_vendors}" | head -n1)
26+
if [[ -f "$systemwide_icd_fn" ]]
2527
then
26-
ln -s $systemwide_icd_fn $env_icd_fn
27-
echo "Symbolic link was successfully created. OpenCL GPU device should be discoverable by OpenCL loader.\n" >> ${PREFIX}/.messages.txt
28+
ln -s "$systemwide_icd_fn" "$env_icd_fn" || true
29+
echo "Symbolic link was successfully created. OpenCL GPU device should be discoverable by OpenCL loader.\n" >> "${PREFIX}/.messages.txt"
2830
else
29-
echo "No ICD file for Intel(R) GPU device was found in '${systemwise_vendors}'.\n" >> ${PREFIX}/.messages.txt
30-
echo "Creating default symbolic link.\n" >> ${PREFIX}/.messages.txt
31-
ln -s ${systemwide_vendors}/intel.icd $env_icd_fn
31+
echo "No ICD file for Intel(R) GPU device was found in '${systemwide_vendors}'.\n" >> "${PREFIX}/.messages.txt"
32+
if [[ -e "${systemwide_vendors}/intel.icd" ]]
33+
then
34+
echo "Creating default symbolic link.\n" >> "${PREFIX}/.messages.txt"
35+
ln -s "${systemwide_vendors}/intel.icd" "$env_icd_fn" || true
36+
fi
3237
fi
3338
else
34-
echo "Folder '${systemwide_vendors}' does not exist. \n" >> $PREFIX/.messages.txt
35-
echo "Creating default symbolic link. \n" >> ${PREFIX}/.messages.txt
36-
ln -s ${systemwide_vendors}/intel.icd $env_icd_fn
39+
echo "Folder '${systemwide_vendors}' does not exist. \n" >> "${PREFIX}/.messages.txt"
3740
fi

conda-recipe/pre-unlink.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
local_vendors=$PREFIX/etc/OpenCL/vendors
18-
icd_fn=$local_vendors/intel-ocl-gpu.icd
17+
icd_fn="${PREFIX}"/etc/OpenCL/vendors/intel-ocl-gpu.icd
1918

20-
if [[ -L $icd_fn ]]; then
21-
rm $icd_fn
19+
if [[ -L "$icd_fn" ]]; then
20+
rm "$icd_fn" || true
2221
fi

0 commit comments

Comments
 (0)