Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/TorchSharp/JIT/ScriptModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -238,13 +238,6 @@ public Type GetInputType(int index)
return GetType(type);
}

public Type GetOutputType(int index)
{
var type = new Type(THSJIT_getOutputType(handle, index), Type.TypeKind.AnyType);

return GetType(type);
}

private Type GetType(Type type)
{
switch (type.Kind) {
Expand Down
6 changes: 0 additions & 6 deletions src/TorchSharp/PInvoke/LibTorchSharp.THSJIT.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ internal static partial class NativeMethods
[DllImport("LibTorchSharp")]
internal static extern void THSJIT_Module_named_children(torch.nn.Module.HType module, AllocatePinnedArray allocator1, AllocatePinnedArray allocator2);

[DllImport("LibTorchSharp")]
internal static extern long THSJIT_getNumModules(torch.nn.Module.HType module);

[DllImport("LibTorchSharp")]
internal static extern int THSJIT_Module_num_inputs(torch.nn.Module.HType module);

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

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSJIT_getOutputType(torch.jit.Type.HType module, int index);

[DllImport("LibTorchSharp")]
internal static extern void THSJIT_Module_forward(torch.nn.Module.HType module, IntPtr tensors, int length, AllocateIndexedNativeTensorOrScalarArray allocator, out sbyte typeCode, int idx);

Expand Down
105 changes: 0 additions & 105 deletions src/TorchSharp/PInvoke/LibTorchSharp.THSNN.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ internal static extern IntPtr THSNN_custom_module(
[DllImport("LibTorchSharp")]
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);

[DllImport("LibTorchSharp")]
// align_corners -- 0=None, 1=true, 2=false
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);

[DllImport("LibTorchSharp")]
// align_corners -- 0=None, 1=true, 2=false
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);
Expand All @@ -65,26 +61,6 @@ internal static extern IntPtr THSNN_custom_module(
[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_dropout2d(IntPtr input, double p, [MarshalAs(UnmanagedType.U1)] bool training, [MarshalAs(UnmanagedType.U1)] bool inplace);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Dropout_ctor(double p, [MarshalAs(UnmanagedType.U1)] bool inplace, out IntPtr pBoxedModule);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Dropout_forward(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Dropout1d_forward(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Dropout1d_ctor(double p, [MarshalAs(UnmanagedType.U1)] bool inplace, out IntPtr pBoxedModule);


[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Dropout2d_forward(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Dropout2d_ctor(double p, [MarshalAs(UnmanagedType.U1)] bool inplace, out IntPtr pBoxedModule);


[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Embedding_forward(torch.nn.Module.HType module, IntPtr tensor);

Expand All @@ -100,12 +76,6 @@ internal static extern IntPtr THSNN_custom_module(
[DllImport("LibTorchSharp")]
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);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Dropout3d_forward(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Dropout3d_ctor(double p, [MarshalAs(UnmanagedType.U1)] bool inplace, out IntPtr pBoxedModule);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_dropout3d(IntPtr input, double p, [MarshalAs(UnmanagedType.U1)] bool training, [MarshalAs(UnmanagedType.U1)] bool inplace);

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

[DllImport("LibTorchSharp")]
internal static extern void THSNN_Module_eval(torch.nn.Module.HType module);

[DllImport("LibTorchSharp")]
[return: MarshalAs(UnmanagedType.U1)]
internal static extern bool THSNN_Module_is_training(torch.nn.Module.HType module);
Expand Down Expand Up @@ -308,39 +275,9 @@ internal static extern IntPtr THSNN_custom_module(
[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_RNNCell_ctor(long input_size, long hidden_size, long nonlinearity, [MarshalAs(UnmanagedType.U1)] bool bias, out IntPtr pBoxedModule);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Linear_forward(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Linear_bias(torch.nn.Module.HType module);

[DllImport("LibTorchSharp")]
internal static extern void THSNN_Linear_set_bias(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Linear_weight(torch.nn.Module.HType module);

[DllImport("LibTorchSharp")]
internal static extern void THSNN_Linear_set_weight(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Linear_ctor(long input_size, long output_size, [MarshalAs(UnmanagedType.U1)] bool bias, out IntPtr pBoxedModule);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_functional_linear(IntPtr input, IntPtr weights, IntPtr bias);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Flatten_forward(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Flatten_ctor(long startDim, long endDim, out IntPtr pBoxedModule);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Identity_forward(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Identity_ctor(out IntPtr pBoxedModule);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_LSTMCell_forward(torch.nn.Module.HType module, IntPtr input, IntPtr h_0, IntPtr c_0, out IntPtr c_n);

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

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Upsample_forward(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_TransformerEncoder_ctor(torch.nn.Module.HType encoder_layer, long num_layers, out IntPtr pBoxedModule);

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

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Unflatten_forward(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Unflatten_ctor(long dim, IntPtr shape, long shape_len, out IntPtr pBoxedModule);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_normalize(IntPtr input, double p, long dim, double eps);

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

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_ConvTranspose2d_forward(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_ConvTranspose2d_bias(torch.nn.Module.HType module);

[DllImport("LibTorchSharp")]
internal static extern void THSNN_ConvTranspose2d_set_bias(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_ConvTranspose2d_weight(torch.nn.Module.HType module);

[DllImport("LibTorchSharp")]
internal static extern void THSNN_ConvTranspose2d_set_weight(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
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);

[DllImport("LibTorchSharp")]
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);

[DllImport("LibTorchSharp")]
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);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Softshrink_forward(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Softshrink_ctor(double lambd, out IntPtr pBoxedModule);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Threshold_forward(torch.nn.Module.HType module, IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSNN_Threshold_ctor(double threshold, double value, [MarshalAs(UnmanagedType.U1)] bool inplace, out IntPtr pBoxedModule);
}
#pragma warning restore CA2101
}
12 changes: 0 additions & 12 deletions src/TorchSharp/PInvoke/LibTorchSharp.THSTensor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -526,9 +526,6 @@ internal static extern IntPtr THSTensor_upsample_nearest3d(IntPtr input,
[DllImport("LibTorchSharp")]
internal static extern IntPtr THSTensor_t(IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSTensor_H(IntPtr tensor);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSTensor_mT(IntPtr tensor);

Expand Down Expand Up @@ -1038,9 +1035,6 @@ internal static extern IntPtr THSTensor_upsample_nearest3d(IntPtr input,
[DllImport("LibTorchSharp")]
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);

[DllImport("LibTorchSharp")]
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);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSTensor_median(IntPtr tensor);

Expand Down Expand Up @@ -1353,18 +1347,12 @@ internal static extern IntPtr THSTensor_upsample_nearest3d(IntPtr input,
[DllImport("LibTorchSharp")]
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);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSTensor_to_type(IntPtr handle, sbyte scalar_type);

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSTensor_arange(IntPtr start, IntPtr stop, IntPtr step, sbyte scalarType, int deviceType, int deviceIndex, [MarshalAs(UnmanagedType.U1)] bool requireGrad);

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

[DllImport("LibTorchSharp")]
internal static extern IntPtr THSTensor_randint(long max, IntPtr psizes, int length, sbyte scalarType, int deviceType, int deviceIndex, [MarshalAs(UnmanagedType.U1)] bool requires_grad);

[DllImport("LibTorchSharp")]
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);

Expand Down
11 changes: 0 additions & 11 deletions src/TorchSharp/Tensor/Tensor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4300,17 +4300,6 @@ public Tensor mean(long[] dimensions, bool keepdim = false, ScalarType? type = n
}
}

public Tensor var(long[] dimensions, bool keepdim = false, ScalarType? type = null)
{
unsafe {
fixed (long* pdims = dimensions) {
var res = NativeMethods.THSTensor_var_along_dimensions(Handle, (IntPtr)pdims, dimensions.Length, keepdim, type.HasValue, (sbyte)type.GetValueOrDefault());
if (res == IntPtr.Zero) { CheckForErrors(); }
return new Tensor(res);
}
}
}

/// <summary>
/// Returns the median of the values in input.
/// </summary>
Expand Down
Loading