Skip to content

Commit 161946e

Browse files
committed
align conda-forge workflow recipe with feedstock recipe
1 parent e88f9b9 commit 161946e

File tree

2 files changed

+5
-27
lines changed

2 files changed

+5
-27
lines changed

conda-recipe-cf/bld.bat

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
11
set MKLROOT=%PREFIX%
2-
3-
rem Build wheel package
4-
if NOT "%WHEELS_OUTPUT_FOLDER%"=="" (
5-
%PYTHON% -m pip wheel --no-build-isolation --no-deps .
6-
if errorlevel 1 exit 1
7-
copy mkl_fft*.whl %WHEELS_OUTPUT_FOLDER%
8-
if errorlevel 1 exit 1
9-
) ELSE (
10-
rem Build conda package
11-
%PYTHON% -m pip install --no-build-isolation --no-deps .
12-
if errorlevel 1 exit 1
13-
)
2+
%PYTHON% setup.py build --force install --old-and-unmanageable
3+
if errorlevel 1 exit 1

conda-recipe-cf/build.sh

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
#!/bin/bash -x
22

3-
export MKLROOT=$PREFIX
4-
export CFLAGS="-I$PREFIX/include $CFLAGS"
5-
export LDFLAGS="-Wl,-rpath,\$ORIGIN/../.. -Wl,-rpath,\$ORIGIN/../../.. -L${PREFIX}/lib ${LDFLAGS}"
3+
# make sure that compiler has been sourced, if necessary
64

7-
read -r GLIBC_MAJOR GLIBC_MINOR <<<"$(conda list '^sysroot_linux-64$' \
8-
| tail -n 1 | awk '{print $2}' | grep -oP '\d+' | head -n 2 | tr '\n' ' ')"
9-
10-
# Build wheel package
11-
if [ -n "${WHEELS_OUTPUT_FOLDER}" ]; then
12-
$PYTHON -m pip wheel --no-build-isolation --no-deps .
13-
${PYTHON} -m wheel tags --remove --platform-tag "manylinux_${GLIBC_MAJOR}_${GLIBC_MINOR}_x86_64" mkl_fft*.whl
14-
cp mkl_fft*.whl "${WHEELS_OUTPUT_FOLDER}"
15-
else
16-
# Build conda package
17-
$PYTHON -m pip install --no-build-isolation --no-deps .
18-
fi
5+
export MKLROOT=${PREFIX}
6+
$PYTHON setup.py build --force install --old-and-unmanageable

0 commit comments

Comments
 (0)