Skip to content

Commit f11b37f

Browse files
committed
add CC=icx to recipe
1 parent 025903f commit f11b37f

File tree

5 files changed

+13
-5
lines changed

5 files changed

+13
-5
lines changed

.github/workflows/build_pip.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
pip install --no-cache-dir numpy ${{ matrix.use_pre }}
5353
echo "CONDA_PREFFIX is '${CONDA_PREFIX}'"
5454
export MKLROOT=${CONDA_PREFIX}
55-
CC=icx pip install . --no-build-isolation --no-deps --verbose
55+
pip install . --no-build-isolation --no-deps --verbose
5656
pip install --no-cache-dir pytest
5757
pip list
5858
# mkl_umath cannot be installed in editable mode, we need

conda-recipe-cf/bld.bat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ set "INCLUDE=%BUILD_PREFIX%\include;%INCLUDE%"
55
"%PYTHON%" setup.py clean --all
66
set "SKBUILD_ARGS=-G Ninja -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
77

8+
set "CC=icx"
9+
810
FOR %%V IN (14.0.0 14 15.0.0 15 16.0.0 16 17.0.0 17) DO @(
911
REM set DIR_HINT if directory exists
1012
IF EXIST "%BUILD_PREFIX%\Library\lib\clang\%%V\" (
@@ -20,6 +22,6 @@ if NOT "%WHEELS_OUTPUT_FOLDER%"=="" (
2022
if errorlevel 1 exit 1
2123
) ELSE (
2224
rem Only install
23-
"%PYTHON%" setup.py install %SKBUILD_ARGS%
25+
"%PYTHON%" -m pip install . --no-build-isolation --no-deps --config-settings=cmake.args="${SKBUILD_ARGS}"
2426
if errorlevel 1 exit 1
2527
)

conda-recipe-cf/build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ export ICXCFG="$(pwd)/icx_for_conda.cfg"
88
read -r GLIBC_MAJOR GLIBC_MINOR <<< "$(conda list '^sysroot_linux-64$' \
99
| tail -n 1 | awk '{print $2}' | grep -oP '\d+' | head -n 2 | tr '\n' ' ')"
1010

11+
export CC=icx
12+
1113
export CMAKE_GENERATOR="Ninja"
1214
SKBUILD_ARGS="-- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
1315

@@ -18,5 +20,5 @@ if [ -n "${WHEELS_OUTPUT_FOLDER}" ]; then
1820
cp dist/mkl_umath*.whl ${WHEELS_OUTPUT_FOLDER}
1921
else
2022
# Perform regular install
21-
${PYTHON} setup.py install ${SKBUILD_ARGS}
23+
${PYTHON} -m pip install . --no-build-isolation --no-deps --config-settings=cmake.args="${SKBUILD_ARGS}"
2224
fi

conda-recipe/bld.bat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ set "INCLUDE=%BUILD_PREFIX%\include;%INCLUDE%"
55
"%PYTHON%" setup.py clean --all
66
set "SKBUILD_ARGS=-G Ninja -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
77

8+
set "CC=icx"
9+
810
if NOT "%WHEELS_OUTPUT_FOLDER%"=="" (
911
rem Install and assemble wheel package from the build bits
1012
"%PYTHON%" setup.py install bdist_wheel %SKBUILD_ARGS%
@@ -13,6 +15,6 @@ if NOT "%WHEELS_OUTPUT_FOLDER%"=="" (
1315
if errorlevel 1 exit 1
1416
) ELSE (
1517
rem Only install
16-
"%PYTHON%" setup.py install %SKBUILD_ARGS%
18+
"%PYTHON%" -m pip install . --no-build-isolation --no-deps --config-settings=cmake.args="${SKBUILD_ARGS}"
1719
if errorlevel 1 exit 1
1820
)

conda-recipe/build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ export ICXCFG="$(pwd)/icx_for_conda.cfg"
88
read -r GLIBC_MAJOR GLIBC_MINOR <<< "$(conda list '^sysroot_linux-64$' \
99
| tail -n 1 | awk '{print $2}' | grep -oP '\d+' | head -n 2 | tr '\n' ' ')"
1010

11+
export CC=icx
12+
1113
export CMAKE_GENERATOR="Ninja"
1214
SKBUILD_ARGS="-- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
1315

@@ -18,5 +20,5 @@ if [ -n "${WHEELS_OUTPUT_FOLDER}" ]; then
1820
cp dist/mkl_umath*.whl ${WHEELS_OUTPUT_FOLDER}
1921
else
2022
# Perform regular install
21-
${PYTHON} setup.py install ${SKBUILD_ARGS}
23+
${PYTHON} -m pip install . --no-build-isolation --no-deps --config-settings=cmake.args="${SKBUILD_ARGS}"
2224
fi

0 commit comments

Comments
 (0)