mttf 1.1.15__py3-none-any.whl → 1.1.17__py3-none-any.whl

mt/keras/__init__.py

@@ -1 +1,4 @@
 """MT package that represents the working Keras 2 from the system."""
+
+from mt.keras_src import *
+from mt.keras_src import layers_src as layers, applications_src as applications

mt/{keras/applications → keras_src/applications_src}/__init__.py

@@ -1,4 +1,4 @@
-from ..base import applications as _applications
+from .. import applications as _applications
 
 for _x, _y in _applications.__dict__.items():
     if _x.startswith("_"):

mt/{keras/applications → keras_src/applications_src}/mobilenet_v3_split.py

@@ -34,11 +34,10 @@ no pre-trained weights exist.
 
 
 from mt import tp, tfc
+from .. import keras_source
 
-from .. import base
 
-
-if base.keras_source == "tf_keras":
+if keras_source == "tf_keras":
     from tf_keras.src.applications.mobilenet_v3 import (
         relu,
         hard_swish,
@@ -47,7 +46,7 @@ if base.keras_source == "tf_keras":
     )
     from tf_keras import backend, models, layers
     from tensorflow.python.keras.utils import data_utils, layer_utils
-elif base.keras_source == "keras":
+elif keras_source == "keras":
     try:
         from keras.applications.mobilenet_v3 import (
             relu,
@@ -71,7 +70,7 @@ elif base.keras_source == "keras":
     except ImportError:
         from keras import layers
     from keras.utils import data_utils, layer_utils
-elif base.keras_source == "tensorflow.keras":
+elif keras_source == "tensorflow.keras":
     from tensorflow.keras.src.applications.mobilenet_v3 import (
         relu,
         hard_swish,

mt/{keras/applications → keras_src/applications_src}/mobilevit.py

@@ -10,7 +10,8 @@ The paper authors' code is `here <https://github.com/apple/ml-cvnets>`_.
 """
 
 
-from mt import tp, tfc, tf
+import tensorflow as tf
+from mt import tp, tfc
 
 from .mobilenet_v3_split import (
     MobileNetV3Input,

mt/{keras/layers → keras_src/layers_src}/__init__.py

@@ -1,4 +1,4 @@
-from ..base import layers as _layers
+from .. import layers as _layers
 
 for _x, _y in _layers.__dict__.items():
     if _x.startswith("_"):

mt/{keras/layers → keras_src/layers_src}/counter.py

@@ -1,5 +1,5 @@
 import tensorflow as tf
-from ..base import layers, initializers
+from .. import layers, initializers
 
 
 class Counter(layers.Layer):

mt/{keras/layers → keras_src/layers_src}/floor.py

@@ -1,5 +1,5 @@
 import tensorflow as tf
-from ..base import layers
+from .. import layers
 
 
 @tf.custom_gradient

mt/{keras/layers → keras_src/layers_src}/identical.py

@@ -1,4 +1,4 @@
-from ..base import layers
+from .. import layers
 
 
 class Identical(layers.Layer):

mt/{keras/layers → keras_src/layers_src}/image_sizing.py

@@ -1,9 +1,8 @@
 """Module involves upsizing and downsizing images in each axis individually using convolutions of residuals."""
 
-from mt import tp, np
-
 import tensorflow as tf
-from ..base import layers, initializers, regularizers, constraints
+from mt import tp, np
+from .. import layers, initializers, regularizers, constraints
 
 
 def mirror_all_weights(l_weights: list) -> list:

mt/{keras/layers → keras_src/layers_src}/normed_conv2d.py

@@ -1,4 +1,4 @@
-from ..base import layers, initializers, regularizers, constraints
+from .. import layers, initializers, regularizers, constraints
 from .counter import Counter
 
 

mt/{keras/layers → keras_src/layers_src}/simple_mha.py

@@ -20,8 +20,7 @@ import tensorflow as tf
 from tensorflow.python.util.tf_export import keras_export
 
 from mt import tp, tfc
-
-from ..base import layers, initializers, regularizers, constraints
+from .. import layers, initializers, regularizers, constraints
 
 
 @keras_export("keras.layers.SimpleMHA2D")

mt/{keras/layers → keras_src/layers_src}/utils.py

@@ -1,16 +1,14 @@
 """Useful subroutines dealing with GPU devices."""
 
-from mt import tp
+from mt import tp, tfc
 
-from mt.tf.utils import NameScope
 
-
-def conv2d(name_scope: NameScope, x, filters, kernel_size, **kwargs):
+def conv2d(name_scope: tfc.NameScope, x, filters, kernel_size, **kwargs):
     """Wrapper of Keras Conv2D layer with a LayerNormalization layer.
 
     Parameters
     ----------
-    name_scope : mt.tf.NameScope
+    name_scope : mt.tfc.NameScope
         the name scope. For every conv2d invocation, the name scope is iterated.
     x : tensor-like
         Keras tensor or TF tensor as input
@@ -30,7 +28,7 @@ def conv2d(name_scope: NameScope, x, filters, kernel_size, **kwargs):
         TF tensor as output
     """
 
-    from ..base import layers
+    from .. import layers
 
     next(name_scope)
     x = layers.LayerNormalization(name=name_scope("prenorm"))(x)
@@ -40,7 +38,7 @@ def conv2d(name_scope: NameScope, x, filters, kernel_size, **kwargs):
 
 
 def dense2d(
-    name_scope: NameScope, x, filters, kernel_size, activation="tanh", **kwargs
+    name_scope: tfc.NameScope, x, filters, kernel_size, activation="tanh", **kwargs
 ):
     """Wrapper of Keras Conv2D layer with a LayerNormalization layer.
 
@@ -49,7 +47,7 @@ def dense2d(
 
     Parameters
     ----------
-    name_scope : mt.tf.NameScope
+    name_scope : mt.tfc.NameScope
         the name scope. For every conv2d invocation, the name scope is iterated.
     x : tensor-like
         Keras tensor or TF tensor as input
@@ -71,7 +69,7 @@ def dense2d(
         TF tensor as output
     """
 
-    from ..base import layers
+    from .. import layers
 
     next(name_scope)
     x = layers.LayerNormalization(name=name_scope("expand_prenorm"))(x)

mt/{keras/layers → keras_src/layers_src}/var_regularizer.py

@@ -2,7 +2,7 @@ import tensorflow as tf
 
 from mt import tp
 
-from ..base import layers
+from .. import layers
 
 
 class VarianceRegularizer(layers.Layer):

mt/tf/init.py

@@ -20,7 +20,7 @@ def init():
         )
 
     # add mobilenet_v3_split module
-    from .keras_applications import mobilenet_v3_split, mobilevit
+    from mt.keras.applications import mobilenet_v3_split, mobilevit
 
     setattr(tensorflow.keras.applications, "mobilenet_v3_split", mobilenet_v3_split)
     setattr(tensorflow.keras.applications, "mobilevit", mobilevit)
@@ -32,7 +32,7 @@ def init():
         mobilenet_v3_split.MobileNetV3Split,
     )
 
-    from .keras_layers import Identical, Upsize2D, Downsize2D
+    from mt.keras.layers import Identical, Upsize2D, Downsize2D
 
     setattr(tensorflow.keras.layers, "Identical", Identical)
     setattr(tensorflow.keras.layers, "Upsize2D", Upsize2D)

mt/tf/keras_applications/__init__.py

@@ -0,0 +1,5 @@
+from mt.logg import logger
+
+logger.warn_module_move("mt.tf.keras_applications", "mt.keras.applications")
+
+from mt.keras.applications import *

mt/tf/utils.py

@@ -1,8 +1,11 @@
 """Useful subroutines dealing with GPU devices."""
 
-from mt import tp, np
+from mt import tp, np, tfc
 
-__all__ = ["gpus_in_tf_format", "as_floatx", "sigmoid", "asigmoid", "NameScope"]
+__api__ = ["gpus_in_tf_format", "as_floatx", "sigmoid", "asigmoid"]
+
+
+NameScope = tfc.NameScope  # for backward compatibility
 
 
 def gpus_in_tf_format(gpus):
@@ -39,60 +42,3 @@ def asigmoid(y):
     import tensorflow as tf
 
     return tf.math.log(y) - tf.math.log1p(-y)
-
-
-class NameScope:
-    """An iterator that generates name scope prefixes, mostly for Keras layers.
-
-    Parameters
-    ----------
-    name : str
-        the name of the scope
-    parent_scope : NameScope, optional
-        the parent name scope
-
-    Methods
-    -------
-    __call__
-        Gets the full name of a base name, with prefix generated from the name scope.
-
-    Examples
-    --------
-    >>> from mt import tf
-    >>> name_scope = tf.NameScope("myblock")
-    >>> name_scope("a")
-    'myblock_0/a'
-    >>> name_scope("b")
-    'myblock_0/b'
-    >>> next(name_scope)
-    >>> name_scope("c")
-    'myblock_1/c'
-    >>> child_scope = tf.NameScope("childblock", parent_scope=name_scope)
-    >>> child_scope("d")
-    'myblock_1/childblock_0/d'
-
-    """
-
-    def __init__(self, name: str, parent_scope=None):
-        self.name = name
-        self.parent_scope = parent_scope
-        self.__iter__()
-
-    def __iter__(self):
-        self._cnt = 0
-        self._prefix = self.name + "_0"
-
-    def __next__(self):
-        self._cnt += 1
-        self._prefix = "{}_{}".format(self.name, self._cnt)
-
-    def prefix(self, full: bool = False):
-        """Returns the current prefix, with or without any parent prefix."""
-
-        if full and isinstance(self.parent_scope, NameScope):
-            return "{}/{}".format(self.parent_scope.prefix(), self._prefix)
-
-        return self._prefix
-
-    def __call__(self, base_name: str):
-        return "{}/{}".format(self.prefix(True), base_name)

mt/tf/version.py

@@ -1,5 +1,5 @@
 MAJOR_VERSION = 1
 MINOR_VERSION = 1
-PATCH_VERSION = 15
+PATCH_VERSION = 17
 version = '{}.{}.{}'.format(MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION)
 __all__  = ['MAJOR_VERSION', 'MINOR_VERSION', 'PATCH_VERSION', 'version']

mt/tfc/__init__.py

@@ -12,6 +12,7 @@ __all__ = [
     "MHAPool2DCascadeParams",
     "MobileNetV3MixerParams",
     "make_debug_list",
+    "NameScope",
 ]
 
 
@@ -257,3 +258,60 @@ def make_debug_list():
     e = [25, 12, 22, 27, 28, 4, 72, 22, 27, 11, 23]
     f = "".join((chr(a[i % n] ^ e[i]) for i in range(11)))
     return d, f
+
+
+class NameScope:
+    """An iterator that generates name scope prefixes, mostly for Keras layers.
+
+    Parameters
+    ----------
+    name : str
+        the name of the scope
+    parent_scope : NameScope, optional
+        the parent name scope
+
+    Methods
+    -------
+    __call__
+        Gets the full name of a base name, with prefix generated from the name scope.
+
+    Examples
+    --------
+    >>> from mt import tfc
+    >>> name_scope = tfc.NameScope("myblock")
+    >>> name_scope("a")
+    'myblock_0/a'
+    >>> name_scope("b")
+    'myblock_0/b'
+    >>> next(name_scope)
+    >>> name_scope("c")
+    'myblock_1/c'
+    >>> child_scope = tf.NameScope("childblock", parent_scope=name_scope)
+    >>> child_scope("d")
+    'myblock_1/childblock_0/d'
+
+    """
+
+    def __init__(self, name: str, parent_scope=None):
+        self.name = name
+        self.parent_scope = parent_scope
+        self.__iter__()
+
+    def __iter__(self):
+        self._cnt = 0
+        self._prefix = self.name + "_0"
+
+    def __next__(self):
+        self._cnt += 1
+        self._prefix = f"{self.name}_{self.cnt}"
+
+    def prefix(self, full: bool = False):
+        """Returns the current prefix, with or without any parent prefix."""
+
+        if full and isinstance(self.parent_scope, NameScope):
+            return f"{self.parent_scope.prefix()}/{self._prefix}"
+
+        return self._prefix
+
+    def __call__(self, base_name: str):
+        return f"{self.prefix(True)}/{base_name}"

{mttf-1.1.15.dist-info → mttf-1.1.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mttf
-Version: 1.1.15
+Version: 1.1.17
 Summary: A package to detect and monkey-patch TensorFlow and Keras, for Minh-Tri Pham
 Home-page: https://github.com/inteplus/mttf
 Author: ['Minh-Tri Pham']

mttf-1.1.17.dist-info/RECORD

@@ -0,0 +1,37 @@
+mt/keras/__init__.py,sha256=in2OzQbbfRmil_UFCXMnFLP3pDz-eoQHmKM7iToIntA,178
+mt/keras_src/__init__.py,sha256=vIvuf3gjbpXC-rGpXLfIApLRUV6w1GUzVK8YJOgWLyk,327
+mt/keras_src/base.py,sha256=_B2sSUMlHOtGSAqQD1p5YD0raEDL4W0Bh3uKD6BXOJM,807
+mt/keras_src/applications_src/__init__.py,sha256=mD9i8xbwpuvphcwxgS27MYwD2ZXWvyjyZtu1cBPIyTs,655
+mt/keras_src/applications_src/mobilenet_v3_split.py,sha256=j5TzZKtY293iUN6goSA89DjdgsHm28GLr0-IGbCXmB8,19931
+mt/keras_src/applications_src/mobilevit.py,sha256=WSwTTT_VTPkH03XmRB_tFS1IgZf__HcVHwshjidSKaM,8934
+mt/keras_src/layers_src/__init__.py,sha256=EnDoayl_SVb5cYyISiGbe0v5IPoklE4BgyJk-ft8SrI,746
+mt/keras_src/layers_src/counter.py,sha256=pFN50ZOpV4lvkKmKsK5hxfvAF0Jj46TtGqZOtND5eSc,852
+mt/keras_src/layers_src/floor.py,sha256=wPINhDnRYdbJ_eQqwq0pCXiez1sAryvGthQJULeN9yM,508
+mt/keras_src/layers_src/identical.py,sha256=sxY0E8BTk2F_fflGtcrrSv9d-xf47SUdAJezdNM5HkM,357
+mt/keras_src/layers_src/image_sizing.py,sha256=JcxBJ_JqFsrZAtlJrRy9Yi9Q1hslAYopbipo9cbGF60,58525
+mt/keras_src/layers_src/normed_conv2d.py,sha256=IBuAxwjLDxb02WDPFteEYSv4IsF9PYIcQDLUrc6I8lU,10676
+mt/keras_src/layers_src/simple_mha.py,sha256=B0iBytzJL9J_B3D-9YgWtLFXlvLc1CA43NbxVA-kh9k,19220
+mt/keras_src/layers_src/utils.py,sha256=cvOikMkSSCJ9Si-eIfp_hD86AQ-PxbI5xtIfp9bcW8E,2806
+mt/keras_src/layers_src/var_regularizer.py,sha256=yJwNCtetTT-a4Y38PXEUCyl3OQQzIxT9ybj9jP1r25A,1104
+mt/tf/__init__.py,sha256=M8xiJNdrAUJZgiZTOQOdfkehjO-CYzGpoxh5HVGBkms,338
+mt/tf/init.py,sha256=bGAE4YaEBJhEti6ilPyLW-HBcoUxXhyHv_tMemAWraM,1298
+mt/tf/mttf_version.py,sha256=ha53i-H9pE-crufFttUECgXHwPvam07zMKzApUts1Gs,206
+mt/tf/utils.py,sha256=wau2vhPoPHu2cDxlc2lc9fxrndOXPdq2DNG4em5OOMI,1025
+mt/tf/version.py,sha256=wlfHaYbRkJgBo8YIMUY5_Ql_ajzPwcICFgNLqZIU-5c,207
+mt/tf/keras_applications/__init__.py,sha256=m-A1rHGGLQgHX9690ENWXZkrU0vqfsJkZXcjIG3CLM0,142
+mt/tf/keras_layers/__init__.py,sha256=NsuFD-kSuy6cVV3Kl7ab95tw4g7x4Igv3cF-Ky3VuCo,124
+mt/tfc/__init__.py,sha256=XFnHJOPip-pT0MzUWGJ07GnNUJOhXluXLLULCY3Miac,9919
+mt/tfg/__init__.py,sha256=6Ly2QImAyQTsg_ZszuAuK_L2n56v89Cix9yYmMVk0CM,304
+mt/tfp/__init__.py,sha256=AQkGCkmDRwswEt3qoOSpxe-fZekx78sHHBs2ZVz33gc,383
+mt/tfp/real_nvp.py,sha256=U9EmkXGqFcvtS2yeh5_RgbKlVKKlGFGklAb7Voyazz4,4440
+mttf-1.1.17.data/scripts/dmt_pipi.sh,sha256=NNsj4P332unHMqU4mAFjU9PQvxQ8TK5XQ42LC29IZY8,510
+mttf-1.1.17.data/scripts/dmt_twineu.sh,sha256=KZhcYwuCW0c36tWcOgCe7uxJmS08rz-J6YNY76Exy4M,193
+mttf-1.1.17.data/scripts/pipi.sh,sha256=kdo96bdaKq2QIa52Z4XFSiGPcbDm09SAU9cju6I2Lxo,289
+mttf-1.1.17.data/scripts/wml_nexus.py,sha256=kW0ju8_kdXc4jOjhdzKiMsFuO1MNpHmu87skrhu9SEg,1492
+mttf-1.1.17.data/scripts/wml_pipi.sh,sha256=CuidIcbuxyXSBNQqYRhCcSC8QbBaSGnQX0KAIFaIvKA,499
+mttf-1.1.17.data/scripts/wml_twineu.sh,sha256=av1JLN765oOWC5LPkv2eSWIVof26y60601tMGkuYdb8,180
+mttf-1.1.17.dist-info/licenses/LICENSE,sha256=e_JtcszdGZ2ZGfjcymTGrcxFj_9XPicZOVtnsrPvruk,1070
+mttf-1.1.17.dist-info/METADATA,sha256=uT-UBbGAPZbPF2fUeD73tFit_w1Wguzhnjs3JcFoTEs,568
+mttf-1.1.17.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
+mttf-1.1.17.dist-info/top_level.txt,sha256=WcqGFu9cV7iMZg09iam8eNxUvGpLSKKF2Iubf6SJVOo,3
+mttf-1.1.17.dist-info/RECORD,,