catboost 1.25.1 → 1.26.0

package/DEPLOYMENT.md

@@ -2,7 +2,7 @@
 
 ## Building scripts
 
-Scripts responsible for building and preparing the package for publishing are located in `/build_scripts` directory. 
+Scripts responsible for building and preparing the package for publishing are located in `/build_scripts` directory.
 
 These scripts are built once on the first execution of any script.  To compile build scripts explicitly, run
 ```
@@ -11,44 +11,46 @@ npm run compile_build_scripts
 
 ## Scripts
 
-- `npm run install` - main script for installing the package. Behaves differently if called from catboost directory or from the standalone package distribution: 
+- `npm run install` - main script for installing the package. Behaves differently if called from catboost directory or from the standalone package distribution:
   - If called from `catboost` repository, then builds the local version of `catboostmodel` library from source, compiles and links package against it. After that the package can be added locally via
   ```
     npm install $PATH_TO_CATBOOST_REPO/catboost/node-package
   ```
   - If called outside of the repository, then the package is considered to be installed from npm and it will be built and linked against the binaries specified in `config.json` file. This file is created during package preparation for publishing, see below.
 - `npm run build` - build package locally in the `catboost` repository, link against library built from source.
-- `npm run ci` - a single scrpt for CI which runs the procedure described in "Release procedure" section.
+- `npm run ci` - \[requires Linux with docker installed\] a single script for CI which runs the procedure described in "Release procedure" section.
+  Add `--have-cuda` flag to enable tests with CUDA evaluation.
 - `npm run compile` - compile Typescript source files only.
 - `npm run test` - run local unit tests.
+  Add `--have-cuda` flag to enable tests with CUDA evaluation.
 - `npm run compile_build_scripts` - compile build scripts from Typescript sources.
 - `npm run clean` - delete local artifacts.
-- `npm run package_prepublish <version>` - prepare the package for publishing, does the following:  
+- `npm run package_prepublish <version>` - prepare the package for publishing, does the following:
     1. Copies C headers required for building package on the client's side from repository to a `./inc` directory.
     2. Compiles Typescript source files.
-    3. Fetches the binaries from the `github.com` releases for a given version (for ex. `v0.25.1`), prepopulates `config.json` file. This config file includes link to the binaries and sha256 checksums that will be verified on the client side. The binaries have to be downloaded during the package installation as they are too big to be part of the distributed package. 
+    3. Fetches the binaries from the `github.com` releases for a given version (for ex. `v0.25.1`), prepopulates `config.json` file. This config file includes link to the binaries and sha256 checksums that will be verified on the client side. The binaries have to be downloaded during the package installation as they are too big to be part of the distributed package.
 
 ## Release procedure
 
 0. Verify package locally (optional)
    1. Checkout the released branch.
-   2. Run 
+   2. Run
+        ```
+        npm run build -- --have-cuda
         ```
-        npm run build
-        ``` 
         to build package from source.
-   3. Run 
+   3. Run
+        ```
+        npm run test --have-cuda
         ```
-        npm run test
-        ``` 
         to verify that the tests are passing.
-1. Run 
+1. Run
     ```
     npm run package_prepublish <version>
     ```
 2. Check generated `config.json` file, verify that the links and file checksums are correct.
 3. Update package version in `package.json`.
-4. Run integration deployment test (local docker required):
+4. Run integration deployment test \[requires Linux with docker installed\]:
     ```
     npm run e2e
     ```
@@ -59,13 +61,18 @@ npm run compile_build_scripts
 
 ## CI
 
+Requires Linux with Internet access and docker (with permissions to tag images and run containers) installed.
+
 For setting up continuous integration the following had to be done:
 
-1. Checkout the source code (at the release tag commit) on the host with Internet access and docker daemon running (with permissions to tag images and run containers).
+1. Checkout the source code (at the release tag commit).
+
 2. From `catboost/catboost/node-package` subdirectory, execute ci script and check that it is executed correctly:
    ```
-   npm run ci
+   npm run ci -- <catboost-release version> <catboost-node-package version> --have-cuda [build_native arguments]
    ```
+  See [build_native documentation](https://catboost.ai/docs/en/installation/build-native-artifacts#build-build-native) about possible arguments. Don't specify already defined `--target` or `--build-root-dir` arguments.
+
 3. Assuming that npm registry credentials are set up on the host, publish the package via
    ```
    npm publish

package/README.md

@@ -1,27 +1,47 @@
 # CatBoost Model Node package
 
-A Node.js package for applying pretrained CatBoost model.
+A Node.js package for applying pretrained CatBoost models.
 
-## Usage example
+## Installation
 
-1. Install the package. You have two options:
+Install the package. You have two options:
    - Install from npm registry:
-   ```sh
-   npm i catboost
-   ```
-   - Build package from source. Navigate to this directory inside the repo and run:
+        ```sh
+        npm i catboost
+        ```
+   - Build package from source.
 
-    ```sh
-    npm install
-    ```
+        CatBoost source code is stored as a [Git](https://git-scm.com/) repository on GitHub at <https://github.com/catboost/catboost/>. You can obtain a local copy of this Git repository by running the following command from a command line interpreter (you need to have Git command line tools installed):
 
-    Now you can link this package in your project via:
+        ```sh
+        git clone https://github.com/catboost/catboost.git
+        ```
 
-    ```sh
-    npm install $PATH_TO_CATBOOST_REPO/catboost/node-package
-    ```
+        Navigate to `$PATH_TO_CATBOOST_REPO/catboost/node-package` directory inside the repo and run:
 
-1. Apply the pretrained model:
+        ```sh
+        npm run install [-- <build_native arguments>]
+        ```
+        See [build_native documentation](https://catboost.ai/docs/en/installation/build-native-artifacts#build-build-native) about possible arguments. Don't specify already defined `--target` or `--build-root-dir` arguments.
+
+        For example, build with CUDA support:
+
+        ```sh
+        npm run install -- --have-cuda
+        ```
+
+        Now you can link this package in your project via:
+
+        ```sh
+        npm install $PATH_TO_CATBOOST_REPO/catboost/node-package
+        ```
+
+## Usage
+
+Apply the pretrained model.
+
+Example with numerical and categorical features (they must be passed in separate arrays containing features of
+each type for all samples):
 
 ```js
 catboost = require('catboost');
@@ -41,16 +61,6 @@ prediction = model.predict([
 console.log(prediction);
 ```
 
-### Development roadmap
-
- - [x] Implement basic API calls.
- - [ ] Extend exposed API, improve test coverage.
- - [X] Migrate away from shell scripts.
- - [X] Support Windows and MacOS platforms.
- - [X] Switch to downloading and verifying the pre-built binary instead of building it from scratch.
- - [X] Publish the alpha version of the package.
- - [ ] Publish the generally available version of the package.
-
-### Release procedure
+## Release procedure
 
-See [DEMPLOYMENT.md](./DEPLOYMENT.md).
+See [DEPLOYMENT.md](./DEPLOYMENT.md).

package/binding.gyp

@@ -2,28 +2,26 @@
   'targets': [
     {
       'target_name': 'catboost-node',
-      'sources': [ 
+      'sources': [
                       'src/api_helpers.cpp',
                       'src/api_module.cpp',
                       'src/model.cpp',
                  ],
       'include_dirs': [
                          "<!@(node -p \"require('node-addon-api').include\")",
-                         "<!@(node -p \"process.env['CATBOOST_SRC_PATH'] || '../..'\")",
-                         "<!@(node -p \"process.env['CATBOOST_SRC_PATH'] || '../..'\")/catboost/libs/model_interface",
-                         "<!@(node -p \"process.env['CATBOOST_SRC_PATH'] || '../..'\")/contrib/libs/cxxsupp/system_stl/include",
+                         "<!@(node -p \"JSON.stringify(path.resolve(process.env['CATBOOST_SRC_PATH'] || path.join('..','..')))\")",
                       ],
       'dependencies': [ "<!(node -p \"require('node-addon-api').gyp\")" ],
       'conditions': [
         ['OS=="linux"', {
-          'libraries': [ 
+          'libraries': [
                      "-L<(module_root_dir)/build/catboost/libs/model_interface/",
                      "-lcatboostmodel",
                      "-Wl,-rpath <(module_root_dir)/build/catboost/libs/model_interface"
                    ],
         }],
         ['OS=="mac"', {
-          'libraries': [ 
+          'libraries': [
                      "-L<(module_root_dir)/build/catboost/libs/model_interface/",
                      "-lcatboostmodel",
                      "-Wl,-rpath,@loader_path/../catboost/libs/model_interface"
@@ -57,7 +55,7 @@
       'xcode_settings': {
         'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
         'CLANG_CXX_LIBRARY': 'libc++',
-        'MACOSX_DEPLOYMENT_TARGET': '10.7'
+        'MACOSX_DEPLOYMENT_TARGET': '11.0'
       },
       'msvs_settings': {
         'VCCLCompilerTool': { 'ExceptionHandling': 1 },

package/build_scripts/bootstrap.js

@@ -1,10 +1,11 @@
 const childProcess = require('child_process');
 const fs = require('fs');
+var path = require('path');
 
 process.chdir('./build_scripts');
 
 function compileBuildScripts() {
-    const buildRun = childProcess.exec('../node_modules/.bin/tsc');
+    const buildRun = childProcess.exec(path.join('..','node_modules', '.bin', 'tsc'));
     buildRun.stdout.on('data', chunk => {
         console.log(chunk);
     });

package/build_scripts/out/build.js

@@ -36,11 +36,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildLocal = exports.buildYa = exports.buildModel = exports.compileBindings = exports.compileJs = void 0;
+exports.buildLocal = exports.buildNative = exports.buildModel = exports.compileBindings = exports.compileJs = void 0;
 var common_1 = require("./common");
 var fs_1 = require("fs");
 var download_1 = require("./download");
 var config_1 = require("./config");
+var path_1 = require("path");
 function compileTypeScript() {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
@@ -51,7 +52,7 @@ function compileTypeScript() {
                 case 1:
                     result = _b.sent();
                     if (result.code !== 0) {
-                        console.error("Building ts library failed: \n            " + result.code + " " + result.signal + " " + ((_a = result.err) === null || _a === void 0 ? void 0 : _a.message));
+                        console.error("Building ts library failed:\n            " + result.code + " " + result.signal + " " + ((_a = result.err) === null || _a === void 0 ? void 0 : _a.message));
                         process.exit(1);
                     }
                     return [2 /*return*/];
@@ -65,7 +66,7 @@ function copyBindings() {
 }
 function compileNativeAddon(srcPath) {
     var _a;
-    if (srcPath === void 0) { srcPath = '../..'; }
+    if (srcPath === void 0) { srcPath = path_1.join('..', '..'); }
     return __awaiter(this, void 0, void 0, function () {
         var result;
         return __generator(this, function (_b) {
@@ -76,7 +77,7 @@ function compileNativeAddon(srcPath) {
                 case 1:
                     result = _b.sent();
                     if (result.code !== 0) {
-                        console.error("Building native-addon library failed: \n            " + result.code + " " + result.signal + " " + ((_a = result.err) === null || _a === void 0 ? void 0 : _a.message));
+                        console.error("Building native-addon library failed:\n            " + result.code + " " + result.signal + " " + ((_a = result.err) === null || _a === void 0 ? void 0 : _a.message));
                         process.exit(1);
                     }
                     return [2 /*return*/];
@@ -114,19 +115,27 @@ function compileBindings() {
     });
 }
 exports.compileBindings = compileBindings;
-function buildModelInterfaceLibrary() {
+function buildModelInterfaceLibrary(buildNativeExtraArgs) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var srcPath, result;
+        var _i, buildNativeExtraArgs_1, buildNativeArg, srcPath, result;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    srcPath = process.env['CATBOOST_SRC_PATH'] || '../..';
-                    return [4 /*yield*/, common_1.execProcess(srcPath + "/ya make -r " + srcPath + "/catboost/libs/model_interface -o ./build")];
+                    for (_i = 0, buildNativeExtraArgs_1 = buildNativeExtraArgs; _i < buildNativeExtraArgs_1.length; _i++) {
+                        buildNativeArg = buildNativeExtraArgs_1[_i];
+                        if (buildNativeArg.match(/^\-\-(targets|build\-root\-dir)/)) {
+                            console.error("build_native extra arguments cannot contain --targets or --build-root-dir, they are predefined");
+                            process.exit(1);
+                        }
+                    }
+                    srcPath = process.env['CATBOOST_SRC_PATH'] || path_1.join('..', '..');
+                    return [4 /*yield*/, common_1.execProcess("python3 " + path_1.join(srcPath, 'build', 'build_native.py') + " --targets catboostmodel --build-root-dir ./build "
+                            + buildNativeExtraArgs.map(function (arg) { return '"' + arg + '"'; }).join(' '))];
                 case 1:
                     result = _b.sent();
                     if (result.code !== 0) {
-                        console.error("Building catboostmodel library failed: \n            " + result.code + " " + result.signal + " " + ((_a = result.err) === null || _a === void 0 ? void 0 : _a.message));
+                        console.error("Building catboostmodel library failed:\n            " + result.code + " " + result.signal + " " + ((_a = result.err) === null || _a === void 0 ? void 0 : _a.message));
                         process.exit(1);
                     }
                     return [2 /*return*/];
@@ -136,7 +145,7 @@ function buildModelInterfaceLibrary() {
 }
 function configureGyp(srcPath) {
     var _a;
-    if (srcPath === void 0) { srcPath = '../..'; }
+    if (srcPath === void 0) { srcPath = path_1.join('..', '..'); }
     return __awaiter(this, void 0, void 0, function () {
         var result;
         return __generator(this, function (_b) {
@@ -147,7 +156,7 @@ function configureGyp(srcPath) {
                 case 1:
                     result = _b.sent();
                     if (result.code !== 0) {
-                        console.error("Node-gyp configuration failed: \n            " + result.code + " " + result.signal + " " + ((_a = result.err) === null || _a === void 0 ? void 0 : _a.message));
+                        console.error("Node-gyp configuration failed:\n            " + result.code + " " + result.signal + " " + ((_a = result.err) === null || _a === void 0 ? void 0 : _a.message));
                         process.exit(1);
                     }
                     return [2 /*return*/];
@@ -155,14 +164,14 @@ function configureGyp(srcPath) {
         });
     });
 }
-function buildModel() {
+function buildModel(buildNativeExtraArgs) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, configureGyp()];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, buildModelInterfaceLibrary()];
+                    return [4 /*yield*/, buildModelInterfaceLibrary(buildNativeExtraArgs)];
                 case 2:
                     _a.sent();
                     return [2 /*return*/];
@@ -172,14 +181,14 @@ function buildModel() {
 }
 exports.buildModel = buildModel;
 /** Build binary from repository. */
-function buildYa() {
+function buildNative(buildNativeExtraArgs) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, configureGyp()];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, buildModelInterfaceLibrary()];
+                    return [4 /*yield*/, buildModelInterfaceLibrary(buildNativeExtraArgs)];
                 case 2:
                     _a.sent();
                     return [4 /*yield*/, compileBindings()];
@@ -190,75 +199,44 @@ function buildYa() {
         });
     });
 }
-exports.buildYa = buildYa;
-function preparePlatformBinary(platform) {
+exports.buildNative = buildNative;
+function preparePlatformBinary(platform, arch) {
     return __awaiter(this, void 0, void 0, function () {
-        var config, _a, _i, _b, binary, _c, _d, binary, _e, _f, binary;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        var config, platform_arch, _i, _a, binary;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     config = config_1.readConfig();
-                    _a = platform;
-                    switch (_a) {
-                        case 'linux': return [3 /*break*/, 1];
-                        case 'darwin': return [3 /*break*/, 6];
-                        case 'win32': return [3 /*break*/, 11];
+                    if (platform == 'darwin') {
+                        arch = 'universal2';
                     }
-                    return [3 /*break*/, 16];
+                    platform_arch = platform + '-' + arch;
+                    _i = 0, _a = config.binaries[platform_arch];
+                    _b.label = 1;
                 case 1:
-                    _i = 0, _b = config.binaries['linux'];
-                    _g.label = 2;
-                case 2:
-                    if (!(_i < _b.length)) return [3 /*break*/, 5];
-                    binary = _b[_i];
+                    if (!(_i < _a.length)) return [3 /*break*/, 4];
+                    binary = _a[_i];
                     return [4 /*yield*/, download_1.downloadBinaryFile('./build/catboost/libs/model_interface', binary)];
+                case 2:
+                    _b.sent();
+                    _b.label = 3;
                 case 3:
-                    _g.sent();
-                    _g.label = 4;
-                case 4:
                     _i++;
-                    return [3 /*break*/, 2];
-                case 5:
-                    fs_1.linkSync('./build/catboost/libs/model_interface/libcatboostmodel.so', './build/catboost/libs/model_interface/libcatboostmodel.so.1');
+                    return [3 /*break*/, 1];
+                case 4:
+                    if (platform == 'linux') {
+                        fs_1.linkSync('./build/catboost/libs/model_interface/libcatboostmodel.so', './build/catboost/libs/model_interface/libcatboostmodel.so.1');
+                    }
                     return [2 /*return*/];
-                case 6:
-                    _c = 0, _d = config.binaries['mac'];
-                    _g.label = 7;
-                case 7:
-                    if (!(_c < _d.length)) return [3 /*break*/, 10];
-                    binary = _d[_c];
-                    return [4 /*yield*/, download_1.downloadBinaryFile('./build/catboost/libs/model_interface', binary)];
-                case 8:
-                    _g.sent();
-                    _g.label = 9;
-                case 9:
-                    _c++;
-                    return [3 /*break*/, 7];
-                case 10: return [2 /*return*/];
-                case 11:
-                    _e = 0, _f = config.binaries['win'];
-                    _g.label = 12;
-                case 12:
-                    if (!(_e < _f.length)) return [3 /*break*/, 15];
-                    binary = _f[_e];
-                    return [4 /*yield*/, download_1.downloadBinaryFile('./build/catboost/libs/model_interface', binary)];
-                case 13:
-                    _g.sent();
-                    _g.label = 14;
-                case 14:
-                    _e++;
-                    return [3 /*break*/, 12];
-                case 15: return [2 /*return*/];
-                case 16: throw new Error("Platform " + platform + " is not supported");
             }
         });
     });
 }
-function buildLocal(platform) {
+function buildLocal(platform, arch) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, preparePlatformBinary(platform)];
+                case 0: return [4 /*yield*/, preparePlatformBinary(platform, arch)];
                 case 1:
                     _a.sent();
                     return [4 /*yield*/, configureGyp('./inc')];

package/build_scripts/out/build_model.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var build_1 = require("./build");
-build_1.buildModel();
+build_1.buildModel(process.argv.slice(5));

package/build_scripts/out/{build_ya.js → build_native.js}

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var build_1 = require("./build");
-build_1.buildYa();
+build_1.buildNative(process.argv.slice(5));

package/build_scripts/out/ci.js

@@ -46,11 +46,11 @@ function ci() {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (process.argv.length !== 7) {
-                        throw new Error('ci script --- Usage: npm run ci <catboost-release version> <catboost-node-package version>');
+                    if (process.argv.length < 7) {
+                        throw new Error('ci script --- Usage: npm run ci -- <catboost-release version> <catboost-node-package version> [--have-cuda] [build_native arguments]');
                     }
                     catboostVersion = process.argv[5];
-                    if (!/v[0-9\.]*/.exec(catboostVersion)) {
+                    if (!/[0-9\.]*/.exec(catboostVersion)) {
                         throw new Error("Version '" + catboostVersion + "' is not a valid catboost version.");
                     }
                     packageVersion = process.argv[6];
@@ -60,11 +60,11 @@ function ci() {
                     console.log("Patching \"package.json\" with version \"" + packageVersion + "\"...");
                     packaging_1.patchPackageJSONWithVersion(packageVersion);
                     console.log('Building catboost package against repository sources...');
-                    return [4 /*yield*/, build_1.buildYa()];
+                    return [4 /*yield*/, build_1.buildNative(process.argv.slice(7))];
                 case 1:
                     _a.sent();
                     console.log('Running local unit tests...');
-                    return [4 /*yield*/, test_1.test()];
+                    return [4 /*yield*/, test_1.test(process.argv.indexOf('--have-cuda') > -1)];
                 case 2:
                     _a.sent();
                     console.log('Preparing package...');

package/build_scripts/out/config.js

@@ -41,11 +41,23 @@ var fs_1 = require("fs");
 var path_1 = require("path");
 var download_1 = require("./download");
 var GITHUB_PATH = 'https://github.com/catboost/catboost/releases/download/';
-var PLATFORM_TO_BINARY = {
-    'linux': ['libcatboostmodel.so'],
-    'mac': ['libcatboostmodel.dylib'],
-    'win': ['catboostmodel.dll', 'catboostmodel.lib'],
-};
+function getPlatformArchToBinary(version) {
+    return {
+        'linux-x64': [
+            ["libcatboostmodel-linux-x86_64-" + version + ".so", 'libcatboostmodel.so']
+        ],
+        'linux-arm64': [
+            ["libcatboostmodel-linux-aarch64-" + version + ".so", 'libcatboostmodel.so']
+        ],
+        'darwin-universal2': [
+            ["libcatboostmodel-darwin-universal2-" + version + ".dylib", 'libcatboostmodel.dylib']
+        ],
+        'win32-x64': [
+            ["catboostmodel-windows-x86_64-" + version + ".dll", 'catboostmodel.dll'],
+            ["catboostmodel-windows-x86_64-" + version + ".lib", 'catboostmodel.lib']
+        ],
+    };
+}
 function parseBinaryFileData(mapEntry) {
     if (mapEntry['url'] === undefined || mapEntry['sha256'] === undefined || mapEntry['targetFile'] === undefined) {
         throw new Error("Not a correct binary file entry in the config: " + JSON.stringify(mapEntry));
@@ -77,7 +89,7 @@ function writeConfig(config) {
 exports.writeConfig = writeConfig;
 function createConfigForVersion(version) {
     return __awaiter(this, void 0, void 0, function () {
-        var config, failedToDownload, _i, _a, platform, _b, _c, binary, targetFile, url, tmpPath, error_1, sha256, error;
+        var config, failedToDownload, platform_arch_to_binaries, _i, _a, platform_arch, _b, _c, src_and_target_file, srcFile, targetFile, url, tmpPath, error_1, sha256, error;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
@@ -85,20 +97,22 @@ function createConfigForVersion(version) {
                         binaries: {},
                     };
                     failedToDownload = [];
-                    _i = 0, _a = Object.keys(PLATFORM_TO_BINARY);
+                    platform_arch_to_binaries = getPlatformArchToBinary(version);
+                    _i = 0, _a = Object.keys(platform_arch_to_binaries);
                     _d.label = 1;
                 case 1:
                     if (!(_i < _a.length)) return [3 /*break*/, 9];
-                    platform = _a[_i];
-                    config.binaries[platform] = [];
-                    _b = 0, _c = PLATFORM_TO_BINARY[platform];
+                    platform_arch = _a[_i];
+                    config.binaries[platform_arch] = [];
+                    _b = 0, _c = platform_arch_to_binaries[platform_arch];
                     _d.label = 2;
                 case 2:
                     if (!(_b < _c.length)) return [3 /*break*/, 8];
-                    binary = _c[_b];
-                    targetFile = binary;
-                    url = path_1.join(GITHUB_PATH, version, targetFile);
-                    tmpPath = path_1.join('./build/tmp/', targetFile);
+                    src_and_target_file = _c[_b];
+                    srcFile = src_and_target_file[0];
+                    targetFile = src_and_target_file[1];
+                    url = path_1.join(GITHUB_PATH, 'v' + version, srcFile);
+                    tmpPath = path_1.join('./build/tmp/', srcFile);
                     _d.label = 3;
                 case 3:
                     _d.trys.push([3, 5, , 6]);
@@ -108,16 +122,16 @@ function createConfigForVersion(version) {
                     return [3 /*break*/, 6];
                 case 5:
                     error_1 = _d.sent();
-                    failedToDownload.push(targetFile);
-                    config.binaries[platform].push({
-                        url: "Not found: " + targetFile,
+                    failedToDownload.push(srcFile);
+                    config.binaries[platform_arch].push({
+                        url: "Not found: " + srcFile,
                         sha256: '',
                         targetFile: targetFile,
                     });
                     return [3 /*break*/, 7];
                 case 6:
                     sha256 = download_1.calculateFileHash(tmpPath);
-                    config.binaries[platform].push({ url: url, sha256: sha256, targetFile: targetFile });
+                    config.binaries[platform_arch].push({ url: url, sha256: sha256, targetFile: targetFile });
                     _d.label = 7;
                 case 7:
                     _b++;

package/build_scripts/out/install.js

@@ -40,15 +40,17 @@ var build_1 = require("./build");
 var fs_1 = require("fs");
 function install() {
     return __awaiter(this, void 0, void 0, function () {
+        var buildNativeExtraArgs;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (!fs_1.existsSync('../../ya')) return [3 /*break*/, 2];
-                    return [4 /*yield*/, build_1.buildYa()];
+                    if (!fs_1.existsSync('../../build/build_native.py')) return [3 /*break*/, 2];
+                    buildNativeExtraArgs = process.argv.slice(5);
+                    return [4 /*yield*/, build_1.buildNative(buildNativeExtraArgs)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
-                case 2: return [4 /*yield*/, build_1.buildLocal(process.platform)];
+                case 2: return [4 /*yield*/, build_1.buildLocal(process.platform, process.arch)];
                 case 3:
                     _a.sent();
                     return [2 /*return*/];

package/build_scripts/out/package_prepublish.js

@@ -45,7 +45,7 @@ function prepareAndBuildPackage() {
             switch (_a.label) {
                 case 0:
                     version = process.argv[process.argv.length - 1];
-                    if (!/v[0-9\.]*/.exec(version)) {
+                    if (!/[0-9\.]*/.exec(version)) {
                         console.error("Version \"" + version + "\" is not valid. Please add version as the last argument");
                         process.exit(1);
                     }