fix merge messages

tensorflow_gnn/runner/input/datasets.py

@@ -56,11 +56,7 @@ def _process_dataset(
   return dataset.prefetch(tf.data.AUTOTUNE)
 
 
-<<<<<<< HEAD
-class PassthruDatasetProvider:
-=======
 class PassthruDatasetProvider(interfaces.DatasetProvider):
->>>>>>> 8c2a3f3 (Move interfaces from orchestration.py to interfaces.py.)
   """Builds a `tf.data.Dataset` from a pass thru dataset.
 
   Passes any `dataset` thru: omitting any sharding. For detailed documentation,
@@ -88,11 +84,7 @@ def get_dataset(self, _: tf.distribute.InputContext) -> tf.data.Dataset:
 
 
 class SimpleDatasetProvider(interfaces.DatasetProvider):
-<<<<<<< HEAD
-  """Builds a `tf.data.Dataset` from a list of files.
-=======
   """Builds a `tf.data.Dataset` from a file pattern.
->>>>>>> 8c2a3f3 (Move interfaces from orchestration.py to interfaces.py.)
 
   This `SimpleDatasetProvider` builds a `tf.data.Dataset` as follows:
    - The object is initialized with a list of filenames. For convenience,
@@ -232,11 +224,7 @@ def dataset_fn(dataset):
   return sampled_dataset.prefetch(tf.data.AUTOTUNE)
 
 
-<<<<<<< HEAD
-class PassthruSampleDatasetsProvider:
-=======
 class PassthruSampleDatasetsProvider(interfaces.DatasetProvider):
->>>>>>> 8c2a3f3 (Move interfaces from orchestration.py to interfaces.py.)
   """Builds a sampled `tf.data.Dataset` from multiple pass thru datasets.
 
   Passes any `principal_dataset` and `extra_datasets` thru: omitting any
@@ -284,11 +272,7 @@ def get_dataset(self, _: tf.distribute.InputContext) -> tf.data.Dataset:
 
 
 class SimpleSampleDatasetsProvider(interfaces.DatasetProvider):
-<<<<<<< HEAD
-  """Builds a sampling `tf.data.Dataset` from multiple filenames.
-=======
   """Builds a sampling `tf.data.Dataset` from a multiple file patterns.
->>>>>>> 8c2a3f3 (Move interfaces from orchestration.py to interfaces.py.)
 
   For complete explanations regarding sampling see `_process_sampled_dataset()`.