diff --git a/torch_npu/csrc/aten/common/TensorFactories.cpp b/torch_npu/csrc/aten/common/TensorFactories.cpp
index 756018645026337bac14019313689dc1d0cb5ebb..b71f65b9c41ea6125cfafcfb829c445d7f02a43b 100644
--- a/torch_npu/csrc/aten/common/TensorFactories.cpp
+++ b/torch_npu/csrc/aten/common/TensorFactories.cpp
@@ -309,12 +309,10 @@ namespace at_npu
         c10::optional<c10::MemoryFormat> optional_memory_format)
     {
 
-      c10::TensorOptions options;
-      auto device = device_or_default(device_opt);
-      options = options.dtype(dtype_opt)
-                       .device(device)
-                       .layout(layout_opt)
-                       .pinned_memory(pin_memory_opt);
+      c10::TensorOptions options = c10::TensorOptions().dtype(dtype_opt)
+                                          .device(device_opt)
+                                          .layout(layout_opt)
+                                          .pinned_memory(pin_memory_opt);
 
       return at_npu::native::empty_like_npu(self, options, optional_memory_format);
     }
@@ -419,12 +417,10 @@ namespace at_npu
                                                      int64_t dst_format)
     {
       caffe2::TypeMeta dtype = c10::scalarTypeToTypeMeta(dtype_or_default(dtype_opt));
-      c10::TensorOptions options;
-      auto device = device_or_default(device_opt);
-      options = options.dtype(dtype_opt)
-                       .device(device)
-                       .layout(layout_opt)
-                       .pinned_memory(pin_memory_opt);
+      c10::TensorOptions options = c10::TensorOptions().dtype(dtype_opt)
+                                          .device(device_opt)
+                                          .layout(layout_opt)
+                                          .pinned_memory(pin_memory_opt);
       at::Tensor result = OpPreparation::ApplyTensorWithFormat(size, options, dst_format);
       if (names.has_value())
       {
@@ -514,12 +510,10 @@ namespace at_npu
                                                    c10::optional<bool> pin_memory_opt)
     {
 
-      c10::TensorOptions options;
-      auto device = device_or_default(device_opt);
-      options = options.dtype(dtype_opt)
-                       .device(device)
-                       .layout(layout_opt)
-                       .pinned_memory(pin_memory_opt);
+      c10::TensorOptions options = c10::TensorOptions().dtype(dtype_opt)
+                                          .device(device_opt)
+                                          .layout(layout_opt)
+                                          .pinned_memory(pin_memory_opt);
 
       window_function_checks("blackman_window", options, window_length);
       if (window_length == 0)
@@ -558,12 +552,10 @@ namespace at_npu
         c10::optional<bool> pin_memory_opt)
     {
 
-      c10::TensorOptions options;
-      auto device = device_or_default(device_opt);
-      options = options.dtype(dtype_opt)
-                       .device(device)
-                       .layout(layout_opt)
-                       .pinned_memory(pin_memory_opt);
+      c10::TensorOptions options = c10::TensorOptions().dtype(dtype_opt)
+                                          .device(device_opt)
+                                          .layout(layout_opt)
+                                          .pinned_memory(pin_memory_opt);
 
       window_function_checks("bartlett_window", options, window_length);
       if (window_length == 0)
@@ -604,12 +596,10 @@ namespace at_npu
         c10::optional<bool> pin_memory_opt)
     {
 
-      c10::TensorOptions options;
-      auto device = device_or_default(device_opt);
-      options = options.dtype(dtype_opt)
-                       .device(device)
-                       .layout(layout_opt)
-                       .pinned_memory(pin_memory_opt);
+      c10::TensorOptions options = c10::TensorOptions().dtype(dtype_opt)
+                                          .device(device_opt)
+                                          .layout(layout_opt)
+                                          .pinned_memory(pin_memory_opt);
 
       window_function_checks("hann_window", options, window_length);
       return at::hamming_window(window_length, periodic, 0.5, 0.5, options);
@@ -636,12 +626,10 @@ namespace at_npu
         c10::optional<bool> pin_memory_opt)
     {
 
-      c10::TensorOptions options;
-      auto device = device_or_default(device_opt);
-      options = options.dtype(dtype_opt)
-                       .device(device)
-                       .layout(layout_opt)
-                       .pinned_memory(pin_memory_opt);
+      c10::TensorOptions options = c10::TensorOptions().dtype(dtype_opt)
+                                          .device(device_opt)
+                                          .layout(layout_opt)
+                                          .pinned_memory(pin_memory_opt);
 
       window_function_checks("hamming_window", options, window_length);
       if (window_length == 0)
@@ -753,12 +741,10 @@ namespace at_npu
         c10::optional<at::Device> device_opt,
         c10::optional<bool> pin_memory_opt)
     {
-      c10::TensorOptions options;
-      auto device = device_or_default(device_opt);
-      options = options.dtype(dtype_opt)
-                       .device(device)
-                       .layout(layout_opt)
-                       .pinned_memory(pin_memory_opt);
+      c10::TensorOptions options = c10::TensorOptions().dtype(dtype_opt)
+                                          .device(device_opt)
+                                          .layout(layout_opt)
+                                          .pinned_memory(pin_memory_opt);
       TORCH_CHECK(
           options.layout() != at::kSparse,
           "full(...) is not implemented for sparse layout");
diff --git a/torch_npu/csrc/aten/ops/ArangeKernelNpu.cpp b/torch_npu/csrc/aten/ops/ArangeKernelNpu.cpp
index 494594327d438733d23a9a6ebb0005c747e13e20..31e6acafc9ae8f104f4f18ee0ecf0a2fb4b32a53 100644
--- a/torch_npu/csrc/aten/ops/ArangeKernelNpu.cpp
+++ b/torch_npu/csrc/aten/ops/ArangeKernelNpu.cpp
@@ -58,12 +58,10 @@ at::Tensor NPUNativeFunctions::arange(
     c10::optional<at::Device> device_opt,
     c10::optional<bool> pin_memory_opt) {
 
-  auto device = device_or_default(device_opt);
-  at::TensorOptions option;
-  option = option.dtype(dtype_opt)
-                 .layout(layout_opt)
-                 .device(device)
-                 .pinned_memory(pin_memory_opt);
+  c10::TensorOptions option = c10::TensorOptions().dtype(dtype_opt)
+                                          .device(device_opt)
+                                          .layout(layout_opt)
+                                          .pinned_memory(pin_memory_opt);
 
   float start_value = CalcuOpUtil::get_scalar_float_value(start);
   float end_value = CalcuOpUtil::get_scalar_float_value(end);
diff --git a/torch_npu/csrc/aten/ops/FullKernelNpu.cpp b/torch_npu/csrc/aten/ops/FullKernelNpu.cpp
index 8f644cbc0f9e59dd62593602c1b3505e305dfc07..f2fe8936c329c022eb12d94d0832380b714a5afe 100644
--- a/torch_npu/csrc/aten/ops/FullKernelNpu.cpp
+++ b/torch_npu/csrc/aten/ops/FullKernelNpu.cpp
@@ -37,12 +37,10 @@ at::Tensor NPUNativeFunctions::full(
     c10::optional<at::Layout> layout_opt,
     c10::optional<at::Device> device_opt,
     c10::optional<bool> pin_memory_opt) {
-  c10::TensorOptions option;
-  auto device = device_or_default(device_opt);
-  option = option.dtype(dtype_opt)
-                 .device(device)
-                 .layout(layout_opt)
-                 .pinned_memory(pin_memory_opt);
+  c10::TensorOptions option = c10::TensorOptions().dtype(dtype_opt)
+                                          .device(device_opt)
+                                          .layout(layout_opt)
+                                          .pinned_memory(pin_memory_opt);
   at::Tensor result = OpPreparation::ApplyTensorWithSizes(size, option);
   return result.fill_(fill_value);
 }
diff --git a/torch_npu/csrc/aten/ops/RangeKernelNpu.cpp b/torch_npu/csrc/aten/ops/RangeKernelNpu.cpp
index df65f925d39f9a84819d0c68a1199f45a1bc5451..c8ea4f2e408cdf6ef0e26cf1bd3c164551647280 100644
--- a/torch_npu/csrc/aten/ops/RangeKernelNpu.cpp
+++ b/torch_npu/csrc/aten/ops/RangeKernelNpu.cpp
@@ -55,12 +55,10 @@ at::Tensor NPUNativeFunctions::range(
     c10::optional<at::Layout> layout_opt,
     c10::optional<at::Device> device_opt,
     c10::optional<bool> pin_memory_opt) {
-  auto device = device_or_default(device_opt);
-  c10::TensorOptions option;
-  option = option.dtype(dtype_opt)
-                 .device(device)
-                 .layout(layout_opt)
-                 .pinned_memory(pin_memory_opt);
+  c10::TensorOptions option = c10::TensorOptions().dtype(dtype_opt)
+                                          .device(device_opt)
+                                          .layout(layout_opt)
+                                          .pinned_memory(pin_memory_opt);
   return at::range(start, end, 1, option);
 }
 
@@ -72,12 +70,10 @@ at::Tensor NPUNativeFunctions::range(
     c10::optional<at::Layout> layout_opt,
     c10::optional<at::Device> device_opt,
     c10::optional<bool> pin_memory_opt) {
-  auto device = device_or_default(device_opt);
-  c10::TensorOptions option;
-  option = option.dtype(dtype_opt)
-                 .device(device)
-                 .layout(layout_opt)
-                 .pinned_memory(pin_memory_opt);
+  c10::TensorOptions option = c10::TensorOptions().dtype(dtype_opt)
+                                          .device(device_opt)
+                                          .layout(layout_opt)
+                                          .pinned_memory(pin_memory_opt);
 
   float start_value = CalcuOpUtil::get_scalar_float_value(start);
   float end_value = CalcuOpUtil::get_scalar_float_value(end);