Skip to content

Commit d161b52

Browse files
authored
Update examples to 9110b3e90edc6e06a8bf88ad12a28eb6e77ee2e9 (#15)
Signed-off-by: Michael Carroll <[email protected]>
1 parent 7518406 commit d161b52

File tree

84 files changed

+1979
-1764
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1979
-1764
lines changed

.bazelignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ bazel-bin
44
bazel-testlogs
55
bazel-out
66
bazel-sdk-examples
7-
bazel-sdk-examples-staging

.bazelrc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ common --incompatible_disallow_empty_glob=false
77

88
# Custom downloader configs. This makes it so that external URLs to download dependencies from
99
# can be rewritten at build time and, for example, support custom mirrors.
10-
common --experimental_downloader_config=bazel/content_mirror/permissive.cfg
11-
common:strict_mirror --experimental_downloader_config=bazel/content_mirror/strict.cfg
10+
common --downloader_config=bazel/content_mirror/permissive.cfg
11+
common:strict_mirror --downloader_config=bazel/content_mirror/strict.cfg
1212

1313
# Static linking to workaround OpenCV symbol lookup errors: https://github.com/bazelbuild/rules_foreign_cc/issues/1164
1414
build --dynamic_mode=off
@@ -57,5 +57,3 @@ build --sandbox_default_allow_network=false
5757
# See https://github.com/google/googletest/issues/2883#issuecomment-647540343
5858
build --define absl=1
5959

60-
# Avoid building grpc with xDS support to reduce build time
61-
build --define=grpc_no_xds=true

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.0.0
1+
8.2.1

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ bazel-**
44
.pybazel.env
55
compile_commands.json
66
MODULE.bazel.lock
7+
.env

MODULE.bazel

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,52 @@
1-
module(name="examples")
1+
module(name = "examples")
22

33
bazel_dep(name = "ai_intrinsic_sdks")
44
archive_override(
55
module_name = "ai_intrinsic_sdks",
66
# To pin a version change the following to, e.g.:
77
# urls = "https://github.com/intrinsic-ai/sdk/archive/refs/tags/intrinsic.platform.20221231.RC00.tar.gz",
88
# strip_prefix = "sdk-intrinsic.platform.20221231.RC00/"
9+
strip_prefix = "sdk-main/",
910
urls = ["https://github.com/intrinsic-ai/sdk/archive/refs/heads/main.tar.gz"],
10-
strip_prefix = "sdk-main/"
1111
)
1212

1313
# Direct dependencies
14-
bazel_dep(name = "abseil-cpp", version = "20240116.2", repo_name = "com_google_absl")
14+
bazel_dep(name = "abseil-cpp", version = "20250127.1", repo_name = "com_google_absl")
1515
bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "com_google_absl_py")
16-
bazel_dep(name = "bazel_skylib", version = "1.5.0")
16+
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1717
bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest")
18-
bazel_dep(name = "grpc", version = "1.66.0", repo_name = "com_github_grpc_grpc")
19-
bazel_dep(name = "platforms", version = "0.0.9")
20-
bazel_dep(name = "protobuf", version = "26.0.bcr.2", repo_name = "com_google_protobuf")
21-
bazel_dep(name = "rules_go", version = "0.49.0", repo_name = "io_bazel_rules_go") # TODO Remove once we use a fix in rules_go
22-
bazel_dep(name = "rules_pkg", version = "1.0.1")
23-
bazel_dep(name = "rules_python", version = "1.0.0")
18+
bazel_dep(name = "grpc", version = "1.71.0", repo_name = "com_github_grpc_grpc")
19+
bazel_dep(name = "platforms", version = "0.0.11")
20+
bazel_dep(name = "protobuf", version = "29.4", repo_name = "com_google_protobuf")
21+
bazel_dep(name = "rules_go", version = "0.53.0", repo_name = "io_bazel_rules_go")
22+
bazel_dep(name = "rules_pkg", version = "1.1.0")
23+
bazel_dep(name = "rules_python", version = "1.3.0")
2424

2525
# C++ toolchain
26-
bazel_dep(name = "toolchains_llvm", version = "1.1.2")
26+
bazel_dep(name = "toolchains_llvm", version = "1.4.0")
27+
2728
llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
2829
llvm.toolchain(
2930
llvm_version = "19.1.0",
3031
)
32+
3133
non_module_deps = use_extension("@ai_intrinsic_sdks//bazel:non_module_deps.bzl", "non_module_deps_ext")
3234
use_repo(non_module_deps, "com_googleapis_storage_chrome_linux_amd64_sysroot")
35+
3336
llvm.sysroot(
3437
label = "@com_googleapis_storage_chrome_linux_amd64_sysroot//:all_files",
3538
targets = ["linux-x86_64"],
3639
)
3740
use_repo(llvm, "llvm_toolchain")
41+
3842
register_toolchains("@llvm_toolchain//:all")
3943

40-
bazel_dep(name = "rules_cc", version = "0.0.9")
41-
bazel_dep(name = "rules_foreign_cc", version = "0.10.1")
44+
bazel_dep(name = "rules_cc", version = "0.1.1")
45+
bazel_dep(name = "rules_foreign_cc", version = "0.14.0")
4246

4347
# Google API bindings
44-
bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5", repo_name = "com_google_googleapis")
48+
bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a", repo_name = "com_google_googleapis")
49+
4550
switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
4651
switched_rules.use_languages(
4752
cc = True,
@@ -52,7 +57,8 @@ switched_rules.use_languages(
5257
use_repo(switched_rules, "com_google_googleapis_imports")
5358

5459
# OCI images
55-
bazel_dep(name = "rules_oci", version = "2.0.0")
60+
bazel_dep(name = "rules_oci", version = "2.2.5")
61+
5662
oci = use_extension("@rules_oci//oci:extensions.bzl", "oci")
5763
use_repo(
5864
oci,
@@ -63,7 +69,7 @@ use_repo(
6369
##########
6470
# Go
6571
##########
66-
bazel_dep(name = "gazelle", version = "0.40.0", repo_name = "bazel_gazelle")
72+
bazel_dep(name = "gazelle", version = "0.42.0", repo_name = "bazel_gazelle")
6773

6874
go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
6975
use_repo(
@@ -77,39 +83,36 @@ use_repo(
7783
# Python
7884
##########
7985
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
80-
8186
python.toolchain(
8287
is_default = True,
8388
python_version = "3.11",
8489
)
90+
8591
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
8692
pip.parse(
8793
hub_name = "scan_barcodes_pip_deps",
8894
python_version = "3.11",
89-
requirements_lock = "//skills/scan_barcodes:requirements.txt"
95+
requirements_lock = "//skills/scan_barcodes:requirements.txt",
9096
)
9197
use_repo(pip, "scan_barcodes_pip_deps")
92-
9398
pip.parse(
9499
hub_name = "stopwatch_pip_deps",
95100
python_version = "3.11",
96-
requirements_lock = "//services/stopwatch:requirements.txt"
101+
requirements_lock = "//services/stopwatch:requirements.txt",
97102
)
98103
use_repo(pip, "stopwatch_pip_deps")
99-
100-
101104
pip.parse(
102105
hub_name = "random_number_pip_deps",
103106
python_version = "3.11",
104-
requirements_lock = "//services/random_number:requirements.txt"
107+
requirements_lock = "//services/random_number:requirements.txt",
105108
)
106109
use_repo(pip, "random_number_pip_deps")
107110

108111
##########
109112
# Containers
110113
##########
111114

112-
bazel_dep(name = "container_structure_test", version="1.19.1")
115+
bazel_dep(name = "container_structure_test", version = "1.19.1")
113116

114117
##########
115118
# Non-bzlmod dependencies

bazel/BUILD

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# This alias is required for Intrinsic's internal test infrastructure.
2+
# You do not need a //bazel:linux_x86_64 target in your own workspace.
3+
#
4+
# Internally Intrinsic's CI jobs use --host_platform=//bazel:linux_x86_64
5+
# to specify the platform to run tests on.
6+
# This alias makes sure the Bazel action cache can be reused between
7+
# CI builds of the SDK and CI builds of the SDK Examples.
8+
alias(
9+
name = "linux_x86_64",
10+
actual = "@ai_intrinsic_sdks//bazel:linux_x86_64",
11+
)

bazel/content_mirror/permissive.cfg

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ rewrite (go.dev/dl/\?mode=json&include=all) $1
2424
rewrite (auth.docker.io.*) $1
2525
rewrite (index.docker.io.*) $1
2626
rewrite (gcr.io.*) $1
27-
rewrite (pypi.org.*) $1
27+
28+
# Do not rewrite pip deps _index fetches_ (note the trailing slash) as the mirror only supports explicit file downloads.
29+
rewrite (pypi.org.*/) $1
30+
rewrite (us-central1-python.pkg.dev/intrinsic-mirror/intrinsic-public-python/simple.*/) $1
31+
rewrite (download.cadexchanger.com/python.*/) $1
32+
rewrite (github.com/googleapis/proto-breaking-change-detector.*/) $1
2833

2934
# Attempt to get all remaining URLs from the mirror.
3035
# Ensure that we don't mirror things that are already taken from the mirror.

bazel/non_module_deps.bzl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
66

77
def _non_module_deps_impl(ctx):
88
http_archive(
9-
name = "opencv",
10-
sha256 = "9dc6a9a95edc133e165e9f6db9412dd899e28d4e5e4979f17cb5966f4b7f3fb1",
11-
strip_prefix = "opencv-4.8.0",
12-
url = "https://github.com/opencv/opencv/archive/4.8.0.zip",
13-
build_file = "//bazel:opencv.BUILD",
9+
name = "opencv",
10+
sha256 = "9dc6a9a95edc133e165e9f6db9412dd899e28d4e5e4979f17cb5966f4b7f3fb1",
11+
strip_prefix = "opencv-4.8.0",
12+
url = "https://github.com/opencv/opencv/archive/4.8.0.zip",
13+
build_file = "//bazel:opencv.BUILD",
1414
)
1515

1616
non_module_deps_ext = module_extension(implementation = _non_module_deps_impl)

bazel/opencv.BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ cmake(
2626
],
2727
lib_source = ":all_srcs",
2828
out_include_dir = "include/opencv4",
29-
out_static_libs = [
29+
out_static_libs = [
3030
"libopencv_core.a",
3131
"libopencv_imgproc.a",
3232
"libopencv_calib3d.a",

0 commit comments

Comments
 (0)