diff options
author | svidyuk <svidyuk@yandex-team.com> | 2023-11-02 05:29:16 +0300 |
---|---|---|
committer | svidyuk <svidyuk@yandex-team.com> | 2023-11-02 05:50:17 +0300 |
commit | 0cf5e643b3d7bc9fa2a99e428b0a7321c2b5f2f1 (patch) | |
tree | 6ae8a2a4dcaa578c6ce62cee5449858473bb8b90 | |
parent | bca3674c13f0c9f70af994eaae1a1d7a3b5bc7e8 (diff) | |
download | ydb-0cf5e643b3d7bc9fa2a99e428b0a7321c2b5f2f1.tar.gz |
move matrixnet out of public
-rw-r--r-- | build/plugins/build_mn_files.py | 29 | ||||
-rw-r--r-- | build/plugins/mx_archive.py | 17 | ||||
-rw-r--r-- | build/ymake.core.conf | 56 |
3 files changed, 0 insertions, 102 deletions
diff --git a/build/plugins/build_mn_files.py b/build/plugins/build_mn_files.py deleted file mode 100644 index 4da76f1852..0000000000 --- a/build/plugins/build_mn_files.py +++ /dev/null @@ -1,29 +0,0 @@ -from os.path import basename, splitext - - -def on_build_mns_files(unit, *args): - files = [] - name = '' - ranking_suffix = '' - check = '' - index = 0 - fml_unused_tool = '' - while index < len(args): - if args[index] == 'NAME': - index += 1 - name = args[index] - elif args[index] == 'RANKING_SUFFIX': - index += 1 - ranking_suffix = args[index] - elif args[index] == 'CHECK': - check = 'CHECK' - fml_unused_tool = unit.get('FML_UNUSED_TOOL') or '$FML_UNUSED_TOOL' - else: - files.append(args[index]) - index += 1 - - for filename in files: - file_basename, _ = splitext(basename(filename)) - asmdataname = "staticMn{0}{1}Ptr".format(ranking_suffix, file_basename) - output_name = 'mn.staticMn{0}{1}Ptr.cpp'.format(ranking_suffix, file_basename) - unit.on_build_mns_file([filename, name, output_name, ranking_suffix, check, fml_unused_tool, asmdataname]) diff --git a/build/plugins/mx_archive.py b/build/plugins/mx_archive.py deleted file mode 100644 index 76b785fcde..0000000000 --- a/build/plugins/mx_archive.py +++ /dev/null @@ -1,17 +0,0 @@ -def onmx_formulas(unit, *args): - """ - @usage: MX_FORMULAS(BinFiles...) # deprecated, matrixnet - Create MatrixNet formulas archive - """ - - def iter_infos(): - for a in args: - if a.endswith('.bin'): - unit.on_mx_bin_to_info([a]) - yield a[:-3] + 'info' - else: - yield a - - infos = list(iter_infos()) - unit.onarchive_asm(['NAME', 'MxFormulas'] + infos) - unit.on_mx_gen_table(infos) diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 2ceffde021..ae74503410 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -4161,24 +4161,6 @@ macro _LUAJIT_OPENRESTY_OBJDUMP(Src, OUT="") { .CMD=${cwd:LUAJIT_OPENRESTY_PATH} ${tool:"contrib/libs/luajit_openresty/compiler"} -b -g ${input:Src} ${output;noauto:OUT} ${kv;hide:"p LJ"} ${kv;hide:"pc light-cyan"} } -macro _MX_BIN_TO_INFO(Src) { - .CMD=${tool:"tools/mx_bin2info"} ${input:Src} ${output;nopath;noext;noauto:Src.info} ${kv;hide:"p MX"} ${kv;hide:"pc yellow"} -} - -MX_GEN_TABLE_INCLS=${output_include;hide:"yabs_mx_calc_table.h"} \ -${output_include;hide:"kernel/matrixnet/mn_sse.h"} \ -${output_include;hide:"library/cpp/archive/yarchive.h"} \ -${output_include;hide:"util/memory/blob.h"} \ -${output_include;hide:"util/generic/hash.h"} \ -${output_include;hide:"util/generic/ptr.h"} \ -${output_include;hide:"util/generic/singleton.h"} - -macro _MX_GEN_TABLE(Srcs...) { - .CMD=$YMAKE_PYTHON ${input:"build/scripts/gen_mx_table.py"} $Srcs ${output;stdout:"mx_tables.cpp"} $MX_GEN_TABLE_INCLS ${kv;hide:"p MX"} ${kv;hide:"pc yellow"} - PEERDIR(kernel/matrixnet) - PEERDIR(library/cpp/archive) -} - RELEV_FML_CODEGEN_INCLS=${output_include;hide:"kernel/relevfml/relev_fml.h"} ${output_include;hide:"library/cpp/sse/sse.h"} ### @usage: GENERATE_ENUM_SERIALIZATION(File.h) @@ -4211,44 +4193,6 @@ macro DEB_VERSION(File) { .CMD=$YMAKE_PYTHON ${input:"build/scripts/mkver.py"} ${input:File} ${output;stdout:"DebianVersion.h"} ${kv;hide:"p CL"} ${kv;hide:"pc yellow"} } -BUILD_MN_SCRIPT=build/scripts/build_mn.py - -# tag:matrixnet -### @usage: BUILD_MN([CHECK] [PTR] [MULTI] mninfo mnname) # matrixnet -### -### Generate MatrixNet data and access code using single command. -### Alternative macro BUILD_MNS() works faster and better for large files. -macro BUILD_MN(MnInfo, MnName, CHECK?"fml_tool=$FML_UNUSED_TOOL CHECK":"", MULTI?, PTR?, RANKING_SUFFIX="") { - .CMD=$YMAKE_PYTHON ${input:BUILD_MN_SCRIPT} BuildMnF $ARCADIA_ROOT $ARCH_TOOL ${input:MnInfo} $MnName ranking_suffix=$RANKING_SUFFIX ${output;pre=mn.:MnName.cpp} ${output;hide;pre=MN_External_;suf=.rodata:MnName} ${output_include;hide:"kernel/matrixnet/mn_sse.h"} $CHECK $MULTI $PTR ${kv;hide:"p MN"} ${kv;hide:"pc yellow"} -} - -macro _BUILD_MNS_FILE(Input, Name, Output, Suffix, Check, Fml_tool, AsmDataName) { - .CMD=$YMAKE_PYTHON ${input:BUILD_MN_SCRIPT} BuildMnsFilesF $ARCADIA_ROOT $BINDIR $ARCH_TOOL fml_tool=$Fml_tool $Name ranking_suffix=$Suffix ${input:Input} ${output;hide:Output} ${output;hide;pre=MN_External_;suf=.rodata:AsmDataName} ${output_include;hide:"kernel/matrixnet/mn_sse.h"} ${kv;hide:"p MN"} ${kv;hide:"pc yellow"} -} - -MNS_OUTPUT=mnmodels - -macro _BUILD_MNS_CPP(NAME="", CHECK?, RANKING_SUFFIX="", Files...) { - .CMD=$YMAKE_PYTHON ${input:BUILD_MN_SCRIPT} BuildMnsCppF $NAME ranking_suffix=$RANKING_SUFFIX ${input:MNS_OUTPUT.h} ${output:MNS_OUTPUT.cpp} ${input:Files} ${output_include;hide:MNS_OUTPUT.h} ${output_include;hide:"kernel/matrixnet/mn_sse.h"} ${kv;hide:"p MN"} ${kv;hide:"pc yellow"} -} - -macro _BUILD_MNS_HEADER(NAME="", CHECK?, RANKING_SUFFIX="", Files...) { - .CMD=$YMAKE_PYTHON ${input:BUILD_MN_SCRIPT} BuildMnsHeaderF $NAME ranking_suffix=$RANKING_SUFFIX ${output:MNS_OUTPUT.h} ${input:Files} ${output_include;hide:"kernel/matrixnet/mn_sse.h"} ${output_include;hide:"kernel/matrixnet/mn_multi_categ.h"} ${kv;hide:"p MN"} ${kv;hide:"pc yellow"} -} - -# TODO: support foreach_in and keywords simultaneous usage (look at BUILD_MNS_FILES) - -# tag:matrixnet -### @usage: BUILD_MNS([CHECK] NAME listname mninfos...) # matrixnet -### -### Generate MatrixNet data and access code using separate commands for support code, interface and data. -### Faster version of BUILD_MN() macro for large files. -macro BUILD_MNS(Files...) { - _BUILD_MNS_HEADER($Files) - _BUILD_MNS_CPP($Files) - _BUILD_MNS_FILES($Files) -} - ### @usage: NEED_CHECK() ### ### Commits to the project marked with this macro will be blocked by pre-commit check and then will be |