Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
Update dependencies for Go, Java, and C++ DP Libs, and for Privacy on Beam.

Privacy on Beam:
* Implement scalable public partitions for KV types

Change-Id: I7b982e1bb1e5640a354ac7ac5a7ed0330be1a913
GitOrigin-RevId: ae90caf4628ab57ec861b51a0db50311ac170ed5
  • Loading branch information
Differential Privacy Team authored and dibakch committed Dec 6, 2023
1 parent 53b4c6a commit fd0020d
Show file tree
Hide file tree
Showing 29 changed files with 1,340 additions and 1,017 deletions.
1 change: 0 additions & 1 deletion cc/accounting/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ cc_library(
"@boost//:lexical_cast",
"@boost//:math",
"@boost//:multiprecision",
"@com_github_google_glog//:glog",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
Expand Down
1 change: 1 addition & 0 deletions cc/algorithms/internal/bounded-mean-ci_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ TEST(BoundedMeanCiTest,

TEST(BoundedMeanCiTest, InfiniteNoisedParamsReturnsDefaultCi) {
BoundedMeanConfidenceIntervalParams params;
params.confidence_level = 0.9;
params.lower_bound = -1.0;
params.upper_bound = 1.0;
params.noised_sum = std::numeric_limits<double>::infinity();
Expand Down
16 changes: 0 additions & 16 deletions cc/cc_accounting_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,6 @@ def cc_accounting_deps():
sha256 = "93cfa11a344ad552472f7d93c228d55969ac586275692d73d5e7ce73a69b047f",
)

# Begin GLog
http_archive(
name = "com_github_gflags_gflags",
sha256 = "34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf",
strip_prefix = "gflags-2.2.2",
urls = ["https://github.com/gflags/gflags/archive/v2.2.2.tar.gz"],
)

http_archive(
name = "com_github_google_glog",
sha256 = "62efeb57ff70db9ea2129a16d0f908941e355d09d6d83c9f7b18557c0a7ab59e",
strip_prefix = "glog-d516278b1cd33cd148e8989aec488b6049a4ca0b",
urls = ["https://github.com/google/glog/archive/d516278b1cd33cd148e8989aec488b6049a4ca0b.zip"],
)
# End Glog

# Begin Boost
git_repository(
name = "com_github_nelhage_rules_boost",
Expand Down
30 changes: 15 additions & 15 deletions cc/cc_differential_privacy_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -34,36 +34,36 @@ def cc_differential_privacy_deps():
# Common bazel rules. Also required for Abseil.
http_archive(
name = "bazel_skylib",
sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
],
)

# GoogleTest/GoogleMock framework. Used by most unit-tests.
http_archive(
name = "com_google_googletest",
url = "https://github.com/google/googletest/archive/refs/tags/v1.13.0.tar.gz",
strip_prefix = "googletest-1.13.0",
sha256 = "ad7fdba11ea011c1d925b3289cf4af2c66a352e18d4c7264392fead75e919363",
url = "https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz",
strip_prefix = "googletest-1.14.0",
sha256 = "8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7",
)

# RE2 is a requirement for GoogleTest
http_archive(
name = "com_googlesource_code_re2",
sha256 = "1726508efc93a50854c92e3f7ac66eb28f0e57652e413f11d7c1e28f97d997ba",
strip_prefix = "re2-03da4fc0857c285e3a26782f6bc8931c4c950df4",
sha256 = "4e6593ac3c71de1c0f322735bc8b0492a72f66ffccfad76e259fa21c41d27d8a",
strip_prefix = "re2-2023-11-01",
# release 2023-06-01
url = "https://github.com/google/re2/archive/03da4fc0857c285e3a26782f6bc8931c4c950df4.zip",
url = "https://github.com/google/re2/releases/download/2023-11-01/re2-2023-11-01.tar.gz",
)

# Benchmarks for testing.
http_archive(
name = "com_google_benchmark",
url = "https://github.com/google/benchmark/archive/refs/tags/v1.7.1.tar.gz",
sha256 = "6430e4092653380d9dc4ccb45a1e2dc9259d581f4866dc0759713126056bc1d7",
strip_prefix = "benchmark-1.7.1",
url = "https://github.com/google/benchmark/archive/refs/tags/v1.8.3.tar.gz",
sha256 = "6bc180a57d23d4d9515519f92b0c83d61b05b5bab188961f36ac7b06b0d9e9ce",
strip_prefix = "benchmark-1.8.3",
)

# BoringSSL for cryptographic PRNG
Expand All @@ -79,9 +79,9 @@ def cc_differential_privacy_deps():
# Supports `./configure && make` style packages to become dependencies.
http_archive(
name = "rules_foreign_cc",
strip_prefix = "rules_foreign_cc-0.9.0",
url = "https://github.com/bazelbuild/rules_foreign_cc/archive/0.9.0.tar.gz",
sha256 = "2a4d07cd64b0719b39a7c12218a3e507672b82a97b98c6a89d38565894cf7c51",
strip_prefix = "rules_foreign_cc-0.10.1",
url = "https://github.com/bazelbuild/rules_foreign_cc/releases/download/0.10.1/rules_foreign_cc-0.10.1.tar.gz",
sha256 = "476303bd0f1b04cc311fc258f1708a5f6ef82d3091e53fd1977fa20383425a6a",
)

# Postgres depends on rules_foreign_cc. Use postgres 12.
Expand Down
54 changes: 28 additions & 26 deletions examples/go/deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,28 @@ def go_differential_privacy_examples_deps():
go_repository(
name = "com_github_go_fonts_liberation",
importpath = "github.com/go-fonts/liberation",
sum = "h1:jAkAWJP4S+OsrPLZM4/eC9iW7CtHy+HBXrEwZXWo5VM=",
version = "v0.2.0",
sum = "h1:3BI2iaE7R/s6uUUtzNCjo3QijJu3aS4wmrMgfSpYQ+8=",
version = "v0.3.0",
)
go_repository(
name = "com_github_go_latex_latex",
importpath = "github.com/go-latex/latex",
sum = "h1:6zl3BbBhdnMkpSj2YY30qV3gDcVBGtFgVsV3+/i+mKQ=",
version = "v0.0.0-20210823091927-c0d11ff05a81",
sum = "h1:NxXI5pTAtpEaU49bpLpQoDsu1zrteW/vxzTz8Cd2UAs=",
version = "v0.0.0-20230307184459-12ec69307ad9",
)
go_repository(
name = "com_github_go_pdf_fpdf",
importpath = "github.com/go-pdf/fpdf",
sum = "h1:MlgtGIfsdMEEQJr2le6b/HNr1ZlQwxyWr77r2aj2U/8=",
version = "v0.6.0",
)
go_repository(
name = "com_github_goccmack_gocc",
importpath = "github.com/goccmack/gocc",
sum = "h1:FSii2UQeSLngl3jFoR4tUKZLprO7qUlh/TKKticc0BM=",
version = "v0.0.0-20230228185258-2292f9e40198",
)

go_repository(
name = "com_github_golang_freetype",
importpath = "github.com/golang/freetype",
Expand All @@ -58,14 +65,14 @@ def go_differential_privacy_examples_deps():
go_repository(
name = "com_github_golang_glog",
importpath = "github.com/golang/glog",
sum = "h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw=",
version = "v1.1.1",
sum = "h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68=",
version = "v1.2.0",
)
go_repository(
name = "com_github_google_go_cmp",
importpath = "github.com/google/go-cmp",
sum = "h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=",
version = "v0.5.9",
sum = "h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=",
version = "v0.6.0",
)

go_repository(
Expand All @@ -84,45 +91,40 @@ def go_differential_privacy_examples_deps():
go_repository(
name = "org_golang_x_exp",
importpath = "golang.org/x/exp",
sum = "h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=",
version = "v0.0.0-20230321023759-10a507213a29",
sum = "h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No=",
version = "v0.0.0-20231127185646-65229373498e",
)
go_repository(
name = "org_golang_x_image",
importpath = "golang.org/x/image",
sum = "h1:TcHcE0vrmgzNH1v3ppjcMGbhG5+9fMuvOmUYwNEF4q4=",
version = "v0.0.0-20220302094943-723b81ca9867",
sum = "h1:bR8b5okrPI3g/gyZakLZHeWxAR8Dn5CyxXv1hLH5g/4=",
version = "v0.6.0",
)
go_repository(
name = "org_golang_x_mod",
importpath = "golang.org/x/mod",
sum = "h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=",
version = "v0.6.0",
)
go_repository(
name = "org_golang_x_sys",
importpath = "golang.org/x/sys",
sum = "h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=",
version = "v0.1.0",
sum = "h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=",
version = "v0.14.0",
)

go_repository(
name = "org_golang_x_text",
importpath = "golang.org/x/text",
sum = "h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=",
version = "v0.3.7",
sum = "h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=",
version = "v0.8.0",
)
go_repository(
name = "org_golang_x_tools",
importpath = "golang.org/x/tools",
sum = "h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=",
version = "v0.2.0",
sum = "h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM=",
version = "v0.16.0",
)

go_repository(
name = "org_gonum_v1_gonum",
importpath = "gonum.org/v1/gonum",
sum = "h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o=",
version = "v0.12.0",
sum = "h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0=",
version = "v0.14.0",
)
go_repository(
name = "org_gonum_v1_plot",
Expand Down
8 changes: 4 additions & 4 deletions examples/go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ module github.com/google/differential-privacy/examples/go
go 1.19

require (
github.com/golang/glog v1.1.1
github.com/google/differential-privacy/go/v2 v2.1.0
github.com/golang/glog v1.2.0
github.com/google/differential-privacy/go/v2 v2.1.1-0.20230822150926-c89810faa5ad
)

require (
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
gonum.org/v1/gonum v0.12.0 // indirect
golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
gonum.org/v1/gonum v0.14.0 // indirect
)
18 changes: 9 additions & 9 deletions examples/go/go.sum
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
github.com/golang/glog v1.1.1 h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw=
github.com/golang/glog v1.1.1/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
github.com/google/differential-privacy/go/v2 v2.1.0 h1:v3hCOAaUMnY7Fkk+osv3cgMXUAFqaI2l8agICV6IJl4=
github.com/google/differential-privacy/go/v2 v2.1.0/go.mod h1:KRaNc5O0mzJ6cBC3iJbQNk9OHTzRLdmp1IXMaFlOxt8=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o=
gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY=
github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68=
github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
github.com/google/differential-privacy/go/v2 v2.1.1-0.20230822150926-c89810faa5ad h1:iDEy82z1Uw4MeXs9IRC04dCtyPfIMjJr9lBwo5GXOPA=
github.com/google/differential-privacy/go/v2 v2.1.1-0.20230822150926-c89810faa5ad/go.mod h1:KRaNc5O0mzJ6cBC3iJbQNk9OHTzRLdmp1IXMaFlOxt8=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
golang.org/x/exp v0.0.0-20231127185646-65229373498e h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No=
golang.org/x/exp v0.0.0-20231127185646-65229373498e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0=
gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU=
8 changes: 4 additions & 4 deletions go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/google/differential-privacy/go/v2
go 1.19

require (
github.com/golang/glog v1.1.1
github.com/google/go-cmp v0.5.9
gonum.org/v1/gonum v0.12.0
github.com/golang/glog v1.1.2
github.com/google/go-cmp v0.6.0
gonum.org/v1/gonum v0.14.0
)

require golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
require golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
16 changes: 8 additions & 8 deletions go/go.sum
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
github.com/golang/glog v1.1.1 h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw=
github.com/golang/glog v1.1.1/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o=
gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY=
github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0=
gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU=
16 changes: 8 additions & 8 deletions go/go_differential_privacy_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ def go_differential_privacy_deps():
go_repository(
name = "com_github_golang_glog",
importpath = "github.com/golang/glog",
sum = "h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw=",
version = "v1.1.1",
sum = "h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=",
version = "v1.1.2",
)
go_repository(
name = "com_github_google_go_cmp",
importpath = "github.com/google/go-cmp",
sum = "h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=",
version = "v0.5.9",
sum = "h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=",
version = "v0.6.0",
)

go_repository(
Expand All @@ -85,8 +85,8 @@ def go_differential_privacy_deps():
go_repository(
name = "org_golang_x_exp",
importpath = "golang.org/x/exp",
sum = "h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=",
version = "v0.0.0-20230321023759-10a507213a29",
sum = "h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=",
version = "v0.0.0-20231110203233-9a3e6036ecaa",
)
go_repository(
name = "org_golang_x_image",
Expand Down Expand Up @@ -124,8 +124,8 @@ def go_differential_privacy_deps():
go_repository(
name = "org_gonum_v1_gonum",
importpath = "gonum.org/v1/gonum",
sum = "h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o=",
version = "v0.12.0",
sum = "h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0=",
version = "v0.14.0",
)
go_repository(
name = "org_gonum_v1_plot",
Expand Down
18 changes: 9 additions & 9 deletions java/dp_java_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ def dp_java_deps():
artifacts = [
# artifacts for building and testing
"org.apache.commons:commons-math3:3.6.1",
"com.google.auto.value:auto-value-annotations:1.10.1",
"com.google.auto.value:auto-value:1.10.1",
"com.google.auto.value:auto-value-annotations:1.10.4",
"com.google.auto.value:auto-value:1.10.4",
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.errorprone:error_prone_annotations:2.18.0",
"com.google.guava:guava:31.1-jre",
"com.google.protobuf:protobuf-java:3.22.2",
"com.google.errorprone:error_prone_annotations:2.23.0",
"com.google.guava:guava:32.1.3-jre",
"com.google.protobuf:protobuf-java:3.25.0",
# artifacts for testing only
"org.mockito:mockito-core:4.11.0",
"org.mockito:mockito-core:5.7.0",
"junit:junit:4.13.2",
"com.google.truth:truth:1.1.3",
"com.google.truth.extensions:truth-java8-extension:1.1.3",
"com.google.testparameterinjector:test-parameter-injector:1.10",
"com.google.truth:truth:1.1.5",
"com.google.truth.extensions:truth-java8-extension:1.1.5",
"com.google.testparameterinjector:test-parameter-injector:1.14",
],
repositories = [
"https://jcenter.bintray.com/",
Expand Down
Loading

0 comments on commit fd0020d

Please sign in to comment.