Skip to content

Commit 57764e9

Browse files
ds5678ds5678
authored
Remove invalid P/Invoke methods (#1508)
* Remove invalid P/Invoke methods These 3 methods have incorrect signatures for their entrypoint. Each of them has an overload with the correct signature. * Fix var compile error * Fix method documentation * Remove pinvoke methods without a native entrypoint * Use coallesce expression
1 parent d422728 commit 57764e9

6 files changed

Lines changed: 14 additions & 151 deletions

File tree

‎src/TorchSharp/JIT/ScriptModule.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,6 @@ public Type GetInputType(int index)
238238
return GetType(type);
239239
}
240240

241-
public Type GetOutputType(int index)
242-
{
243-
var type = new Type(THSJIT_getOutputType(handle, index), Type.TypeKind.AnyType);
244-
245-
return GetType(type);
246-
}
247-
248241
private Type GetType(Type type)
249242
{
250243
switch (type.Kind) {

‎src/TorchSharp/PInvoke/LibTorchSharp.THSJIT.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ internal static partial class NativeMethods
3838
[DllImport("LibTorchSharp")]
3939
internal static extern void THSJIT_Module_named_children(torch.nn.Module.HType module, AllocatePinnedArray allocator1, AllocatePinnedArray allocator2);
4040

41-
[DllImport("LibTorchSharp")]
42-
internal static extern long THSJIT_getNumModules(torch.nn.Module.HType module);
43-
4441
[DllImport("LibTorchSharp")]
4542
internal static extern int THSJIT_Module_num_inputs(torch.nn.Module.HType module);
4643

@@ -69,9 +66,6 @@ internal static partial class NativeMethods
6966
[DllImport("LibTorchSharp")]
7067
internal static extern IntPtr THSJIT_Module_getInputType(torch.nn.Module.HType module, int index);
7168

72-
[DllImport("LibTorchSharp")]
73-
internal static extern IntPtr THSJIT_getOutputType(torch.jit.Type.HType module, int index);
74-
7569
[DllImport("LibTorchSharp")]
7670
internal static extern void THSJIT_Module_forward(torch.nn.Module.HType module, IntPtr tensors, int length, AllocateIndexedNativeTensorOrScalarArray allocator, out sbyte typeCode, int idx);
7771

‎src/TorchSharp/PInvoke/LibTorchSharp.THSNN.cs‎

Lines changed: 0 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ internal static extern IntPtr THSNN_custom_module(
3838
[DllImport("LibTorchSharp")]
3939
internal static extern torch.nn.utils.rnn.PackedSequence.HType THSNN_GRU_forward_with_packed_input(torch.nn.Module.HType module, torch.nn.utils.rnn.PackedSequence.HType input, IntPtr h_0, out IntPtr h_n);
4040

41-
[DllImport("LibTorchSharp")]
42-
// align_corners -- 0=None, 1=true, 2=false
43-
internal static extern IntPtr THSNN_Upsample_ctor(IntPtr size, int size_length, IntPtr scale_factor, int scale_factor_length, byte mode, byte align_corners, out IntPtr pBoxedModule);
44-
4541
[DllImport("LibTorchSharp")]
4642
// align_corners -- 0=None, 1=true, 2=false
4743
internal static extern IntPtr THSNN_interpolate(IntPtr input, IntPtr size, int size_len, IntPtr scale_factor, int scale_factor_len, byte mode, byte align_corners, [MarshalAs(UnmanagedType.U1)] bool recompute_scale_factor, [MarshalAs(UnmanagedType.U1)] bool antialias);
@@ -65,26 +61,6 @@ internal static extern IntPtr THSNN_custom_module(
6561
[DllImport("LibTorchSharp")]
6662
internal static extern IntPtr THSNN_dropout2d(IntPtr input, double p, [MarshalAs(UnmanagedType.U1)] bool training, [MarshalAs(UnmanagedType.U1)] bool inplace);
6763

68-
[DllImport("LibTorchSharp")]
69-
internal static extern IntPtr THSNN_Dropout_ctor(double p, [MarshalAs(UnmanagedType.U1)] bool inplace, out IntPtr pBoxedModule);
70-
71-
[DllImport("LibTorchSharp")]
72-
internal static extern IntPtr THSNN_Dropout_forward(torch.nn.Module.HType module, IntPtr tensor);
73-
74-
[DllImport("LibTorchSharp")]
75-
internal static extern IntPtr THSNN_Dropout1d_forward(torch.nn.Module.HType module, IntPtr tensor);
76-
77-
[DllImport("LibTorchSharp")]
78-
internal static extern IntPtr THSNN_Dropout1d_ctor(double p, [MarshalAs(UnmanagedType.U1)] bool inplace, out IntPtr pBoxedModule);
79-
80-
81-
[DllImport("LibTorchSharp")]
82-
internal static extern IntPtr THSNN_Dropout2d_forward(torch.nn.Module.HType module, IntPtr tensor);
83-
84-
[DllImport("LibTorchSharp")]
85-
internal static extern IntPtr THSNN_Dropout2d_ctor(double p, [MarshalAs(UnmanagedType.U1)] bool inplace, out IntPtr pBoxedModule);
86-
87-
8864
[DllImport("LibTorchSharp")]
8965
internal static extern IntPtr THSNN_Embedding_forward(torch.nn.Module.HType module, IntPtr tensor);
9066

@@ -100,12 +76,6 @@ internal static extern IntPtr THSNN_custom_module(
10076
[DllImport("LibTorchSharp")]
10177
internal static extern IntPtr THSNN_Embedding_from_pretrained(IntPtr embeddings, [MarshalAs(UnmanagedType.U1)] bool freeze, long padding_idx, [MarshalAs(UnmanagedType.U1)] bool hasPI, double max_norm, [MarshalAs(UnmanagedType.U1)] bool hasMN, double norm_type, [MarshalAs(UnmanagedType.U1)] bool scale_grad_by_freq, [MarshalAs(UnmanagedType.U1)] bool sparse, out IntPtr pBoxedModule);
10278

103-
[DllImport("LibTorchSharp")]
104-
internal static extern IntPtr THSNN_Dropout3d_forward(torch.nn.Module.HType module, IntPtr tensor);
105-
106-
[DllImport("LibTorchSharp")]
107-
internal static extern IntPtr THSNN_Dropout3d_ctor(double p, [MarshalAs(UnmanagedType.U1)] bool inplace, out IntPtr pBoxedModule);
108-
10979
[DllImport("LibTorchSharp")]
11080
internal static extern IntPtr THSNN_dropout3d(IntPtr input, double p, [MarshalAs(UnmanagedType.U1)] bool training, [MarshalAs(UnmanagedType.U1)] bool inplace);
11181

@@ -223,9 +193,6 @@ internal static extern IntPtr THSNN_custom_module(
223193
[DllImport("LibTorchSharp")]
224194
internal static extern void THSNN_Module_train(torch.nn.Module.HType module, [MarshalAs(UnmanagedType.U1)] bool on);
225195

226-
[DllImport("LibTorchSharp")]
227-
internal static extern void THSNN_Module_eval(torch.nn.Module.HType module);
228-
229196
[DllImport("LibTorchSharp")]
230197
[return: MarshalAs(UnmanagedType.U1)]
231198
internal static extern bool THSNN_Module_is_training(torch.nn.Module.HType module);
@@ -308,39 +275,9 @@ internal static extern IntPtr THSNN_custom_module(
308275
[DllImport("LibTorchSharp")]
309276
internal static extern IntPtr THSNN_RNNCell_ctor(long input_size, long hidden_size, long nonlinearity, [MarshalAs(UnmanagedType.U1)] bool bias, out IntPtr pBoxedModule);
310277

311-
[DllImport("LibTorchSharp")]
312-
internal static extern IntPtr THSNN_Linear_forward(torch.nn.Module.HType module, IntPtr tensor);
313-
314-
[DllImport("LibTorchSharp")]
315-
internal static extern IntPtr THSNN_Linear_bias(torch.nn.Module.HType module);
316-
317-
[DllImport("LibTorchSharp")]
318-
internal static extern void THSNN_Linear_set_bias(torch.nn.Module.HType module, IntPtr tensor);
319-
320-
[DllImport("LibTorchSharp")]
321-
internal static extern IntPtr THSNN_Linear_weight(torch.nn.Module.HType module);
322-
323-
[DllImport("LibTorchSharp")]
324-
internal static extern void THSNN_Linear_set_weight(torch.nn.Module.HType module, IntPtr tensor);
325-
326-
[DllImport("LibTorchSharp")]
327-
internal static extern IntPtr THSNN_Linear_ctor(long input_size, long output_size, [MarshalAs(UnmanagedType.U1)] bool bias, out IntPtr pBoxedModule);
328-
329278
[DllImport("LibTorchSharp")]
330279
internal static extern IntPtr THSNN_functional_linear(IntPtr input, IntPtr weights, IntPtr bias);
331280

332-
[DllImport("LibTorchSharp")]
333-
internal static extern IntPtr THSNN_Flatten_forward(torch.nn.Module.HType module, IntPtr tensor);
334-
335-
[DllImport("LibTorchSharp")]
336-
internal static extern IntPtr THSNN_Flatten_ctor(long startDim, long endDim, out IntPtr pBoxedModule);
337-
338-
[DllImport("LibTorchSharp")]
339-
internal static extern IntPtr THSNN_Identity_forward(torch.nn.Module.HType module, IntPtr tensor);
340-
341-
[DllImport("LibTorchSharp")]
342-
internal static extern IntPtr THSNN_Identity_ctor(out IntPtr pBoxedModule);
343-
344281
[DllImport("LibTorchSharp")]
345282
internal static extern IntPtr THSNN_LSTMCell_forward(torch.nn.Module.HType module, IntPtr input, IntPtr h_0, IntPtr c_0, out IntPtr c_n);
346283

@@ -491,9 +428,6 @@ internal static extern IntPtr THSNN_custom_module(
491428
[DllImport("LibTorchSharp")]
492429
internal static extern IntPtr THSNN_TransformerEncoderLayer_ctor(long d_model, long nhead, long dim_feedforward, double dropout, long activation, out IntPtr pBoxedModule);
493430

494-
[DllImport("LibTorchSharp")]
495-
internal static extern IntPtr THSNN_Upsample_forward(torch.nn.Module.HType module, IntPtr tensor);
496-
497431
[DllImport("LibTorchSharp")]
498432
internal static extern IntPtr THSNN_TransformerEncoder_ctor(torch.nn.Module.HType encoder_layer, long num_layers, out IntPtr pBoxedModule);
499433

@@ -506,12 +440,6 @@ internal static extern IntPtr THSNN_custom_module(
506440
[DllImport("LibTorchSharp")]
507441
internal static extern IntPtr THSNN_affine_grid(IntPtr theta, IntPtr size, int size_len, [MarshalAs(UnmanagedType.U1)] bool align_corners);
508442

509-
[DllImport("LibTorchSharp")]
510-
internal static extern IntPtr THSNN_Unflatten_forward(torch.nn.Module.HType module, IntPtr tensor);
511-
512-
[DllImport("LibTorchSharp")]
513-
internal static extern IntPtr THSNN_Unflatten_ctor(long dim, IntPtr shape, long shape_len, out IntPtr pBoxedModule);
514-
515443
[DllImport("LibTorchSharp")]
516444
internal static extern IntPtr THSNN_normalize(IntPtr input, double p, long dim, double eps);
517445

@@ -530,41 +458,8 @@ internal static extern IntPtr THSNN_custom_module(
530458
[DllImport("LibTorchSharp")]
531459
internal static extern IntPtr THSNN_local_response_norm(IntPtr input, long size, double alpha, double beta, double k);
532460

533-
[DllImport("LibTorchSharp")]
534-
internal static extern IntPtr THSNN_ConvTranspose2d_forward(torch.nn.Module.HType module, IntPtr tensor);
535-
536-
[DllImport("LibTorchSharp")]
537-
internal static extern IntPtr THSNN_ConvTranspose2d_bias(torch.nn.Module.HType module);
538-
539-
[DllImport("LibTorchSharp")]
540-
internal static extern void THSNN_ConvTranspose2d_set_bias(torch.nn.Module.HType module, IntPtr tensor);
541-
542-
[DllImport("LibTorchSharp")]
543-
internal static extern IntPtr THSNN_ConvTranspose2d_weight(torch.nn.Module.HType module);
544-
545-
[DllImport("LibTorchSharp")]
546-
internal static extern void THSNN_ConvTranspose2d_set_weight(torch.nn.Module.HType module, IntPtr tensor);
547-
548-
[DllImport("LibTorchSharp")]
549-
internal static extern IntPtr THSNN_ConvTranspose2d_ctor(long inputChannel, long outputChannel, long kernel_size, long stride, long padding, long outputPadding, long dilation, long paddingMode, long groups, [MarshalAs(UnmanagedType.U1)] bool bias, out IntPtr pBoxedModule);
550-
551-
[DllImport("LibTorchSharp")]
552-
internal static extern IntPtr THSNN_ConvTranspose2d_ctor_1(long inputChannel, long outputChannel, long kernelSizeX, long kernelSizeY, long strideX, long strideY, long paddingX, long paddingY, long outputPaddingX, long outputPaddingY, long dilationX, long dilationY, long paddingMode, long groups, [MarshalAs(UnmanagedType.U1)] bool bias, out IntPtr pBoxedModule);
553-
554461
[DllImport("LibTorchSharp")]
555462
internal static extern IntPtr THSNN_scaled_dot_product_attention(IntPtr query, IntPtr key, IntPtr value, IntPtr attention_mask, double p, [MarshalAs(UnmanagedType.U1)] bool casual);
556-
557-
[DllImport("LibTorchSharp")]
558-
internal static extern IntPtr THSNN_Softshrink_forward(torch.nn.Module.HType module, IntPtr tensor);
559-
560-
[DllImport("LibTorchSharp")]
561-
internal static extern IntPtr THSNN_Softshrink_ctor(double lambd, out IntPtr pBoxedModule);
562-
563-
[DllImport("LibTorchSharp")]
564-
internal static extern IntPtr THSNN_Threshold_forward(torch.nn.Module.HType module, IntPtr tensor);
565-
566-
[DllImport("LibTorchSharp")]
567-
internal static extern IntPtr THSNN_Threshold_ctor(double threshold, double value, [MarshalAs(UnmanagedType.U1)] bool inplace, out IntPtr pBoxedModule);
568463
}
569464
#pragma warning restore CA2101
570465
}

‎src/TorchSharp/PInvoke/LibTorchSharp.THSTensor.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -526,9 +526,6 @@ internal static extern IntPtr THSTensor_upsample_nearest3d(IntPtr input,
526526
[DllImport("LibTorchSharp")]
527527
internal static extern IntPtr THSTensor_t(IntPtr tensor);
528528

529-
[DllImport("LibTorchSharp")]
530-
internal static extern IntPtr THSTensor_H(IntPtr tensor);
531-
532529
[DllImport("LibTorchSharp")]
533530
internal static extern IntPtr THSTensor_mT(IntPtr tensor);
534531

@@ -1038,9 +1035,6 @@ internal static extern IntPtr THSTensor_upsample_nearest3d(IntPtr input,
10381035
[DllImport("LibTorchSharp")]
10391036
internal static extern IntPtr THSTensor_mean_along_dimensions(IntPtr tensor, IntPtr dimensions, int length, [MarshalAs(UnmanagedType.U1)] bool keepdim, [MarshalAs(UnmanagedType.U1)] bool has_type, sbyte scalar_type);
10401037

1041-
[DllImport("LibTorchSharp")]
1042-
internal static extern IntPtr THSTensor_var_along_dimensions(IntPtr tensor, IntPtr dimensions, int length, [MarshalAs(UnmanagedType.U1)] bool keepdim, [MarshalAs(UnmanagedType.U1)] bool has_type, sbyte scalar_type);
1043-
10441038
[DllImport("LibTorchSharp")]
10451039
internal static extern IntPtr THSTensor_median(IntPtr tensor);
10461040

@@ -1353,18 +1347,12 @@ internal static extern IntPtr THSTensor_upsample_nearest3d(IntPtr input,
13531347
[DllImport("LibTorchSharp")]
13541348
internal static extern IntPtr THSTensor_istft(IntPtr x, long n_fft, long hop_length, long win_length, IntPtr window, [MarshalAs(UnmanagedType.U1)] bool center, [MarshalAs(UnmanagedType.U1)] bool normalized, long onesided, long length, [MarshalAs(UnmanagedType.U1)] bool return_complex);
13551349

1356-
[DllImport("LibTorchSharp")]
1357-
internal static extern IntPtr THSTensor_to_type(IntPtr handle, sbyte scalar_type);
1358-
13591350
[DllImport("LibTorchSharp")]
13601351
internal static extern IntPtr THSTensor_arange(IntPtr start, IntPtr stop, IntPtr step, sbyte scalarType, int deviceType, int deviceIndex, [MarshalAs(UnmanagedType.U1)] bool requireGrad);
13611352

13621353
[DllImport("LibTorchSharp")]
13631354
internal static extern IntPtr THSTensor_newComplexFloat32Scalar(float real, float imaginary, int deviceType, int deviceIndex, [MarshalAs(UnmanagedType.U1)] bool requires_grad);
13641355

1365-
[DllImport("LibTorchSharp")]
1366-
internal static extern IntPtr THSTensor_randint(long max, IntPtr psizes, int length, sbyte scalarType, int deviceType, int deviceIndex, [MarshalAs(UnmanagedType.U1)] bool requires_grad);
1367-
13681356
[DllImport("LibTorchSharp")]
13691357
internal static extern IntPtr THSTensor_randint(IntPtr generator, long low, long high, IntPtr psizes, int length, sbyte scalarType, int deviceType, int deviceIndex, [MarshalAs(UnmanagedType.U1)] bool requires_grad);
13701358

‎src/TorchSharp/Tensor/Tensor.cs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4300,17 +4300,6 @@ public Tensor mean(long[] dimensions, bool keepdim = false, ScalarType? type = n
43004300
}
43014301
}
43024302

4303-
public Tensor var(long[] dimensions, bool keepdim = false, ScalarType? type = null)
4304-
{
4305-
unsafe {
4306-
fixed (long* pdims = dimensions) {
4307-
var res = NativeMethods.THSTensor_var_along_dimensions(Handle, (IntPtr)pdims, dimensions.Length, keepdim, type.HasValue, (sbyte)type.GetValueOrDefault());
4308-
if (res == IntPtr.Zero) { CheckForErrors(); }
4309-
return new Tensor(res);
4310-
}
4311-
}
4312-
}
4313-
43144303
/// <summary>
43154304
/// Returns the median of the values in input.
43164305
/// </summary>

0 commit comments

Comments
 (0)