diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh index 7b533bee36..951e76366b 100755 --- a/conda-recipe/build.sh +++ b/conda-recipe/build.sh @@ -5,7 +5,9 @@ # activation scripts. export LDFLAGS="$LDFLAGS -Wl,-rpath,$PREFIX/lib" -${PYTHON} setup.py clean --all +if [ -e "_skbuild" ]; then + ${PYTHON} setup.py clean --all +fi export CMAKE_GENERATOR="Ninja" SKBUILD_ARGS="-- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx" echo "${PYTHON} setup.py install ${SKBUILD_ARGS}" diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 00dc5f7bc4..e17668fb61 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -16,10 +16,11 @@ requirements: - {{ compiler('dpcpp') }} >=2022.1 # [not osx] host: - setuptools - - cython - cmake >=3.21 - - python - ninja + - git + - cython + - python - scikit-build - numpy - wheel diff --git a/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake b/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake index 2929c33298..fe109fc03a 100644 --- a/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake +++ b/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake @@ -39,7 +39,7 @@ function(get_level_zero_headers) if(NOT result EQUAL 0) message(FATAL_ERROR - "Could not update Level Zero sources." + "Could not update Level Zero sources. Return code: ${result}" ) endif() else() @@ -54,7 +54,7 @@ function(get_level_zero_headers) if(NOT result EQUAL 0) message(FATAL_ERROR - "Could not clone Level Zero sources from github.com/oneapi-src/level-zero." + "Could not clone Level Zero sources from github.com/oneapi-src/level-zero. Return code: ${result}" ) endif() endif() @@ -72,7 +72,7 @@ function(get_level_zero_headers) if(NOT result EQUAL 0) message(FATAL_ERROR - "Could not get the name for the latest release." + "Could not get the name for the latest release. Return code: ${result}" ) endif() @@ -88,7 +88,7 @@ function(get_level_zero_headers) if(NOT result EQUAL 0) message(FATAL_ERROR - "Could not checkout the latest release." + "Could not checkout the latest release. Return code: ${result}" ) endif()