feat: add torch_delete interface

Cambridge-ICCS · Jul 10, 2024 · d7c0f4d · d7c0f4d
1 parent 291080a
commit d7c0f4d
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 15 deletions.
diff --git a/examples/1_SimpleNet/simplenet_infer_fortran.f90 b/examples/1_SimpleNet/simplenet_infer_fortran.f90
@@ -47,8 +47,8 @@ program inference
    write (*,*) out_data(:)
 
    ! Cleanup
-   call torch_model_delete(model)
-   call torch_tensor_array_delete(in_tensors)
-   call torch_tensor_array_delete(out_tensors)
+   call torch_delete(model)
+   call torch_delete(in_tensors)
+   call torch_delete(out_tensors)
 
 end program inference
diff --git a/examples/2_ResNet18/resnet_infer_fortran.f90 b/examples/2_ResNet18/resnet_infer_fortran.f90
@@ -102,9 +102,9 @@ subroutine main()
       write (*,*) trim(categories(idx(2))), " (id=", idx(2), "), : probability =", probability
 
       ! Cleanup
-      call torch_model_delete(model)
-      call torch_tensor_array_delete(in_tensors)
-      call torch_tensor_array_delete(out_tensors)
+      call torch_delete(model)
+      call torch_delete(in_tensors)
+      call torch_delete(out_tensors)
       deallocate(in_data)
       deallocate(out_data)
       deallocate(probabilities)

diff --git a/examples/3_MultiGPU/simplenet_infer_fortran.f90 b/examples/3_MultiGPU/simplenet_infer_fortran.f90
@@ -69,9 +69,9 @@ program inference
    200 format("output on rank ", i1,": [", 4(f5.1,","), f5.1,"]")
 
    ! Cleanup
-   call torch_model_delete(model)
-   call torch_tensor_array_delete(in_tensors)
-   call torch_tensor_array_delete(out_tensors)
+   call torch_delete(model)
+   call torch_delete(in_tensors)
+   call torch_delete(out_tensors)
    call mpi_finalize(ierr)
 
 end program inference
diff --git a/examples/4_MultiIO/multiionet_infer_fortran.f90 b/examples/4_MultiIO/multiionet_infer_fortran.f90
@@ -53,8 +53,8 @@ program inference
    write (*,*) out_data2
 
    ! Cleanup
-   call torch_model_delete(model)
-   call torch_tensor_array_delete(in_tensors)
-   call torch_tensor_array_delete(out_tensors)
+   call torch_delete(model)
+   call torch_delete(in_tensors)
+   call torch_delete(out_tensors)
 
 end program inference
diff --git a/pages/examples.md b/pages/examples.md
@@ -89,9 +89,9 @@ call torch_model_forward(model, model_input_arr, model_output_arr)
 write(*,*) output
 
 ! Clean up
-call torch_model_delete(model)
-call torch_tensor_array_delete(model_input_arr)
-call torch_tensor_array_delete(model_output_arr)
+call torch_delete(model)
+call torch_delete(model_input_arr)
+call torch_delete(model_output_arr)
 ```
 
 #### 3. Build the code

diff --git a/src/ftorch.f90 b/src/ftorch.f90
@@ -74,6 +74,13 @@ module ftorch
     module procedure torch_tensor_from_array_real64_4d
   end interface
 
+  !> Interface for deleting generic torch objects
+  interface torch_delete
+    module procedure torch_model_delete
+    module procedure torch_tensor_delete
+    module procedure torch_tensor_array_delete
+  end interface
+
   interface
     function torch_from_blob_c(data, ndims, tensor_shape, strides, dtype, &
                                device_type, device_index, &

diff --git a/src/ftorch.fypp b/src/ftorch.fypp
@@ -72,6 +72,13 @@ module ftorch
     #:endfor
   end interface
 
+  !> Interface for deleting generic torch objects
+  interface torch_delete
+    module procedure torch_model_delete
+    module procedure torch_tensor_delete
+    module procedure torch_tensor_array_delete
+  end interface
+
   interface
     function torch_from_blob_c(data, ndims, tensor_shape, strides, dtype, &
                                device_type, device_index, &