Skip to content

Fix inconsistency system git and conda env #1001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oleksandr-pavlyk merged 3 commits into from
Nov 28, 2022
Merged

Fix inconsistency system git and conda env #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
406ec3b
Add git as build-time dependency to ensure consistency with conda env.
oleksandr-pavlyk Nov 28, 2022
e0de6fa
Only run clean if _skbuild/ exists
oleksandr-pavlyk Nov 28, 2022
701f708
Fatal error message after execute_process includes return code.
oleksandr-pavlyk Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion conda-recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
5 changes: 3 additions & 2 deletions conda-recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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()

Expand All @@ -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()

Expand Down