Skip to content

Commit ca01db1

Browse files
Got rid of DPCTL_DPCPP_HOME_DIR and DPCTL_DPCPP_FROM_ONEAPI
Also removed setting of DPCTL_ENABLE_L0_PROGRAM_CREATION to default value of ON.
1 parent 8506332 commit ca01db1

File tree

10 files changed

+19
-65
lines changed

10 files changed

+19
-65
lines changed

.github/workflows/generate-docs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ jobs:
6868
-DCMAKE_BUILD_TYPE=Debug \
6969
-DCMAKE_C_COMPILER:PATH=icx \
7070
-DCMAKE_CXX_COMPILER:PATH=icpx \
71-
-DDPCTL_ENABLE_L0_PROGRAM_CREATION=ON \
7271
-DDPCTL_GENERATE_DOCS=ON \
7372
-DDPCTL_ENABLE_DOXYREST=ON \
7473
-DDoxyrest_DIR=`pwd`/doxyrest-2.1.2-linux-amd64

.github/workflows/os-llvm-sycl-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,6 @@ jobs:
9797
export OCL_ICD_FILENAMES=libintelocl.so:libintelocl_emu.so
9898
clang++ --version
9999
sycl-ls
100-
python setup.py develop -- -G Ninja -DCMAKE_C_COMPILER:PATH=clang -DCMAKE_CXX_COMPILER:PATH=clang++ -DDPCTL_ENABLE_L0_PROGRAM_CREATION=ON -DDPCTL_DPCPP_HOME_DIR=$(dirname $(dirname $(which clang))) -DDPCTL_DPCPP_FROM_ONEAPI=OFF
100+
python setup.py develop -- -G Ninja -DCMAKE_C_COMPILER:PATH=clang -DCMAKE_CXX_COMPILER:PATH=clang++
101101
python -c "import dpctl; dpctl.lsplatform()" || exit 1
102102
SYCL_ENABLE_HOST_DEVICE=1 python -m pytest -v dpctl/tests

conda-recipe/bld.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set "LIB=%BUILD_PREFIX%\Library\lib;%BUILD_PREFIX%\compiler\lib;%LIB%"
44
set "INCLUDE=%BUILD_PREFIX%\include;%INCLUDE%"
55

66
"%PYTHON%" setup.py clean --all
7-
set "SKBUILD_ARGS=-- -G Ninja -DDPCTL_DPCPP_HOME_DIR=%BUILD_PREFIX%\Library -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx -DDPCTL_ENABLE_L0_PROGRAM_CREATION=ON"
7+
set "SKBUILD_ARGS=-- -G Ninja -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx"
88
set "SYCL_INCLUDE_DIR_HINT=%BUILD_PREFIX%\Library\lib\clang\14.0.0"
99

1010
set "PLATFORM_DIR=%PREFIX%\Library\share\cmake-3.22\Modules\Platform"

conda-recipe/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export LDFLAGS="$LDFLAGS -Wl,-rpath,$PREFIX/lib"
77

88
${PYTHON} setup.py clean --all
99
export CMAKE_GENERATOR="Ninja"
10-
SKBUILD_ARGS="-- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DDPCTL_ENABLE_L0_PROGRAM_CREATION=ON -DDPCTL_DPCPP_HOME_DIR=${BUILD_PREFIX}"
10+
SKBUILD_ARGS="-- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx"
1111
echo "${PYTHON} setup.py install ${SKBUILD_ARGS}"
1212

1313
# Workaround for:

docs/docfiles/user_guides/QuickStart.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Developing on Linux can also be done using driver script:
166166

167167
.. code-block:: bash
168168
169-
python scripts/build_locally.py --oneapi
169+
python scripts/build_locally.py
170170
171171
172172
Building using custom dpcpp
@@ -180,13 +180,13 @@ Following steps in `Build and install with scikit-build`_ use command line optio
180180

181181
.. code-block:: bash
182182
183-
python setup.py develop -- -G Ninja -DCMAKE_C_COMPILER:PATH=clang -DCMAKE_CXX_COMPILER:PATH=clang++ -DDPCTL_DPCPP_HOME_DIR=${DPCPP_ROOT}/llvm/build -DDPCTL_DPCPP_FROM_ONEAPI=OFF
183+
python setup.py develop -- -G Ninja -DCMAKE_C_COMPILER:PATH=$(which clang) -DCMAKE_CXX_COMPILER:PATH=$(which clang++)
184184
185185
Alterantively, the driver script can be used
186186

187187
.. code-block:: bash
188188
189-
python scripts/build_locally.py --c-compiler=clang --cxx-compiler=clang++ --compiler-root=${DPCPP_ROOT}/llvm/build
189+
python scripts/build_locally.py --c-compiler=$(which clang) --cxx-compiler=$(which clang++)
190190
191191
Available options and their descriptions can be retrieved using option
192192
:code:`--help`.

libsyclinterface/CMakeLists.txt

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@ project(
77

88
# Load our CMake modules to search for DPCPP and Level Zero
99
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
10+
1011
find_package(Git REQUIRED)
1112

12-
option(DPCTL_DPCPP_HOME_DIR
13-
"The installation home for the DPC++ toolchain compiler."
14-
OFF
15-
)
16-
option(DPCTL_DPCPP_FROM_ONEAPI
17-
"Indicates whether DPCTL_DPCPP_HOME_DIR points to a oneAPI installation."
18-
ON
19-
)
13+
if(NOT DEFINED IntelDPCPP_FOUND OR NOT IntelDPCPP_FOUND)
14+
find_package(IntelDPCPP REQUIRED)
15+
endif()
16+
2017
# Option to turn on support for creating Level Zero interoperability programs
2118
# from a SPIR-V binary file.
2219
option(DPCTL_ENABLE_L0_PROGRAM_CREATION
@@ -45,6 +42,7 @@ option(DPCTL_ENABLE_GLOG
4542
)
4643

4744
# Minimum version requirement only when oneAPI dpcpp is used.
45+
find_package(IntelDPCPP REQUIRED)
4846
if(DPCTL_DPCPP_FROM_ONEAPI)
4947
find_package(IntelSycl 2021.3.0 REQUIRED)
5048
else()
@@ -191,7 +189,7 @@ target_include_directories(DPCTLSyclInterface
191189
${CMAKE_CURRENT_SOURCE_DIR}/include/Config
192190
PRIVATE
193191
${CMAKE_CURRENT_SOURCE_DIR}/helper/include/
194-
${IntelSycl_SYCL_INCLUDE_DIR}
192+
${SYCL_INCLUDE_DIR}
195193
)
196194
target_link_libraries(DPCTLSyclInterface
197195
PRIVATE ${IntelSycl_SYCL_LIBRARY}

libsyclinterface/cmake/modules/FindIntelSycl.cmake

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -33,34 +33,7 @@
3333
# IntelSycl_OPENCL_LIBRARY
3434

3535
include(FindPackageHandleStandardArgs)
36-
37-
# Check if a specific DPC++ installation directory was provided then set
38-
# IntelSycl_ROOT to that path.
39-
if(DPCTL_DPCPP_HOME_DIR)
40-
set(IntelSycl_ROOT ${DPCTL_DPCPP_HOME_DIR})
41-
if(NOT DPCTL_DPCPP_FROM_ONEAPI)
42-
message(STATUS
43-
"Not using standard oneAPI installation, but IntelSycl at "
44-
${IntelSycl_ROOT}
45-
)
46-
endif()
47-
# If DPC++ installation was not specified, check for ONEAPI_ROOT
48-
elseif(DEFINED ENV{ONEAPI_ROOT})
49-
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
50-
set(IntelSycl_ROOT $ENV{ONEAPI_ROOT}/compiler/latest/windows)
51-
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
52-
set(IntelSycl_ROOT $ENV{ONEAPI_ROOT}/compiler/latest/linux)
53-
else()
54-
message(FATAL_ERROR "Unsupported system.")
55-
endif()
56-
else()
57-
message(FATAL_ERROR
58-
"Could not locate a DPC++ installation. Either pass the path to a "
59-
"custom location using DPCTL_DPCPP_HOME_DIR or set the "
60-
" ONEAPI_ROOT environment variable."
61-
)
62-
return()
63-
endif()
36+
find_package(IntelDPCPP REQUIRED)
6437

6538
# We will extract the version information from the compiler
6639
set(clangxx_cmd "${CMAKE_CXX_COMPILER}")
@@ -96,13 +69,13 @@ if(${clangxx_result} MATCHES "0")
9669
list(GET IntelSycl_VERSION_LIST1 0 IntelSycl_VERSION_MAJOR)
9770
list(GET IntelSycl_VERSION_LIST1 1 IntelSycl_VERSION_MINOR)
9871
list(GET IntelSycl_VERSION_LIST1 2 IntelSycl_VERSION_PATCH)
99-
set(IntelSycl_INCLUDE_DIR ${IntelSycl_ROOT}/include)
100-
set(IntelSycl_SYCL_INCLUDE_DIR ${IntelSycl_ROOT}/include/sycl)
101-
set(IntelSycl_LIBRARY_DIR ${IntelSycl_ROOT}/lib)
102-
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
72+
set(IntelSycl_INCLUDE_DIR ${SYCL_INCLUDE_DIR})
73+
set(IntelSycl_SYCL_INCLUDE_DIR ${SYCL_INCLUDE_DIR}/sycl)
74+
set(IntelSycl_LIBRARY_DIR ${SYCL_LIBRARY_DIR})
75+
if("x${CMAKE_SYSTEM_NAME}" STREQUAL "xWindows")
10376
set(IntelSycl_SYCL_LIBRARY ${IntelSycl_LIBRARY_DIR}/sycl.lib)
10477
set(IntelSycl_OPENCL_LIBRARY ${IntelSycl_LIBRARY_DIR}/OpenCL.lib)
105-
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
78+
elseif("x${CMAKE_SYSTEM_NAME}" STREQUAL "xLinux")
10679
set(IntelSycl_SYCL_LIBRARY ${IntelSycl_LIBRARY_DIR}/libsycl.so)
10780
set(IntelSycl_OPENCL_LIBRARY ${IntelSycl_LIBRARY_DIR}/libOpenCL.so)
10881
endif()
@@ -125,7 +98,6 @@ else()
12598
endif()
12699

127100
find_package_handle_standard_args(IntelSycl DEFAULT_MSG
128-
IntelSycl_ROOT
129101
IntelSycl_FOUND
130102
IntelSycl_VERSION
131103
IntelSycl_INCLUDE_DIR

scripts/build_locally.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,8 @@ def run(
5656
"-DCMAKE_C_COMPILER:PATH=" + c_compiler,
5757
"-DCMAKE_CXX_COMPILER:PATH=" + cxx_compiler,
5858
"-DDPCTL_ENABLE_L0_PROGRAM_CREATION=" + ("ON" if level_zero else "OFF"),
59-
"-DDPCTL_DPCPP_FROM_ONEAPI:BOOL=" + ("ON" if use_oneapi else "OFF"),
6059
"-DDPCTL_ENABLE_GLOG:BOOL=" + ("ON" if use_glog else "OFF"),
6160
]
62-
if compiler_root:
63-
cmake_args += [
64-
"-DDPCTL_DPCPP_HOME_DIR:PATH=" + compiler_root,
65-
]
6661
subprocess.check_call(
6762
cmake_args, shell=False, cwd=setup_dir, env=os.environ
6863
)

scripts/gen_coverage.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,7 @@ def run(
5757
"-DDPCTL_GENERATE_COVERAGE=ON",
5858
"-DDPCTL_BUILD_CAPI_TESTS=ON",
5959
"-DDPCTL_COVERAGE_REPORT_OUTPUT_DIR=" + setup_dir,
60-
"-DDPCTL_DPCPP_FROM_ONEAPI:BOOL=" + ("ON" if use_oneapi else "OFF"),
6160
]
62-
if compiler_root:
63-
cmake_args += [
64-
"-DDPCTL_DPCPP_HOME_DIR:PATH=" + compiler_root,
65-
]
6661
env = None
6762
if bin_llvm:
6863
env = {

scripts/gen_docs.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,13 @@ def run(
5353
"-DCMAKE_C_COMPILER:PATH=" + c_compiler,
5454
"-DCMAKE_CXX_COMPILER:PATH=" + cxx_compiler,
5555
"-DDPCTL_ENABLE_L0_PROGRAM_CREATION=" + ("ON" if level_zero else "OFF"),
56-
"-DDPCTL_DPCPP_FROM_ONEAPI:BOOL=" + ("ON" if use_oneapi else "OFF"),
5756
"-DDPCTL_GENERATE_DOCS=ON",
5857
]
5958

6059
if doxyrest_dir:
6160
cmake_args.append("-DDPCTL_ENABLE_DOXYREST=ON")
6261
cmake_args.append("-DDoxyrest_DIR=" + doxyrest_dir)
6362

64-
if compiler_root:
65-
cmake_args += [
66-
"-DDPCTL_DPCPP_HOME_DIR:PATH=" + compiler_root,
67-
]
6863
env = None
6964
if bin_llvm:
7065
env = {

0 commit comments

Comments
 (0)