Skip to content

Fixed build_locally.py to allow building debug build #835

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
merged 7 commits into from
May 13, 2022
Merged

Fixed build_locally.py to allow building debug build #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7eff62e
Fixed build_locally.py to allow building debug build
oleksandr-pavlyk May 13, 2022
3af54d8
Fixed gen_coverage.py to build debug build
oleksandr-pavlyk May 13, 2022
3dbe477
Fixed gen_docs.py to build debug build
oleksandr-pavlyk May 13, 2022
322b64d
Fixed python setup.py invocation to pass generator to scikit-build ra…
oleksandr-pavlyk May 13, 2022
3543c5c
Fixed generate-docs workflows to pass generatro and build type to sci…
oleksandr-pavlyk May 13, 2022
0634194
Simplifed python setup.py call in os-llvm-sycl-build workflow
oleksandr-pavlyk May 13, 2022
4a92dba
Pass generator to scikit-build rather than cmake directly
oleksandr-pavlyk May 13, 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
3 changes: 1 addition & 2 deletions .github/workflows/conda-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,7 @@ jobs:
conda activate --stack build_env
if [ -e CMakeLists.txt ]
then
python setup.py build_ext --inplace -- -G Ninja \
-DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx \
CC=icx CXX=icpx python setup.py build_ext --inplace -G Ninja -- \
-DTBB_LIBRARY_DIR=${TBBROOT}/lib \
-DMKL_LIBRARY_DIR=${MKLROOT}/lib \
-DMKL_INCLUDE_DIR=${MKLROOT}/include \
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/generate-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,12 @@ jobs:
source /opt/intel/oneapi/setvars.sh
wget https://github.com/vovkos/doxyrest/releases/download/doxyrest-2.1.2/doxyrest-2.1.2-linux-amd64.tar.xz
tar xf doxyrest-2.1.2-linux-amd64.tar.xz
python setup.py develop -- \
-G "Ninja" \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_C_COMPILER:PATH=icx \
-DCMAKE_CXX_COMPILER:PATH=icpx \
-DDPCTL_GENERATE_DOCS=ON \
-DDPCTL_ENABLE_DOXYREST=ON \
python setup.py develop -G Ninja --build-type=Debug \
-- \
-DCMAKE_C_COMPILER:PATH=$(which icx) \
-DCMAKE_CXX_COMPILER:PATH=$(which icpx) \
-DDPCTL_GENERATE_DOCS=ON \
-DDPCTL_ENABLE_DOXYREST=ON \
-DDoxyrest_DIR=`pwd`/doxyrest-2.1.2-linux-amd64
python -c "import dpctl; print(dpctl.__version__)" || exit 1
cd "$(find _skbuild -name cmake-build)" || exit 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/os-llvm-sycl-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,6 @@ jobs:
export OCL_ICD_FILENAMES=libintelocl.so:libintelocl_emu.so
clang++ --version
sycl-ls
python setup.py develop -- -G Ninja -DCMAKE_C_COMPILER:PATH=clang -DCMAKE_CXX_COMPILER:PATH=clang++
CC=clang CXX=clang++ python setup.py develop -G Ninja
python -c "import dpctl; dpctl.lsplatform()" || exit 1
SYCL_ENABLE_HOST_DEVICE=1 python -m pytest -v dpctl/tests
2 changes: 1 addition & 1 deletion conda-recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set "LIB=%BUILD_PREFIX%\Library\lib;%BUILD_PREFIX%\compiler\lib;%LIB%"
set "INCLUDE=%BUILD_PREFIX%\include;%INCLUDE%"

"%PYTHON%" setup.py clean --all
set "SKBUILD_ARGS=-- -G Ninja -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx"
set "SKBUILD_ARGS=-G Ninja -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx"
set "SYCL_INCLUDE_DIR_HINT=%BUILD_PREFIX%\Library\lib\clang\14.0.0"

set "PLATFORM_DIR=%PREFIX%\Library\share\cmake-3.22\Modules\Platform"
Expand Down
5 changes: 2 additions & 3 deletions scripts/build_locally.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,9 @@ def run(
"--cmake-executable=" + cmake_executable,
]
cmake_args += [
"--build-type=" + build_type,
"--generator=" + build_system,
"--",
"-G",
build_system,
"-DCMAKE_BUILD_TYPE=" + build_type,
"-DCMAKE_C_COMPILER:PATH=" + c_compiler,
"-DCMAKE_CXX_COMPILER:PATH=" + cxx_compiler,
"-DDPCTL_ENABLE_L0_PROGRAM_CREATION=" + ("ON" if level_zero else "OFF"),
Expand Down
5 changes: 2 additions & 3 deletions scripts/gen_coverage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@ def run(
sys.executable,
"setup.py",
"develop",
"--build-type=Debug",
"--generator=Ninja",
"--",
"-G",
"Ninja",
"-DCMAKE_BUILD_TYPE=Debug",
"-DCMAKE_C_COMPILER:PATH=" + c_compiler,
"-DCMAKE_CXX_COMPILER:PATH=" + cxx_compiler,
"-DDPCTL_ENABLE_L0_PROGRAM_CREATION=" + ("ON" if level_zero else "OFF"),
Expand Down
5 changes: 2 additions & 3 deletions scripts/gen_docs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,9 @@ def run(
sys.executable,
"setup.py",
"develop",
"--build-type=Debug",
"--generator=Ninja",
"--",
"-G",
"Ninja",
"-DCMAKE_BUILD_TYPE=Debug",
"-DCMAKE_C_COMPILER:PATH=" + c_compiler,
"-DCMAKE_CXX_COMPILER:PATH=" + cxx_compiler,
"-DDPCTL_ENABLE_L0_PROGRAM_CREATION=" + ("ON" if level_zero else "OFF"),
Expand Down