address reviewer feedback: update file path types to Path, rollback version changes, and improve tensor device handling

Author: darshil929

nncf/tensor/functions/tf_io.py

@@ -9,6 +9,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from pathlib import Path
 from typing import Dict, Optional
 
 import tensorflow as tf
@@ -19,10 +20,10 @@
 from nncf.tensor.functions import io as io
 
 
-def load_file(file_path: str, *, device: Optional[TensorDeviceType] = None) -> Dict[str, tf.Tensor]:
+def load_file(file_path: Path, *, device: Optional[TensorDeviceType] = None) -> Dict[str, tf.Tensor]:
     return tf_load_file(file_path)
 
 
 @io.save_file.register
-def _(data: Dict[str, tf.Tensor], file_path: str) -> None:
+def _(data: Dict[str, tf.Tensor], file_path: Path) -> None:
     return tf_save_file(data, file_path)

nncf/tensor/functions/tf_numeric.py

@@ -293,13 +293,13 @@ def _(
 @numeric._binary_op_nowarn.register(tf.Tensor)
 def _(a: tf.Tensor, b: Union[tf.Tensor, float], operator_fn: Callable) -> tf.Tensor:
     with tf.device(a.device):
-        return operator_fn(a, b)
+        return tf.identity(operator_fn(a, b))
 
 
 @numeric._binary_reverse_op_nowarn.register(tf.Tensor)
 def _(a: tf.Tensor, b: Union[tf.Tensor, float], operator_fn: Callable) -> tf.Tensor:
     with tf.device(a.device):
-        return operator_fn(b, a)
+        return tf.identity(operator_fn(b, a))
 
 
 @numeric.clip.register(tf.Tensor)

nncf/tensor/tensor.py

@@ -140,7 +140,7 @@ def __floordiv__(self, other: Union[Tensor, T_NUMBER]) -> Tensor:
     def __rfloordiv__(self, other: Union[Tensor, T_NUMBER]) -> Tensor:
         return cast(Tensor, _call_function("_binary_reverse_op_nowarn", self, other, operator.floordiv))
 
-    def __ifloordiv__(self, other: Union[Tensor, float]) -> Tensor:
+    def __ifloordiv__(self, other: Union[Tensor, T_NUMBER]) -> Tensor:
         self._data //= unwrap_tensor_data(other)
         return self
 

nncf/version.py

@@ -9,7 +9,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "2.16.0.dev0+b1af5d11dirty"
+__version__ = "2.16.0"
 
 
 BKC_TORCH_SPEC = "==2.6.*"

tests/cross_fw/test_templates/template_test_nncf_tensor.py

@@ -113,8 +113,7 @@ def test_operators_tensor(self, op_name):
         assert res.dtype == res_nncf.data.dtype
         assert all(res == res_nncf.data)
         assert isinstance(res_nncf, Tensor)
-        if not (self.backend() == TensorBackend.tf and self.device() == TensorDeviceType.CPU):
-            assert res_nncf.device == nncf_tensor_a.device
+        assert res_nncf.device == nncf_tensor_a.device
 
     @pytest.mark.parametrize("op_name", OPERATOR_MAP.keys())
     def test_operators_int(self, op_name):