Skip to content

Replaced uses of clang compiler with icx executable #665

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 1 commit into from
Nov 9, 2021
Merged

Replaced uses of clang compiler with icx executable #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Examples of building Cython extensions with DPC++ compiler, that interoperate
with `dpctl` can be found in folder `cython`.

Each example in `cython` folder can be built using
`CC=clang CXX=dpcpp python setup.py build_ext --inplace`.
`CC=icx CXX=dpcpp python setup.py build_ext --inplace`.
Please refer to `run.py` script in respective folders to execute extensions.

Running Tests
Expand Down
4 changes: 2 additions & 2 deletions docs/docfiles/user_guides/QuickStart.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ After setting up dpctl you can try out the Python examples as follows:
The dpctl repository also provides a set of examples of building Cython
extensions with DPC++ compiler, that interoperate with dpctl. These examples are
located under *examples/cython*. Each example in the folder can be built using
``CC=clang CXX=dpcpp python setup.py build_ext --inplace``. Please refer to
``CC=icx CXX=dpcpp python setup.py build_ext --inplace``. Please refer to
``run.py`` script in respective folders to execute the Cython extension
examples.

Expand Down Expand Up @@ -252,7 +252,7 @@ library.
-DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
-DCMAKE_PREFIX_PATH=${INSTALL_PREFIX} \
-DDPCPP_INSTALL_DIR=${DPCPP_ROOT} \
-DCMAKE_C_COMPILER:PATH=${DPCPP_ROOT}/bin/clang \
-DCMAKE_C_COMPILER:PATH=${DPCPP_ROOT}/bin/icx \
-DCMAKE_CXX_COMPILER:PATH=${DPCPP_ROOT}/bin/dpcpp \
-DDPCTL_ENABLE_LO_PROGRAM_CREATION=ON \
-DDPCTL_BUILD_CAPI_TESTS=ON \
Expand Down
2 changes: 1 addition & 1 deletion dpctl-capi/cmake/modules/FindIntelSycl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ else()
endif()

# We will extract the version information from the compiler
set(clangxx_cmd "${IntelSycl_ROOT}/bin/clang++")
set(clangxx_cmd "${CMAKE_CXX_COMPILER}")
set(clangxx_arg "--version")

# Check if dpcpp is available
Expand Down
2 changes: 1 addition & 1 deletion dpctl-capi/dbg_build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ cmake -G Ninja ^
"-DCMAKE_INSTALL_PREFIX=%INSTALL_PREFIX%" ^
"-DCMAKE_PREFIX_PATH=%INSTALL_PREFIX%" ^
"-DDPCPP_INSTALL_DIR=%DPCPP_HOME%" ^
"-DCMAKE_C_COMPILER:PATH=%DPCPP_HOME%\bin\clang-cl.exe" ^
"-DCMAKE_C_COMPILER:PATH=%DPCPP_HOME%\bin\icx.exe" ^
"-DCMAKE_CXX_COMPILER:PATH=%DPCPP_HOME%\bin\dpcpp.exe" ^
"-DCMAKE_LINKER:PATH=%DPCPP_HOME%\bin\lld-link.exe" ^
"-DDPCTL_BUILD_CAPI_TESTS=ON" ^
Expand Down
2 changes: 1 addition & 1 deletion dpctl-capi/dbg_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rm -rf ${INSTALL_PREFIX}

cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_C_COMPILER=clang \
-DCMAKE_C_COMPILER=icx \
-DCMAKE_CXX_COMPILER=dpcpp \
-DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
-DCMAKE_PREFIX_PATH=${INSTALL_PREFIX} \
Expand Down
2 changes: 1 addition & 1 deletion examples/cython/sycl_buffer/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Example illustrates compiling SYCL extension, linking to oneMKL.

```
# make sure oneAPI is activated, $ONEAPI_ROOT must be set
CC=clang CXX=dpcpp python setup.py build_ext --inplace
CC=icx CXX=dpcpp python setup.py build_ext --inplace
```


Expand Down
2 changes: 1 addition & 1 deletion examples/cython/usm_memory/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Make sure oneAPI is activated. Environment variable `$ONEAPI_ROOT` must be set.


```
$ CC=clang CXX=dpcpp LD_SHARED="dpcpp -shared" \
$ CC=icx CXX=dpcpp LD_SHARED="dpcpp -shared" \
CXXFLAGS=-fno-sycl-early-optimizations python setup.py build_ext --inplace
```

Expand Down
4 changes: 2 additions & 2 deletions scripts/build_backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def build_backend(
"-DDPCTL_DPCPP_HOME_DIR=" + DPCPP_ROOT,
"-DDPCTL_DPCPP_FROM_ONEAPI=ON",
"-DCMAKE_C_COMPILER:PATH="
+ os.path.join(DPCPP_ROOT, "bin", "clang"),
+ os.path.join(DPCPP_ROOT, "bin", "icx"),
"-DCMAKE_CXX_COMPILER:PATH="
+ os.path.join(DPCPP_ROOT, "bin", "dpcpp"),
]
Expand Down Expand Up @@ -164,7 +164,7 @@ def build_backend(
"-DDPCTL_DPCPP_HOME_DIR=" + DPCPP_ROOT,
"-DDPCTL_DPCPP_FROM_ONEAPI=ON",
"-DCMAKE_C_COMPILER:PATH="
+ os.path.join(DPCPP_ROOT, "bin", "clang-cl.exe"),
+ os.path.join(DPCPP_ROOT, "bin", "icx.exe"),
"-DCMAKE_CXX_COMPILER:PATH="
+ os.path.join(DPCPP_ROOT, "bin", "dpcpp.exe"),
]
Expand Down
4 changes: 2 additions & 2 deletions scripts/build_for_develop.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cmake -G Ninja ^
"-DCMAKE_INSTALL_PREFIX=%INSTALL_PREFIX%" ^
"-DCMAKE_PREFIX_PATH=%INSTALL_PREFIX%" ^
"-DDPCPP_ROOT=%DPCPP_ROOT%" ^
"-DCMAKE_C_COMPILER:PATH=%DPCPP_ROOT%\bin\clang-cl.exe" ^
"-DCMAKE_C_COMPILER:PATH=%DPCPP_ROOT%\bin\icx.exe" ^
"-DCMAKE_CXX_COMPILER:PATH=%DPCPP_ROOT%\bin\dpcpp.exe" ^
"-DBUILD_CAPI_TESTS=%_BUILD_CAPI_TEST%" ^
"%cd%\..\dpctl-capi"
Expand All @@ -57,7 +57,7 @@ xcopy dpctl-capi\include dpctl\include /E /Y
REM required by _sycl_core(dpctl)
set "DPCTL_SYCL_INTERFACE_LIBDIR=dpctl"
set "DPCTL_SYCL_INTERFACE_INCLDIR=dpctl\include"
set "CC=clang-cl.exe"
set "CC=icx.exe"
set "CXX=dpcpp.exe"

python setup.py clean --all
Expand Down