aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authortobo <tobo@yandex-team.ru>2022-02-10 16:47:27 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:47:27 +0300
commit55a7f90e4cd31e9481cace8ee5dfd682c27e810e (patch)
tree9814fbd1c3effac9b8377c5d604b367b14e2db55 /build
parent7fe839092527589b38f014d854c51565b3c1adfa (diff)
downloadydb-55a7f90e4cd31e9481cace8ee5dfd682c27e810e.tar.gz
Restoring authorship annotation for <tobo@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'build')
-rw-r--r--build/plugins/_common.py4
-rw-r--r--build/plugins/res.py2
-rwxr-xr-xbuild/scripts/build_catboost.py142
-rw-r--r--build/scripts/gen_yql_python_udf.py2
-rw-r--r--build/ymake.core.conf26
5 files changed, 88 insertions, 88 deletions
diff --git a/build/plugins/_common.py b/build/plugins/_common.py
index bcc8c5e5c0d..2f831a94db6 100644
--- a/build/plugins/_common.py
+++ b/build/plugins/_common.py
@@ -1,6 +1,6 @@
import sys
import hashlib
-import base64
+import base64
class Result(object):
@@ -22,7 +22,7 @@ def lazy(func):
def pathid(path):
- return base64.b32encode(hashlib.md5(path).digest()).lower().strip('=')
+ return base64.b32encode(hashlib.md5(path).digest()).lower().strip('=')
def listid(l):
diff --git a/build/plugins/res.py b/build/plugins/res.py
index 65419725934..a937caba816 100644
--- a/build/plugins/res.py
+++ b/build/plugins/res.py
@@ -41,7 +41,7 @@ def onfat_resource(unit, *args):
# we make several calls of rescompiler
# https://msdn.microsoft.com/ru-ru/library/windows/desktop/ms682425.aspx
for part_args in split(args, 8000):
- output = listid(part_args) + '.cpp'
+ output = listid(part_args) + '.cpp'
inputs = [x for x, y in iterpair(part_args) if x != '-']
if inputs:
inputs = ['IN'] + inputs
diff --git a/build/scripts/build_catboost.py b/build/scripts/build_catboost.py
index b5694069e77..78334fc5f76 100755
--- a/build/scripts/build_catboost.py
+++ b/build/scripts/build_catboost.py
@@ -1,71 +1,71 @@
-import sys
-import os
-import shutil
-import re
-import subprocess
-
-def get_value(val):
- dct = val.split('=', 1)
- if len(dct) > 1:
- return dct[1]
- return ''
-
-
-class BuildCbBase(object):
- def run(self, cbmodel, cbname, cb_cpp_path):
-
- data_prefix = "CB_External_"
- data = data_prefix + cbname
- datasize = data + "Size"
-
- cbtype = "const NCatboostCalcer::TCatboostCalcer"
- cbload = "(ReadModel({0}, {1}, EModelType::CatboostBinary))".format(data, datasize)
-
- cb_cpp_tmp_path = cb_cpp_path + ".tmp"
- cb_cpp_tmp = open(cb_cpp_tmp_path, 'w')
-
- cb_cpp_tmp.write("#include <kernel/catboost/catboost_calcer.h>\n")
-
- ro_data_path = os.path.dirname(cb_cpp_path) + "/" + data_prefix + cbname + ".rodata"
- cb_cpp_tmp.write("namespace{\n")
- cb_cpp_tmp.write(" extern \"C\" {\n")
- cb_cpp_tmp.write(" extern const unsigned char {1}{0}[];\n".format(cbname, data_prefix))
- cb_cpp_tmp.write(" extern const ui32 {1}{0}Size;\n".format(cbname, data_prefix))
- cb_cpp_tmp.write(" }\n")
- cb_cpp_tmp.write("}\n")
- archiverCall = subprocess.Popen([self.archiver, "-q", "-p", "-o", ro_data_path, cbmodel], stdout=None, stderr=subprocess.PIPE)
- archiverCall.wait()
- cb_cpp_tmp.write("extern {0} {1};\n".format(cbtype, cbname))
- cb_cpp_tmp.write("{0} {1}{2};".format(cbtype, cbname, cbload))
- cb_cpp_tmp.close()
- shutil.move(cb_cpp_tmp_path, cb_cpp_path)
-
-class BuildCb(BuildCbBase):
- def run(self, argv):
- if len(argv) < 5:
- print >>sys.stderr, "BuildCb.Run(<ARCADIA_ROOT> <archiver> <mninfo> <mnname> <cppOutput> [params...])"
- sys.exit(1)
-
- self.SrcRoot = argv[0]
- self.archiver = argv[1]
- cbmodel = argv[2]
- cbname = argv[3]
- cb_cpp_path = argv[4]
-
- super(BuildCb, self).run(cbmodel, cbname, cb_cpp_path)
-
-
-def build_cb_f(argv):
- build_cb = BuildCb()
- build_cb.run(argv)
-
-
-if __name__ == '__main__':
- if len(sys.argv) < 2:
- print >>sys.stderr, "Usage: build_cb.py <funcName> <args...>"
- sys.exit(1)
-
- if (sys.argv[2:]):
- globals()[sys.argv[1]](sys.argv[2:])
- else:
- globals()[sys.argv[1]]()
+import sys
+import os
+import shutil
+import re
+import subprocess
+
+def get_value(val):
+ dct = val.split('=', 1)
+ if len(dct) > 1:
+ return dct[1]
+ return ''
+
+
+class BuildCbBase(object):
+ def run(self, cbmodel, cbname, cb_cpp_path):
+
+ data_prefix = "CB_External_"
+ data = data_prefix + cbname
+ datasize = data + "Size"
+
+ cbtype = "const NCatboostCalcer::TCatboostCalcer"
+ cbload = "(ReadModel({0}, {1}, EModelType::CatboostBinary))".format(data, datasize)
+
+ cb_cpp_tmp_path = cb_cpp_path + ".tmp"
+ cb_cpp_tmp = open(cb_cpp_tmp_path, 'w')
+
+ cb_cpp_tmp.write("#include <kernel/catboost/catboost_calcer.h>\n")
+
+ ro_data_path = os.path.dirname(cb_cpp_path) + "/" + data_prefix + cbname + ".rodata"
+ cb_cpp_tmp.write("namespace{\n")
+ cb_cpp_tmp.write(" extern \"C\" {\n")
+ cb_cpp_tmp.write(" extern const unsigned char {1}{0}[];\n".format(cbname, data_prefix))
+ cb_cpp_tmp.write(" extern const ui32 {1}{0}Size;\n".format(cbname, data_prefix))
+ cb_cpp_tmp.write(" }\n")
+ cb_cpp_tmp.write("}\n")
+ archiverCall = subprocess.Popen([self.archiver, "-q", "-p", "-o", ro_data_path, cbmodel], stdout=None, stderr=subprocess.PIPE)
+ archiverCall.wait()
+ cb_cpp_tmp.write("extern {0} {1};\n".format(cbtype, cbname))
+ cb_cpp_tmp.write("{0} {1}{2};".format(cbtype, cbname, cbload))
+ cb_cpp_tmp.close()
+ shutil.move(cb_cpp_tmp_path, cb_cpp_path)
+
+class BuildCb(BuildCbBase):
+ def run(self, argv):
+ if len(argv) < 5:
+ print >>sys.stderr, "BuildCb.Run(<ARCADIA_ROOT> <archiver> <mninfo> <mnname> <cppOutput> [params...])"
+ sys.exit(1)
+
+ self.SrcRoot = argv[0]
+ self.archiver = argv[1]
+ cbmodel = argv[2]
+ cbname = argv[3]
+ cb_cpp_path = argv[4]
+
+ super(BuildCb, self).run(cbmodel, cbname, cb_cpp_path)
+
+
+def build_cb_f(argv):
+ build_cb = BuildCb()
+ build_cb.run(argv)
+
+
+if __name__ == '__main__':
+ if len(sys.argv) < 2:
+ print >>sys.stderr, "Usage: build_cb.py <funcName> <args...>"
+ sys.exit(1)
+
+ if (sys.argv[2:]):
+ globals()[sys.argv[1]](sys.argv[2:])
+ else:
+ globals()[sys.argv[1]]()
diff --git a/build/scripts/gen_yql_python_udf.py b/build/scripts/gen_yql_python_udf.py
index 643b594411a..13b58981170 100644
--- a/build/scripts/gen_yql_python_udf.py
+++ b/build/scripts/gen_yql_python_udf.py
@@ -18,7 +18,7 @@ LIBRA_MODULE(TLibraModule, "Libra@MODULE_NAME@");
#endif
extern "C" UDF_API void Register(IRegistrator& registrator, ui32 flags) {
- RegisterYqlPythonUdf(registrator, flags, TStringBuf("@MODULE_NAME@"), TStringBuf("@PACKAGE_NAME@"), EPythonFlavor::@FLAVOR@);
+ RegisterYqlPythonUdf(registrator, flags, TStringBuf("@MODULE_NAME@"), TStringBuf("@PACKAGE_NAME@"), EPythonFlavor::@FLAVOR@);
#if @WITH_LIBRA@
RegisterHelper<TLibraModule>(registrator);
#endif
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index d028fd4431f..081833998b8 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -410,7 +410,7 @@ when ($USE_ARCADIA_PYTHON == "no") {
}
# tag:allocator
-DEFAULT_ALLOCATOR=LF
+DEFAULT_ALLOCATOR=LF
# tag:allocator
when ($OS_ANDROID == "yes" || $MSVC == "yes") {
@@ -1234,18 +1234,18 @@ module _BASE_UNIT: _BARE_UNIT {
}
}
- when ($USE_THINLTO == "yes") {
- when ($GCC) {
- CFLAGS+=-flto=thin
- LDFLAGS+=-flto=thin
- }
- when ($CLANG) {
- CFLAGS+=-flto=thin
- LDFLAGS+=-flto=thin
- }
- }
-
-
+ when ($USE_THINLTO == "yes") {
+ when ($GCC) {
+ CFLAGS+=-flto=thin
+ LDFLAGS+=-flto=thin
+ }
+ when ($CLANG) {
+ CFLAGS+=-flto=thin
+ LDFLAGS+=-flto=thin
+ }
+ }
+
+
when ($CLANG) {
when ($PGO_ADD == "yes") {
CFLAGS+=-fprofile-instr-generate