pyrox.dev
1diff --git a/catboost/python-package/setup.py b/catboost/python-package/setup.py
2index 17f1d8ff14..07da618cd1 100644
3--- a/catboost/python-package/setup.py
4+++ b/catboost/python-package/setup.py
5@@ -80,7 +80,7 @@ class Helper(object):
6 self.with_cuda = os.environ.get('CUDA_PATH') or os.environ.get('CUDA_ROOT') or None
7 self.os_sdk = 'local'
8 self.with_ymake = True
9- self.parallel = None
10+ self.parallel = os.environ.get('NIX_BUILD_CORES') or None
11
12 def finalize_options(self):
13 if os.path.exists(str(self.with_cuda)):
14@@ -222,11 +222,12 @@ class build_ext(_build_ext):
15
16 def build_with_make(self, topsrc_dir, build_dir, catboost_ext, put_dir, verbose, dry_run):
17 logging.info('Buildling {} with gnu make'.format(catboost_ext))
18- makefile = 'python{}.{}CLANG50-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '')
19+ makefile = 'python{}.{}CLANG7-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '')
20 make_cmd = [
21 'make', '-f', '../../make/' + makefile,
22- 'CC=clang-5.0',
23- 'CXX=clang++-5.0',
24+ 'CC=clang',
25+ 'CXX=clang++',
26+ 'PYTHON=python2',
27 'BUILD_ROOT=' + build_dir,
28 'SOURCE_ROOT=' + topsrc_dir,
29 ]
30diff --git a/make/python2.CLANG7-LINUX-X86_64.makefile b/make/python2.CLANG7-LINUX-X86_64.makefile
31index e54b7078e8..fb7b208af9 100644
32--- a/make/python2.CLANG7-LINUX-X86_64.makefile
33+++ b/make/python2.CLANG7-LINUX-X86_64.makefile
34@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
35 SOURCE_ROOT = $(shell pwd)
36 PYTHON = $(shell which python)
37
38-ifneq ($(MAKECMDGOALS),help)
39-define _CC_TEST
40-__clang_major__ __clang_minor__
41-endef
42-
43-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
44-$(info _CC_VERSION = '$(_CC_VERSION)')
45-
46-ifneq '$(_CC_VERSION)' '7 0'
47- $(error clang 7.0 is required)
48-endif
49-endif
50-
51-ifneq ($(MAKECMDGOALS),help)
52-define _CXX_TEST
53-__clang_major__ __clang_minor__
54-endef
55-
56-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
57-$(info _CXX_VERSION = '$(_CXX_VERSION)')
58-
59-ifneq '$(_CXX_VERSION)' '7 0'
60- $(error clang 7.0 is required)
61-endif
62-endif
63-
64-
65 all\
66 ::\
67 $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\
68diff --git a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile
69index 2a22a79b25..522fb54a7c 100644
70--- a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile
71+++ b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile
72@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
73 SOURCE_ROOT = $(shell pwd)
74 PYTHON = $(shell which python)
75
76-ifneq ($(MAKECMDGOALS),help)
77-define _CC_TEST
78-__clang_major__ __clang_minor__
79-endef
80-
81-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
82-$(info _CC_VERSION = '$(_CC_VERSION)')
83-
84-ifneq '$(_CC_VERSION)' '7 0'
85- $(error clang 7.0 is required)
86-endif
87-endif
88-
89-ifneq ($(MAKECMDGOALS),help)
90-define _CXX_TEST
91-__clang_major__ __clang_minor__
92-endef
93-
94-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
95-$(info _CXX_VERSION = '$(_CXX_VERSION)')
96-
97-ifneq '$(_CXX_VERSION)' '7 0'
98- $(error clang 7.0 is required)
99-endif
100-endif
101-
102-
103 all\
104 ::\
105 $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\
106diff --git a/make/python3.CLANG7-LINUX-X86_64.makefile b/make/python3.CLANG7-LINUX-X86_64.makefile
107index fee6750bcb..dc55908371 100644
108--- a/make/python3.CLANG7-LINUX-X86_64.makefile
109+++ b/make/python3.CLANG7-LINUX-X86_64.makefile
110@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
111 SOURCE_ROOT = $(shell pwd)
112 PYTHON = $(shell which python)
113
114-ifneq ($(MAKECMDGOALS),help)
115-define _CC_TEST
116-__clang_major__ __clang_minor__
117-endef
118-
119-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
120-$(info _CC_VERSION = '$(_CC_VERSION)')
121-
122-ifneq '$(_CC_VERSION)' '7 0'
123- $(error clang 7.0 is required)
124-endif
125-endif
126-
127-ifneq ($(MAKECMDGOALS),help)
128-define _CXX_TEST
129-__clang_major__ __clang_minor__
130-endef
131-
132-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
133-$(info _CXX_VERSION = '$(_CXX_VERSION)')
134-
135-ifneq '$(_CXX_VERSION)' '7 0'
136- $(error clang 7.0 is required)
137-endif
138-endif
139-
140-
141 all\
142 ::\
143 $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\
144diff --git a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile
145index 5146830476..ff8535b03e 100644
146--- a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile
147+++ b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile
148@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd)
149 SOURCE_ROOT = $(shell pwd)
150 PYTHON = $(shell which python)
151
152-ifneq ($(MAKECMDGOALS),help)
153-define _CC_TEST
154-__clang_major__ __clang_minor__
155-endef
156-
157-_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)
158-$(info _CC_VERSION = '$(_CC_VERSION)')
159-
160-ifneq '$(_CC_VERSION)' '7 0'
161- $(error clang 7.0 is required)
162-endif
163-endif
164-
165-ifneq ($(MAKECMDGOALS),help)
166-define _CXX_TEST
167-__clang_major__ __clang_minor__
168-endef
169-
170-_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)
171-$(info _CXX_VERSION = '$(_CXX_VERSION)')
172-
173-ifneq '$(_CXX_VERSION)' '7 0'
174- $(error clang 7.0 is required)
175-endif
176-endif
177-
178-
179 all\
180 ::\
181 $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\