Skip to content

Commit 489b970

Browse files
authored
Change default compiler name (#352)
* Change default compiler name * adjust the backend linker name and make python extensions compiler default
1 parent dca8843 commit 489b970

File tree

4 files changed

+24
-18
lines changed

4 files changed

+24
-18
lines changed

dpnp/backend/backend_pstl.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
#define BACKEND_PSTL_H
4040

4141
#pragma clang diagnostic push
42-
#pragma clang diagnostic ignored "-Wunused-local-typedef"
43-
#pragma clang diagnostic ignored "-Wunknown-pragmas"
42+
// #pragma clang diagnostic ignored "-Wunused-local-typedef"
43+
// #pragma clang diagnostic ignored "-Wunknown-pragmas"
4444
#pragma clang diagnostic ignored "-Wsign-compare"
45-
#pragma clang diagnostic ignored "-Wunused-variable"
45+
// #pragma clang diagnostic ignored "-Wunused-variable"
4646
#pragma clang diagnostic ignored "-Wunused-parameter"
4747
#pragma clang diagnostic ignored "-Wshadow"
4848

dpnp/backend/queue_sycl.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@
2727
#ifndef QUEUE_SYCL_H // Cython compatibility
2828
#define QUEUE_SYCL_H
2929

30+
#pragma clang diagnostic push
31+
#pragma clang diagnostic ignored "-Wpass-failed"
3032
#include <CL/sycl.hpp>
33+
#pragma clang diagnostic pop
3134

3235
#pragma clang diagnostic push
3336
#pragma clang diagnostic ignored "-Wunused-parameter"

setup.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@
113113
Set compiler for the project
114114
"""
115115
# default variables (for Linux)
116-
_project_compiler = "clang++"
117-
_project_linker = "clang++"
116+
_project_compiler = "dpcpp"
117+
_project_linker = "dpcpp"
118118
_project_cmplr_flag_sycl_devel = ["-fsycl-device-code-split=per_kernel"]
119119
_project_cmplr_flag_sycl = ["-fsycl"]
120120
_project_cmplr_flag_compatibility = ["-Wl,--enable-new-dtags"]
@@ -176,19 +176,19 @@
176176
_sdl_ldflags = ["-NXCompat", "-DynamicBase"]
177177

178178

179-
try:
180-
"""
181-
set environment variables to control setuptools build procedure
182-
"""
183-
# check if we have preset variables in environment
184-
os.environ["CC"] == _project_compiler
185-
os.environ["CXX"] == _project_compiler
186-
os.environ["LD"] == _project_linker
187-
except KeyError:
188-
# set variables if not presented in environment
189-
os.environ["CC"] = _project_compiler
190-
os.environ["CXX"] = _project_compiler
191-
os.environ["LD"] = _project_linker
179+
# try:
180+
# """
181+
# set environment variables to control setuptools build procedure
182+
# """
183+
# # check if we have preset variables in environment
184+
# os.environ["CC"] == _project_compiler
185+
# os.environ["CXX"] == _project_compiler
186+
# os.environ["LD"] == _project_linker
187+
# except KeyError:
188+
# # set variables if not presented in environment
189+
# os.environ["CC"] = _project_compiler
190+
# os.environ["CXX"] = _project_compiler
191+
# os.environ["LD"] = _project_linker
192192

193193

194194
"""

utils/command_build_clib.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,10 @@ def build_libraries(self, libraries):
9090

9191
# set compiler and options
9292
self.compiler.compiler_so = compiler + default_flags
93+
self.compiler.compiler = self.compiler.compiler_so
94+
self.compiler.compiler_cxx = self.compiler.compiler_so
9395
self.compiler.linker_so = linker + default_flags
96+
self.compiler.linker_exe = self.compiler.linker_so
9497

9598
objects = []
9699
"""

0 commit comments

Comments
 (0)