diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index ce0f3c36d3..eb3f253945 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -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 \ diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml index 63b3942033..6452f886de 100644 --- a/.github/workflows/generate-docs.yml +++ b/.github/workflows/generate-docs.yml @@ -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 diff --git a/.github/workflows/os-llvm-sycl-build.yml b/.github/workflows/os-llvm-sycl-build.yml index 6f84bb1004..adedc446f7 100644 --- a/.github/workflows/os-llvm-sycl-build.yml +++ b/.github/workflows/os-llvm-sycl-build.yml @@ -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 diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat index 9cf6c78466..c4071c86c6 100644 --- a/conda-recipe/bld.bat +++ b/conda-recipe/bld.bat @@ -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" diff --git a/scripts/build_locally.py b/scripts/build_locally.py index 0486fe53a9..2f5098044f 100644 --- a/scripts/build_locally.py +++ b/scripts/build_locally.py @@ -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"), diff --git a/scripts/gen_coverage.py b/scripts/gen_coverage.py index 0e79d565c9..58eea04ecc 100644 --- a/scripts/gen_coverage.py +++ b/scripts/gen_coverage.py @@ -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"), diff --git a/scripts/gen_docs.py b/scripts/gen_docs.py index d833ad0b31..ab1daf51f7 100644 --- a/scripts/gen_docs.py +++ b/scripts/gen_docs.py @@ -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"),