bazel: add release structure improvements (versioning, SONAME, vars.sh, pkg-config)

BUILD

@@ -1,6 +1,21 @@
 load("@onedal//dev/bazel:release.bzl",
     "release",
     "release_include",
+    "release_extra_file",
+)
+load("@onedal//dev/bazel:scripts.bzl",
+    "generate_vars_sh",
+    "generate_pkgconfig",
+)
+
+generate_vars_sh(
+    name = "release_vars_sh",
+    out = "env/vars.sh",
+)
+
+generate_pkgconfig(
+    name = "release_pkgconfig",
+    out = "lib/pkgconfig/onedal.pc",
 )
 
 release(
@@ -37,4 +52,8 @@ release(
         ],
         "//conditions:default": [],
     }),
+    extra_files = [
+        release_extra_file(":release_vars_sh",   "env/vars.sh"),
+        release_extra_file(":release_pkgconfig", "lib/pkgconfig/onedal.pc"),
+    ],
 )

cpp/daal/BUILD

@@ -50,7 +50,12 @@ daal_patch_kernel_defines(
 
 daal_module(
     name = "public_includes",
-    hdrs = glob(["include/**/*.h"], exclude=["**/daal_kernel_defines.h"]),
+    hdrs = glob([
+        "include/**/*.h",
+    ], exclude = [
+        "**/daal_kernel_defines.h",
+        "**/daal_win.h",
+    ]),
     includes = [ "include" ],
 )
 

deploy/local/BUILD

@@ -0,0 +1,23 @@
+#===============================================================================
+# Copyright contributors to the oneDAL project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#===============================================================================
+
+package(default_visibility = ["//visibility:public"])
+
+exports_files([
+    "vars_lnx.sh",
+    "vars_mac.sh",
+    "vars_win.bat",
+])

deploy/pkg-config/BUILD

@@ -0,0 +1,21 @@
+#===============================================================================
+# Copyright contributors to the oneDAL project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#===============================================================================
+
+package(default_visibility = ["//visibility:public"])
+
+exports_files([
+    "pkg-config.cpp",
+])

dev/bazel/cc.bzl

@@ -23,6 +23,7 @@ load("@onedal//dev/bazel:utils.bzl",
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@onedal//dev/bazel/config:config.bzl",
     "CpuInfo",
+    "VersionInfo",
 )
 load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
@@ -186,6 +187,7 @@ def _cc_dynamic_lib_impl(ctx):
     compilation_context = onedal_cc_common.collect_and_merge_compilation_contexts(ctx.attr.deps)
     linking_contexts = onedal_cc_common.collect_and_filter_linking_contexts(
         ctx.attr.deps, ctx.attr.lib_tags)
+
     linking_context, dynamic_lib = onedal_cc_link.dynamic(
         owner = ctx.label,
         name = ctx.attr.lib_name,
@@ -216,6 +218,10 @@ cc_dynamic_lib = rule(
             default = [],
             doc = "Additional linker flags (e.g. --exclude-libs for MKL symbol hiding).",
         ),
+        "_version_info": attr.label(
+            default = "@config//:version",
+            providers = [VersionInfo],
+        ),
     },
     toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
     fragments = ["cpp"],

dev/bazel/config/config.bzl

@@ -120,18 +120,25 @@ VersionInfo = provider(
         "build",
         "buildrev",
         "status",
+        # Binary ABI version (distinct from product version).
+        # Used for SONAME and shared library symlinks.
+        # Matches Make's MAJORBINARY / MINORBINARY variables.
+        "binary_major",
+        "binary_minor",
     ],
 )
 
 def _version_info_impl(ctx):
     return [
         VersionInfo(
-            major    = ctx.attr.major,
-            minor    = ctx.attr.minor,
-            update   = ctx.attr.update,
-            build    = ctx.attr.build,
-            buildrev = ctx.attr.buildrev,
-            status   = ctx.attr.status,
+            major        = ctx.attr.major,
+            minor        = ctx.attr.minor,
+            update       = ctx.attr.update,
+            build        = ctx.attr.build,
+            buildrev     = ctx.attr.buildrev,
+            status       = ctx.attr.status,
+            binary_major = ctx.attr.binary_major,
+            binary_minor = ctx.attr.binary_minor,
         )
     ]
 
@@ -144,6 +151,10 @@ version_info = rule(
         "build": attr.string(mandatory=True),
         "buildrev": attr.string(mandatory=True),
         "status": attr.string(mandatory=True),
+        # ABI binary version — used for SONAME and symlinks.
+        # Must match MAJORBINARY/MINORBINARY in makefile.
+        "binary_major": attr.string(mandatory=True),
+        "binary_minor": attr.string(mandatory=True),
     },
 )
 
@@ -204,20 +215,34 @@ def _detect_cpu_extension(repo_ctx):
 
 def _declare_onedal_config_impl(repo_ctx):
     auto_cpu = _detect_cpu_extension(repo_ctx)
+
+    makefile_ver = repo_ctx.path(Label("@onedal//:makefile.ver"))
+    makefile_content = repo_ctx.read(makefile_ver)
+
+    # Parse MAJORBINARY and MINORBINARY
+    binary_major = "4"
+    binary_minor = "0"
+    for line in makefile_content.splitlines():
+        if line.startswith("MAJORBINARY"):
+            binary_major = line.split("=")[1].strip()
+        elif line.startswith("MINORBINARY"):
+            binary_minor = line.split("=")[1].strip()
+
     repo_ctx.template(
         "BUILD",
         Label("@onedal//dev/bazel/config:config.tpl.BUILD"),
         substitutions = {
-            "%{auto_cpu}":         auto_cpu,
-            "%{version_major}":    "2026",
-            "%{version_minor}":    "0",
-            "%{version_update}":   "0",
-            "%{version_build}":    utils.datestamp(repo_ctx),
-            "%{version_buildrev}": "work",
-            "%{version_status}":   "P",
+            "%{auto_cpu}":              auto_cpu,
+            "%{version_major}":         "2026",
+            "%{version_minor}":         "0",
+            "%{version_update}":        "0",
+            "%{version_build}":         utils.datestamp(repo_ctx),
+            "%{version_buildrev}":      "work",
+            "%{version_status}":        "P",
+            "%{version_binary_major}":  binary_major,
+            "%{version_binary_minor}":  binary_minor,
         },
     )
-
 declare_onedal_config = repository_rule(
     implementation = _declare_onedal_config_impl,
     local = True,

dev/bazel/config/config.tpl.BUILD

@@ -21,6 +21,10 @@ version_info(
     build = "%{version_build}",
     buildrev = "%{version_buildrev}",
     status = "%{version_status}",
+    # Binary ABI version for SONAME and shared library symlinks.
+    # Must match MAJORBINARY/MINORBINARY in makefile.
+    binary_major = "%{version_binary_major}",
+    binary_minor = "%{version_binary_minor}",
 )
 
 config_flag(

dev/bazel/dal.bzl

@@ -113,7 +113,13 @@ def dal_public_includes(name, dal_deps=[], **kwargs):
         exclude = [
             "backend/",
             "test/",
-            "bazel-",
+            # Exclude all external-repository headers.  _match_file_name uses
+            # file.short_path, where every external dep starts with "../":
+            #   workspace style:  ../mkl_repo/include/mkl.h
+            #   Bzlmod style:     ../mkl_repo~2024.2/include/mkl.h
+            # The old "bazel-" pattern only caught workspace-style paths in
+            # file.path; it missed Bzlmod "+mkl_repo+mkl/" hashes entirely.
+            "../",
         ],
     )
 
@@ -159,7 +165,8 @@ def dal_test(name, hdrs=[], srcs=[], dal_deps=[], dal_test_deps=[],
              extra_deps=[], host_hdrs=[], host_srcs=[], host_deps=[],
              dpc_hdrs=[], dpc_srcs=[], dpc_deps=[], compile_as=[ "c++", "dpc++" ],
              framework="catch2", data=[], tags=[], private=False,
-             mpi=False, ccl=False, mpi_ranks=0, args=[], **kwargs):
+             mpi=False, ccl=False, mpi_ranks=0, args=[],
+             use_onedal_release_libs=True, **kwargs):
     # TODO: Check `compile_as` parameter
     # TODO: Refactor this rule once decision on the tests structure is made
     if not framework in ["catch2", "none"]:
@@ -179,7 +186,7 @@ def dal_test(name, hdrs=[], srcs=[], dal_deps=[], dal_test_deps=[],
         compile_as = compile_as,
         dal_deps = (
             dal_test_deps +
-            _test_link_mode_deps(dal_deps)
+            _test_link_mode_deps(dal_deps, use_onedal_release_libs)
         ) + ([
             "@onedal//cpp/oneapi/dal/test/engine:common",
             "@onedal//cpp/oneapi/dal/test/engine:catch2_main",
@@ -287,24 +294,27 @@ def dal_collect_parameters(name, root, modules=[], target="parameters", dal_deps
         **kwargs,
     )
 
-def dal_example(name, dal_deps=[], **kwargs):
+def dal_example(name, dal_deps=[], use_onedal_release_libs=True, is_daal=False, **kwargs):
+    base_deps = [] if is_daal else [
+        "@onedal//cpp/oneapi/dal:core",
+        "@onedal//cpp/oneapi/dal/io",
+    ]
     dal_test(
         name = name,
-        dal_deps = [
-            "@onedal//cpp/oneapi/dal:core",
-            "@onedal//cpp/oneapi/dal/io",
-        ] + dal_deps,
+        dal_deps = base_deps + dal_deps,
+        use_onedal_release_libs = use_onedal_release_libs,
         framework = "none",
         **kwargs,
     )
 
-def dal_example_suite(name, srcs, **kwargs):
+def dal_example_suite(name, srcs, is_daal=False, **kwargs):
     suite_deps = []
     for src in srcs:
         _, alg_name, src_file = src.rsplit('/', 2)
         example_name, _ = paths.split_extension(src_file)
         dal_example(
             name = example_name,
+            is_daal = is_daal,
             srcs = [ src ],
             **kwargs,
         )
@@ -314,31 +324,33 @@ def dal_example_suite(name, srcs, **kwargs):
         tests = suite_deps,
     )
 
-def dal_algo_example_suite(algos, dal_deps=[], **kwargs):
+def dal_algo_example_suite(algos, dal_deps=[], is_daal=False, **kwargs):
     for algo in algos:
         dal_example_suite(
             name = algo,
+            is_daal = is_daal,
             srcs = native.glob(["source/{}/*.cpp".format(algo)]),
             dal_deps = dal_deps + [
                 "@onedal//cpp/oneapi/dal/algo:{}".format(algo),
             ],
             **kwargs,
         )
 
-def _test_link_mode_deps(dal_deps):
+def _test_link_mode_deps(dal_deps, use_onedal_release_libs=True):
     return _select({
         "@config//:test_link_mode_dev": dal_deps,
         "@config//:test_link_mode_release_static": [
             "@onedal_release//:onedal_static",
-        ],
+        ] if use_onedal_release_libs else [],
         "@config//:test_link_mode_release_dynamic": [
             "@onedal_release//:onedal_dynamic",
-        ],
+        ] if use_onedal_release_libs else [],
     })
 
 def _test_deps_on_daal():
     return _select({
         "@config//:test_link_mode_dev": [
+            "@onedal//cpp/daal:core_static",
             "@onedal//cpp/daal:threading_static",
         ],
         "@config//:test_link_mode_release_static": [
@@ -600,3 +612,29 @@ def _expand_select(deps):
         else:
             expanded += [dep]
     return expanded
+
+def daal_example_suite(name, srcs, **kwargs):
+    dal_example_suite(
+        name = name,
+        srcs = srcs,
+        use_onedal_release_libs = False,
+        is_daal = True,
+        **kwargs,
+    )
+
+def daal_algo_example_suite(algos, dal_deps=[], **kwargs):
+    """Build DAAL example suites using classic DAAL kernel deps.
+
+    Unlike dal_algo_example_suite(), this function does NOT add oneAPI
+    (@onedal//cpp/oneapi/dal/algo/...) targets — DAAL examples use daal.h
+    and depend on DAAL kernels (@onedal//cpp/daal/src/algorithms/<algo>:kernel).
+    """
+    for algo in algos:
+        daal_example_suite(
+            name = algo,
+            srcs = native.glob(["source/{}/*.cpp".format(algo)]),
+            dal_deps = dal_deps + [
+                "@onedal//cpp/daal/src/algorithms/{}:kernel".format(algo),
+            ],
+            **kwargs,
+        )

dev/bazel/deps/mkl.tpl.BUILD

@@ -17,8 +17,10 @@ cc_library(
 cc_library(
     name = "mkl_static",
     srcs = [
-        "lib/libmkl_core.a",
+        # Keep MKL static archives in canonical dependency order.
+        # libmkl_intel_ilp64.a references mkl_serv_* symbols from libmkl_core.a.
         "lib/libmkl_intel_ilp64.a",
+        "lib/libmkl_core.a",
         "lib/libmkl_tbb_thread.a",
     ],
     linkopts = [

dev/bazel/deps/onedal.bzl

@@ -29,11 +29,23 @@ onedal_repo = repos.prebuilt_libs_repo_rule(
 
         # Dynamic
         "lib/intel64/libonedal_core.so",
+        "lib/intel64/libonedal_core.so.%{version_binary_major}",
+        "lib/intel64/libonedal_core.so.%{version_binary_major}.%{version_binary_minor}",
         "lib/intel64/libonedal_thread.so",
+        "lib/intel64/libonedal_thread.so.%{version_binary_major}",
+        "lib/intel64/libonedal_thread.so.%{version_binary_major}.%{version_binary_minor}",
         "lib/intel64/libonedal.so",
+        "lib/intel64/libonedal.so.%{version_binary_major}",
+        "lib/intel64/libonedal.so.%{version_binary_major}.%{version_binary_minor}",
         "lib/intel64/libonedal_dpc.so",
+        "lib/intel64/libonedal_dpc.so.%{version_binary_major}",
+        "lib/intel64/libonedal_dpc.so.%{version_binary_major}.%{version_binary_minor}",
         "lib/intel64/libonedal_parameters.so",
+        "lib/intel64/libonedal_parameters.so.%{version_binary_major}",
+        "lib/intel64/libonedal_parameters.so.%{version_binary_major}.%{version_binary_minor}",
         "lib/intel64/libonedal_parameters_dpc.so",
+        "lib/intel64/libonedal_parameters_dpc.so.%{version_binary_major}",
+        "lib/intel64/libonedal_parameters_dpc.so.%{version_binary_major}.%{version_binary_minor}",
     ],
     build_template = "@onedal//dev/bazel/deps:onedal.tpl.BUILD",
 )