From 14451492c9c85eba463813323413133f1d8c5ed9 Mon Sep 17 00:00:00 2001
From: Yash Katariya <yashkatariya@google.com>
Date: Thu, 8 Jun 2023 13:45:43 -0700
Subject: [PATCH] Delete OpShardingSharding export since it has been 3 months
 since it was deprecated. Also remove deprecation warnings for
 MeshPspecSharding.

PiperOrigin-RevId: 538880293
---
 CHANGELOG.md    |  2 ++
 jax/sharding.py | 30 ------------------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21bd2ad83..1076db654 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@ Remember to align the itemized text with the first line of an item within a list
     of `numpy.product` in NumPy version 1.25.0.
   * `jax.numpy.cumproduct`: use `jax.numpy.cumprod`. This follows the deprecation
     of `numpy.cumproduct` in NumPy version 1.25.0.
+  * `jax.sharding.OpShardingSharding` has been removed since it has been 3
+    months since it was deprecated.
 
 ## jaxlib 0.4.12
 
diff --git a/jax/sharding.py b/jax/sharding.py
index cbcfb1d29..18caa9eb0 100644
--- a/jax/sharding.py
+++ b/jax/sharding.py
@@ -22,39 +22,9 @@ from jax._src.sharding_impls import (
     SingleDeviceSharding as SingleDeviceSharding,
     PmapSharding as PmapSharding,
     GSPMDSharding as GSPMDSharding,
-    # TODO(yashkatariya): Remove OpShardingSharding in 3 months from
-    # Feb 17, 2023.
-    GSPMDSharding as _deprecated_OpShardingSharding,
     PositionalSharding as PositionalSharding,
 )
 from jax._src.partition_spec import (
     PartitionSpec as PartitionSpec,
 )
 from jax._src.interpreters.pxla import Mesh as Mesh
-
-
-_deprecations = {
-    "OpShardingSharding": (
-        (
-            "jax.sharding.OpShardingSharding is deprecated. Please use"
-            " jax.sharding.GSPMDSharding."
-        ),
-        _deprecated_OpShardingSharding,
-    ),
-    "MeshPspecSharding": (
-        (
-            "jax.sharding.MeshPspecSharding has been removed. Please use"
-            " jax.sharding.NamedSharding."
-        ),
-        None,
-    ),
-}
-
-import typing
-if typing.TYPE_CHECKING:
-  from jax._src.sharding_impls import GSPMDSharding as OpShardingSharding
-else:
-  from jax._src.deprecations import deprecation_getattr as _deprecation_getattr
-  __getattr__ = _deprecation_getattr(__name__, _deprecations)
-  del _deprecation_getattr
-del typing