Something went wrong. Try again.
What happens if I push all of nixpkgs
Something went wrong. Try again.
5.0 kB · 173 lines
at litex
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174diff --git a/catboost/python-package/setup.py b/catboost/python-package/setup.pyindex fe9251a21f..86b880c5d0 100644--- a/catboost/python-package/setup.py+++ b/catboost/python-package/setup.py@@ -80,7 +80,7 @@ class Helper(object): self.with_cuda = os.environ.get('CUDA_PATH') or os.environ.get('CUDA_ROOT') or None self.os_sdk = 'local' self.with_ymake = True- self.parallel = None+ self.parallel = os.environ.get('NIX_BUILD_CORES') or None def finalize_options(self): if os.path.exists(str(self.with_cuda)):@@ -222,11 +222,12 @@ class build_ext(_build_ext): def build_with_make(self, topsrc_dir, build_dir, catboost_ext, put_dir, verbose, dry_run): logging.info('Buildling {} with gnu make'.format(catboost_ext))- makefile = 'python{}.{}CLANG11-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '')+ makefile = 'python{}.{}CLANG12-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '') make_cmd = [ 'make', '-f', '../../make/' + makefile,- 'CC=clang-11',- 'CXX=clang++-11',+ 'CC=clang',+ 'CXX=clang++',+ 'PYTHON=python{}'.format(python_version()[0]), 'BUILD_ROOT=' + build_dir, 'SOURCE_ROOT=' + topsrc_dir, ]diff --git a/make/python2.CLANG12-LINUX-X86_64.makefile b/make/python2.CLANG12-LINUX-X86_64.makefileindex b49a36fb3f..33996af995 100644--- a/make/python2.CLANG12-LINUX-X86_64.makefile+++ b/make/python2.CLANG12-LINUX-X86_64.makefile@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) SOURCE_ROOT = $(shell pwd) PYTHON = $(shell which python) -ifneq ($(MAKECMDGOALS),help)-define _CC_TEST-__clang_major__ __clang_minor__-endef--_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)-$(info _CC_VERSION = '$(_CC_VERSION)')--ifneq '$(_CC_VERSION)' '12 0'- $(error clang 12.0 is required)-endif-endif--ifneq ($(MAKECMDGOALS),help)-define _CXX_TEST-__clang_major__ __clang_minor__-endef--_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)-$(info _CXX_VERSION = '$(_CXX_VERSION)')--ifneq '$(_CXX_VERSION)' '12 0'- $(error clang 12.0 is required)-endif-endif all\diff --git a/make/python2.CUDA.CLANG12-LINUX-X86_64.makefile b/make/python2.CUDA.CLANG12-LINUX-X86_64.makefileindex 82935b297e..093cc86532 100644--- a/make/python2.CUDA.CLANG12-LINUX-X86_64.makefile+++ b/make/python2.CUDA.CLANG12-LINUX-X86_64.makefile@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) SOURCE_ROOT = $(shell pwd) PYTHON = $(shell which python) -ifneq ($(MAKECMDGOALS),help)-define _CC_TEST-__clang_major__ __clang_minor__-endef--_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)-$(info _CC_VERSION = '$(_CC_VERSION)')--ifneq '$(_CC_VERSION)' '12 0'- $(error clang 12.0 is required)-endif-endif--ifneq ($(MAKECMDGOALS),help)-define _CXX_TEST-__clang_major__ __clang_minor__-endef--_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)-$(info _CXX_VERSION = '$(_CXX_VERSION)')--ifneq '$(_CXX_VERSION)' '12 0'- $(error clang 12.0 is required)-endif-endif all\diff --git a/make/python3.CLANG12-LINUX-X86_64.makefile b/make/python3.CLANG12-LINUX-X86_64.makefileindex 1c5d646ae4..6c091fbe17 100644--- a/make/python3.CLANG12-LINUX-X86_64.makefile+++ b/make/python3.CLANG12-LINUX-X86_64.makefile@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) SOURCE_ROOT = $(shell pwd) PYTHON = $(shell which python) -ifneq ($(MAKECMDGOALS),help)-define _CC_TEST-__clang_major__ __clang_minor__-endef--_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)-$(info _CC_VERSION = '$(_CC_VERSION)')--ifneq '$(_CC_VERSION)' '12 0'- $(error clang 12.0 is required)-endif-endif--ifneq ($(MAKECMDGOALS),help)-define _CXX_TEST-__clang_major__ __clang_minor__-endef--_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)-$(info _CXX_VERSION = '$(_CXX_VERSION)')--ifneq '$(_CXX_VERSION)' '12 0'- $(error clang 12.0 is required)-endif-endif all\diff --git a/make/python3.CUDA.CLANG12-LINUX-X86_64.makefile b/make/python3.CUDA.CLANG12-LINUX-X86_64.makefileindex fcdb75a719..4e1dbc3cd7 100644--- a/make/python3.CUDA.CLANG12-LINUX-X86_64.makefile+++ b/make/python3.CUDA.CLANG12-LINUX-X86_64.makefile@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) SOURCE_ROOT = $(shell pwd) PYTHON = $(shell which python) -ifneq ($(MAKECMDGOALS),help)-define _CC_TEST-__clang_major__ __clang_minor__-endef--_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -)-$(info _CC_VERSION = '$(_CC_VERSION)')--ifneq '$(_CC_VERSION)' '12 0'- $(error clang 12.0 is required)-endif-endif--ifneq ($(MAKECMDGOALS),help)-define _CXX_TEST-__clang_major__ __clang_minor__-endef--_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -)-$(info _CXX_VERSION = '$(_CXX_VERSION)')--ifneq '$(_CXX_VERSION)' '12 0'- $(error clang 12.0 is required)-endif-endif all\