From 34f8774dad8b68e5d4f12bbb1ad38b34e7209e72 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Thu, 7 Apr 2022 16:39:09 -0700 Subject: [PATCH] Migrate more references to `dp_event` to Google DP libraries. PiperOrigin-RevId: 440230682 --- tensorflow_privacy/BUILD | 2 +- tensorflow_privacy/__init__.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tensorflow_privacy/BUILD b/tensorflow_privacy/BUILD index 47d8ad8..abcd237 100644 --- a/tensorflow_privacy/BUILD +++ b/tensorflow_privacy/BUILD @@ -16,7 +16,6 @@ py_library( deps = [ ":version", "//tensorflow_privacy/privacy/analysis:compute_dp_sgd_privacy_lib", - "//tensorflow_privacy/privacy/analysis:dp_event", "//tensorflow_privacy/privacy/analysis:rdp_accountant", "//tensorflow_privacy/privacy/analysis:tree_aggregation_accountant", "//tensorflow_privacy/privacy/dp_query", @@ -38,6 +37,7 @@ py_library( "//tensorflow_privacy/privacy/optimizers:dp_optimizer_keras", "//tensorflow_privacy/privacy/optimizers:dp_optimizer_keras_vectorized", "//tensorflow_privacy/v1:tensorflow_privacy_v1", + "@com_google_differential_py//python/dp_accounting:dp_event", ], ) diff --git a/tensorflow_privacy/__init__.py b/tensorflow_privacy/__init__.py index caed9b4..104001d 100644 --- a/tensorflow_privacy/__init__.py +++ b/tensorflow_privacy/__init__.py @@ -26,16 +26,16 @@ else: from tensorflow_privacy import v1 # DpEvents - from tensorflow_privacy.privacy.analysis.dp_event import DpEvent - from tensorflow_privacy.privacy.analysis.dp_event import NoOpDpEvent - from tensorflow_privacy.privacy.analysis.dp_event import NonPrivateDpEvent - from tensorflow_privacy.privacy.analysis.dp_event import UnsupportedDpEvent - from tensorflow_privacy.privacy.analysis.dp_event import GaussianDpEvent - from tensorflow_privacy.privacy.analysis.dp_event import SelfComposedDpEvent - from tensorflow_privacy.privacy.analysis.dp_event import ComposedDpEvent - from tensorflow_privacy.privacy.analysis.dp_event import PoissonSampledDpEvent - from tensorflow_privacy.privacy.analysis.dp_event import SampledWithReplacementDpEvent - from tensorflow_privacy.privacy.analysis.dp_event import SampledWithoutReplacementDpEvent + from com_google_differential_py.python.dp_accounting.dp_event import DpEvent + from com_google_differential_py.python.dp_accounting.dp_event import NoOpDpEvent + from com_google_differential_py.python.dp_accounting.dp_event import NonPrivateDpEvent + from com_google_differential_py.python.dp_accounting.dp_event import UnsupportedDpEvent + from com_google_differential_py.python.dp_accounting.dp_event import GaussianDpEvent + from com_google_differential_py.python.dp_accounting.dp_event import SelfComposedDpEvent + from com_google_differential_py.python.dp_accounting.dp_event import ComposedDpEvent + from com_google_differential_py.python.dp_accounting.dp_event import PoissonSampledDpEvent + from com_google_differential_py.python.dp_accounting.dp_event import SampledWithReplacementDpEvent + from com_google_differential_py.python.dp_accounting.dp_event import SampledWithoutReplacementDpEvent # Analysis from tensorflow_privacy.privacy.analysis.compute_dp_sgd_privacy_lib import compute_dp_sgd_privacy