Merge api/impl directories: intrinsics + value

PiperOrigin-RevId: 367525911

docs/design/tracing.md

@@ -32,7 +32,7 @@ for more information.
 ### Tracing the function
 
 When tracing a `federated_computation`, the user's function is called using
-[value_base.Value](https://github.com/tensorflow/federated/blob/master/tensorflow_federated/python/core/api/value_base.py)
+[value_impl.Value](https://github.com/tensorflow/federated/blob/master/tensorflow_federated/python/core/impl/federated_context/value_impl.py)
 as a stand-in replacement for each argument. `Value` attempts to emulate the
 behavior of the original argument type by implementing common Python dunder
 methods (e.g. `__getattr__`).

tensorflow_federated/BUILD

@@ -33,12 +33,11 @@ py_library(
         "//tensorflow_federated/python/core/api:computation_base",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
-        "//tensorflow_federated/python/core/api:intrinsics",
         "//tensorflow_federated/python/core/api:typed_object",
-        "//tensorflow_federated/python/core/api:value_base",
-        "//tensorflow_federated/python/core/api:values",
         "//tensorflow_federated/python/core/backends",
         "//tensorflow_federated/python/core/framework",
+        "//tensorflow_federated/python/core/impl/federated_context:intrinsics",
+        "//tensorflow_federated/python/core/impl/federated_context:value_impl",
         "//tensorflow_federated/python/core/impl/types:placements",
         "//tensorflow_federated/python/core/impl/types:type_conversions",
         "//tensorflow_federated/python/core/templates",

tensorflow_federated/__init__.py

@@ -42,25 +42,25 @@
 from tensorflow_federated.python.core.api.computations import check_returns_type
 from tensorflow_federated.python.core.api.computations import federated_computation
 from tensorflow_federated.python.core.api.computations import tf_computation
-from tensorflow_federated.python.core.api.intrinsics import federated_aggregate
-from tensorflow_federated.python.core.api.intrinsics import federated_apply
-from tensorflow_federated.python.core.api.intrinsics import federated_broadcast
-from tensorflow_federated.python.core.api.intrinsics import federated_collect
-from tensorflow_federated.python.core.api.intrinsics import federated_eval
-from tensorflow_federated.python.core.api.intrinsics import federated_map
-from tensorflow_federated.python.core.api.intrinsics import federated_mean
-from tensorflow_federated.python.core.api.intrinsics import federated_secure_select
-from tensorflow_federated.python.core.api.intrinsics import federated_secure_sum
-from tensorflow_federated.python.core.api.intrinsics import federated_select
-from tensorflow_federated.python.core.api.intrinsics import federated_sum
-from tensorflow_federated.python.core.api.intrinsics import federated_value
-from tensorflow_federated.python.core.api.intrinsics import federated_zip
-from tensorflow_federated.python.core.api.intrinsics import sequence_map
-from tensorflow_federated.python.core.api.intrinsics import sequence_reduce
-from tensorflow_federated.python.core.api.intrinsics import sequence_sum
 from tensorflow_federated.python.core.api.typed_object import TypedObject
-from tensorflow_federated.python.core.api.value_base import Value
-from tensorflow_federated.python.core.api.values import to_value
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import federated_aggregate
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import federated_apply
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import federated_broadcast
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import federated_collect
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import federated_eval
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import federated_map
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import federated_mean
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import federated_secure_select
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import federated_secure_sum
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import federated_select
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import federated_sum
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import federated_value
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import federated_zip
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import sequence_map
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import sequence_reduce
+from tensorflow_federated.python.core.impl.federated_context.intrinsics import sequence_sum
+from tensorflow_federated.python.core.impl.federated_context.value_impl import to_value
+from tensorflow_federated.python.core.impl.federated_context.value_impl import Value
 from tensorflow_federated.python.core.impl.types.placements import CLIENTS
 from tensorflow_federated.python.core.impl.types.placements import SERVER
 from tensorflow_federated.python.core.impl.types.type_conversions import structure_from_tensor_type_tree

tensorflow_federated/experimental/python/learning/BUILD

@@ -32,7 +32,7 @@ py_library(
         "//tensorflow_federated/python/common_libs:structure",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
-        "//tensorflow_federated/python/core/api:intrinsics",
+        "//tensorflow_federated/python/core/impl/federated_context:intrinsics",
         "//tensorflow_federated/python/core/impl/types:placements",
         "//tensorflow_federated/python/core/impl/types:type_conversions",
         "//tensorflow_federated/python/core/templates:iterative_process",

tensorflow_federated/experimental/python/learning/jax_components.py

@@ -23,7 +23,7 @@
 from tensorflow_federated.python.common_libs import structure
 from tensorflow_federated.python.core.api import computation_types
 from tensorflow_federated.python.core.api import computations
-from tensorflow_federated.python.core.api import intrinsics
+from tensorflow_federated.python.core.impl.federated_context import intrinsics
 from tensorflow_federated.python.core.impl.types import placements
 from tensorflow_federated.python.core.impl.types import type_conversions
 from tensorflow_federated.python.core.templates import iterative_process

tensorflow_federated/python/aggregators/BUILD

@@ -41,7 +41,7 @@ py_library(
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
-        "//tensorflow_federated/python/core/api:intrinsics",
+        "//tensorflow_federated/python/core/impl/federated_context:intrinsics",
         "//tensorflow_federated/python/core/impl/types:placements",
         "//tensorflow_federated/python/core/templates:aggregation_process",
         "//tensorflow_federated/python/core/templates:measured_process",
@@ -77,7 +77,7 @@ py_library(
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
-        "//tensorflow_federated/python/core/api:intrinsics",
+        "//tensorflow_federated/python/core/impl/federated_context:intrinsics",
         "//tensorflow_federated/python/core/impl/types:placements",
         "//tensorflow_federated/python/core/impl/types:type_conversions",
         "//tensorflow_federated/python/core/templates:aggregation_process",
@@ -123,7 +123,7 @@ py_library(
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
-        "//tensorflow_federated/python/core/api:intrinsics",
+        "//tensorflow_federated/python/core/impl/federated_context:intrinsics",
         "//tensorflow_federated/python/core/impl/types:placements",
         "//tensorflow_federated/python/core/impl/types:type_analysis",
         "//tensorflow_federated/python/core/templates:aggregation_process",
@@ -158,8 +158,8 @@ py_library(
         "//tensorflow_federated/python/common_libs:structure",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
-        "//tensorflow_federated/python/core/api:intrinsics",
-        "//tensorflow_federated/python/core/api:value_base",
+        "//tensorflow_federated/python/core/impl/federated_context:intrinsics",
+        "//tensorflow_federated/python/core/impl/federated_context:value_impl",
         "//tensorflow_federated/python/core/impl/types:placements",
     ],
 )
@@ -174,9 +174,9 @@ py_test(
         ":primitives",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
-        "//tensorflow_federated/python/core/api:intrinsics",
         "//tensorflow_federated/python/core/api:test_case",
         "//tensorflow_federated/python/core/backends/test:execution_contexts",
+        "//tensorflow_federated/python/core/impl/federated_context:intrinsics",
         "//tensorflow_federated/python/core/impl/types:placements",
         "//tensorflow_federated/python/core/test:static_assert",
     ],
@@ -192,7 +192,7 @@ py_library(
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
-        "//tensorflow_federated/python/core/api:intrinsics",
+        "//tensorflow_federated/python/core/impl/federated_context:intrinsics",
         "//tensorflow_federated/python/core/impl/types:placements",
         "//tensorflow_federated/python/core/templates:estimation_process",
     ],
@@ -225,7 +225,7 @@ py_library(
         "//tensorflow_federated/python/core/api:computation_base",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
-        "//tensorflow_federated/python/core/api:intrinsics",
+        "//tensorflow_federated/python/core/impl/federated_context:intrinsics",
         "//tensorflow_federated/python/core/impl/types:placements",
         "//tensorflow_federated/python/core/impl/types:type_analysis",
         "//tensorflow_federated/python/core/templates:aggregation_process",
@@ -245,9 +245,9 @@ py_test(
         ":sum_factory",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
-        "//tensorflow_federated/python/core/api:intrinsics",
         "//tensorflow_federated/python/core/api:test_case",
         "//tensorflow_federated/python/core/backends/native:execution_contexts",
+        "//tensorflow_federated/python/core/impl/federated_context:intrinsics",
         "//tensorflow_federated/python/core/impl/types:placements",
         "//tensorflow_federated/python/core/templates:aggregation_process",
         "//tensorflow_federated/python/core/templates:estimation_process",
@@ -266,7 +266,7 @@ py_library(
         "//tensorflow_federated/python/core/api:computation_base",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
-        "//tensorflow_federated/python/core/api:intrinsics",
+        "//tensorflow_federated/python/core/impl/federated_context:intrinsics",
         "//tensorflow_federated/python/core/impl/types:placements",
         "//tensorflow_federated/python/core/impl/types:type_analysis",
         "//tensorflow_federated/python/core/impl/types:type_transformations",
@@ -299,7 +299,7 @@ py_library(
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
-        "//tensorflow_federated/python/core/api:intrinsics",
+        "//tensorflow_federated/python/core/impl/federated_context:intrinsics",
         "//tensorflow_federated/python/core/impl/types:placements",
         "//tensorflow_federated/python/core/impl/types:type_analysis",
         "//tensorflow_federated/python/core/templates:aggregation_process",
@@ -319,9 +319,9 @@ py_test(
         ":secure",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
-        "//tensorflow_federated/python/core/api:intrinsics",
         "//tensorflow_federated/python/core/api:test_case",
         "//tensorflow_federated/python/core/backends/test:execution_contexts",
+        "//tensorflow_federated/python/core/impl/federated_context:intrinsics",
         "//tensorflow_federated/python/core/impl/types:placements",
         "//tensorflow_federated/python/core/templates:aggregation_process",
         "//tensorflow_federated/python/core/templates:estimation_process",
@@ -338,7 +338,7 @@ py_library(
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
-        "//tensorflow_federated/python/core/api:intrinsics",
+        "//tensorflow_federated/python/core/impl/federated_context:intrinsics",
         "//tensorflow_federated/python/core/impl/types:placements",
         "//tensorflow_federated/python/core/templates:aggregation_process",
         "//tensorflow_federated/python/core/templates:measured_process",
@@ -373,7 +373,7 @@ py_library(
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
-        "//tensorflow_federated/python/core/api:intrinsics",
+        "//tensorflow_federated/python/core/impl/federated_context:intrinsics",
         "//tensorflow_federated/python/core/impl/types:placements",
         "//tensorflow_federated/python/core/templates:aggregation_process",
         "//tensorflow_federated/python/core/templates:measured_process",

tensorflow_federated/python/aggregators/differential_privacy.py

@@ -24,7 +24,7 @@
 from tensorflow_federated.python.common_libs import py_typecheck
 from tensorflow_federated.python.core.api import computation_types
 from tensorflow_federated.python.core.api import computations
-from tensorflow_federated.python.core.api import intrinsics
+from tensorflow_federated.python.core.impl.federated_context import intrinsics
 from tensorflow_federated.python.core.impl.types import placements
 from tensorflow_federated.python.core.templates import aggregation_process
 from tensorflow_federated.python.core.templates import measured_process

tensorflow_federated/python/aggregators/encoded.py

@@ -22,7 +22,7 @@
 from tensorflow_federated.python.common_libs import py_typecheck
 from tensorflow_federated.python.core.api import computation_types
 from tensorflow_federated.python.core.api import computations
-from tensorflow_federated.python.core.api import intrinsics
+from tensorflow_federated.python.core.impl.federated_context import intrinsics
 from tensorflow_federated.python.core.impl.types import placements
 from tensorflow_federated.python.core.impl.types import type_conversions
 from tensorflow_federated.python.core.templates import aggregation_process

tensorflow_federated/python/aggregators/mean.py

@@ -22,7 +22,7 @@
 from tensorflow_federated.python.common_libs import py_typecheck
 from tensorflow_federated.python.core.api import computation_types
 from tensorflow_federated.python.core.api import computations
-from tensorflow_federated.python.core.api import intrinsics
+from tensorflow_federated.python.core.impl.federated_context import intrinsics
 from tensorflow_federated.python.core.impl.types import placements
 from tensorflow_federated.python.core.impl.types import type_analysis
 from tensorflow_federated.python.core.templates import aggregation_process

tensorflow_federated/python/aggregators/primitives.py

@@ -21,13 +21,13 @@
 from tensorflow_federated.python.common_libs import structure
 from tensorflow_federated.python.core.api import computation_types
 from tensorflow_federated.python.core.api import computations
-from tensorflow_federated.python.core.api import intrinsics
-from tensorflow_federated.python.core.api import value_base
+from tensorflow_federated.python.core.impl.federated_context import intrinsics
+from tensorflow_federated.python.core.impl.federated_context import value_impl
 from tensorflow_federated.python.core.impl.types import placements
 
 
 def _validate_value_on_clients(value):
-  py_typecheck.check_type(value, value_base.Value)
+  py_typecheck.check_type(value, value_impl.Value)
   py_typecheck.check_type(value.type_signature, computation_types.FederatedType)
   if value.type_signature.placement is not placements.CLIENTS:
     raise TypeError(
@@ -410,10 +410,10 @@ def _normalize_secure_quantized_sum_args(client_value, lower_bound,
     _check_secure_quantized_sum_dtype(dtypes)
 
   # Validation of bounds.
-  if isinstance(lower_bound, value_base.Value) != isinstance(
-      upper_bound, value_base.Value):
+  if isinstance(lower_bound, value_impl.Value) != isinstance(
+      upper_bound, value_impl.Value):
     raise BoundsDifferentTypesError(lower_bound, upper_bound)
-  elif not isinstance(lower_bound, value_base.Value):
+  elif not isinstance(lower_bound, value_impl.Value):
     # Normalization of bounds to federated values.
     lower_bound = intrinsics.federated_value(lower_bound, placements.SERVER)
     upper_bound = intrinsics.federated_value(upper_bound, placements.SERVER)

tensorflow_federated/python/aggregators/primitives_test.py

@@ -21,9 +21,9 @@
 from tensorflow_federated.python.aggregators import primitives
 from tensorflow_federated.python.core.api import computation_types
 from tensorflow_federated.python.core.api import computations
-from tensorflow_federated.python.core.api import intrinsics
 from tensorflow_federated.python.core.api import test_case
 from tensorflow_federated.python.core.backends.test import execution_contexts
+from tensorflow_federated.python.core.impl.federated_context import intrinsics
 from tensorflow_federated.python.core.impl.types import placements
 from tensorflow_federated.python.core.test import static_assert
 

tensorflow_federated/python/aggregators/quantile_estimation.py

@@ -21,7 +21,7 @@
 from tensorflow_federated.python.common_libs import py_typecheck
 from tensorflow_federated.python.core.api import computation_types
 from tensorflow_federated.python.core.api import computations
-from tensorflow_federated.python.core.api import intrinsics
+from tensorflow_federated.python.core.impl.federated_context import intrinsics
 from tensorflow_federated.python.core.impl.types import placements
 from tensorflow_federated.python.core.templates import estimation_process
 

tensorflow_federated/python/aggregators/robust.py

@@ -26,7 +26,7 @@
 from tensorflow_federated.python.core.api import computation_base
 from tensorflow_federated.python.core.api import computation_types
 from tensorflow_federated.python.core.api import computations
-from tensorflow_federated.python.core.api import intrinsics
+from tensorflow_federated.python.core.impl.federated_context import intrinsics
 from tensorflow_federated.python.core.impl.types import placements
 from tensorflow_federated.python.core.impl.types import type_analysis
 from tensorflow_federated.python.core.templates import aggregation_process

tensorflow_federated/python/aggregators/robust_test.py

@@ -24,9 +24,9 @@
 from tensorflow_federated.python.aggregators import sum_factory
 from tensorflow_federated.python.core.api import computation_types
 from tensorflow_federated.python.core.api import computations
-from tensorflow_federated.python.core.api import intrinsics
 from tensorflow_federated.python.core.api import test_case
 from tensorflow_federated.python.core.backends.native import execution_contexts
+from tensorflow_federated.python.core.impl.federated_context import intrinsics
 from tensorflow_federated.python.core.impl.types import placements
 from tensorflow_federated.python.core.templates import aggregation_process
 from tensorflow_federated.python.core.templates import estimation_process