Multiple bug fixes

AntiAnti · web-flow · commit 02d91269712b · 2021-11-25T11:25:54.000+03:00
- support for multiple USimpleTorchModule per project
- #issue-961466268
diff --git a/Source/SimplePyTorch/Private/SimplePyTorch.cpp b/Source/SimplePyTorch/Private/SimplePyTorch.cpp
@@ -20,6 +20,10 @@ void FSimplePyTorchModule::StartupModule()
 	if (ThisPlugin.IsValid())
 	{
 		FilePath = FPaths::ConvertRelativePathToFull(ThisPlugin->GetBaseDir());
+
+		FString PluginBinariesDir = FilePath / TEXT("Source/ThirdParty/pytorch") / szBinaries / szPlatform;
+		UE_LOG(LogTemp, Log, TEXT("PyTorch third-party dlls directory: %s"), *PluginBinariesDir);
+		FPlatformProcess::PushDllDirectory(*PluginBinariesDir);
 	}
 #else
 	FilePath = FPaths::ConvertRelativePathToFull(FPaths::ProjectDir());
diff --git a/Source/SimplePyTorch/Private/SimpleTorchModule.cpp b/Source/SimplePyTorch/Private/SimpleTorchModule.cpp
@@ -8,6 +8,7 @@
 #include <vector>
 
 USimpleTorchModule::USimpleTorchModule()
+	: ModelId(INDEX_NONE)
 {
 	Buffer = NULL;
 	BufferDims = NULL;
@@ -54,7 +55,8 @@ bool USimpleTorchModule::LoadTorchScriptModel(FString FileName)
 		}
 		BufferDims = new int[16];
 
-		return Module.FuncTSW_LoadScriptModel(TCHAR_TO_ANSI(*FileName));
+		ModelId = Module.FuncTSW_LoadScriptModel(TCHAR_TO_ANSI(*FileName));
+		bResult = (ModelId != INDEX_NONE);
 	}
 	else
 	{
@@ -71,7 +73,7 @@ bool USimpleTorchModule::IsTorchModelLoaded() const
 	bool bResult = false;
 	if (Module.bDllLoaded)
 	{
-		return Module.FuncTSW_CheckModel();
+		return Module.FuncTSW_CheckModel(ModelId);
 	}
 
 	return bResult;
@@ -89,7 +91,7 @@ bool USimpleTorchModule::ExecuteModelMethod(const FString& MethodName, const FSi
 	bool bResult = false;
 	if (Module.bDllLoaded && Buffer != NULL && OutData.IsDataOwner())
 	{
-		TArray<int> InDims = InData.GetDimensions().Array();
+		TArray<int> InDims = InData.GetDimensions();
 
 		float* pOutData = OutData.IsValid()
 			? OutData.GetRawData()
@@ -98,21 +100,21 @@ bool USimpleTorchModule::ExecuteModelMethod(const FString& MethodName, const FSi
 		int OutDimsCount = 0;
 		if (MethodName == TEXT("forward"))
 		{
-			Module.FuncTSW_ForwardPass_Def(InData.GetRawData(), InDims.GetData(), InDims.Num(),
+			Module.FuncTSW_ForwardPass_Def(ModelId, InData.GetRawData(), InDims.GetData(), InDims.Num(),
 				pOutData, BufferDims, &OutDimsCount);
 		}
 		else
 		{
-			Module.FuncTSW_Execute_Def(TCHAR_TO_ANSI(*MethodName), InData.GetRawData(), InDims.GetData(), InDims.Num(),
+			Module.FuncTSW_Execute_Def(ModelId, TCHAR_TO_ANSI(*MethodName), InData.GetRawData(), InDims.GetData(), InDims.Num(),
 				pOutData, BufferDims, &OutDimsCount);
 		}
 
 		bResult = (OutDimsCount > 0);
 		if (bResult)
 		{
-			TArray<int32> OldOutDims = OutData.GetDimensions().Array();
+			TArray<int32> OldOutDims = OutData.GetDimensions();
 			bool bOutTensorMatches = (OutDimsCount == OutData.GetDimensions().Num());
-			TSet<int32> NewOutDims;
+			TArray<int32> NewOutDims;
 
 			int32 Length = 1;
 			for (int i = 0; i < OutDimsCount; i++)
@@ -195,14 +197,14 @@ void FSimpleTorchTensor::Cleanup()
 	}
 }
 
-int32 FSimpleTorchTensor::GetAddress(TSet<int32> Address) const
+int32 FSimpleTorchTensor::GetAddress(TArray<int32> Address) const
 {
 	if (!Data)
 	{		
 		return INDEX_NONE;
 	}
 
-	TArray<int32> AddrArray = Address.Array();
+	TArray<int32> AddrArray = Address;
 	int32 Addr = 0;
 	for (int32 i = 0; i < AddressMultipliersCache.Num(); i++)
 	{
@@ -218,7 +220,7 @@ int32 FSimpleTorchTensor::GetAddress(TSet<int32> Address) const
 	return Addr;
 }
 
-bool FSimpleTorchTensor::Create(TSet<int32> TensorDimensions)
+bool FSimpleTorchTensor::Create(TArray<int32> TensorDimensions)
 {
 	if (Data)
 	{
@@ -233,7 +235,7 @@ bool FSimpleTorchTensor::Create(TSet<int32> TensorDimensions)
 
 	if (DataSize == 0) return false;
 
-	Dimensions = TensorDimensions.Array();
+	Dimensions = TensorDimensions;
 	InitAddressSpace();
 
 	Data = new float[DataSize];
@@ -242,7 +244,7 @@ bool FSimpleTorchTensor::Create(TSet<int32> TensorDimensions)
 	return true;
 }
 
-bool FSimpleTorchTensor::CreateAsChild(FSimpleTorchTensor* Parent, TSet<int32> Address)
+bool FSimpleTorchTensor::CreateAsChild(FSimpleTorchTensor* Parent, TArray<int32> Address)
 {
 	bDataOwner = false;
 
@@ -296,9 +298,9 @@ bool FSimpleTorchTensor::CreateAsChild(FSimpleTorchTensor* Parent, TSet<int32> A
 	return true;
 }
 
-TSet<int32> FSimpleTorchTensor::GetDimensions() const
+TArray<int32> FSimpleTorchTensor::GetDimensions() const
 {
-	TSet<int32> t;
+	TArray<int32> t;
 	for (const auto& d : Dimensions)
 		t.Add(d);
 
@@ -329,13 +331,13 @@ float* FSimpleTorchTensor::GetRawData(int32* Size) const
 	}
 }
 
-float* FSimpleTorchTensor::GetCell(TSet<int32> Address)
+float* FSimpleTorchTensor::GetCell(TArray<int32> Address)
 {
 	int32 Addr = GetAddress(Address);
 	return Addr == INDEX_NONE ? NULL : &Data[Addr];
 }
 
-float FSimpleTorchTensor::GetValue(TSet<int32> Address) const
+float FSimpleTorchTensor::GetValue(TArray<int32> Address) const
 {
 	int32 Addr = GetAddress(Address);
 	return Addr == INDEX_NONE ? 0 : Data[Addr];
@@ -371,7 +373,7 @@ bool FSimpleTorchTensor::FromArray(const TArray<float>& InData)
 	return false;
 }
 
-bool FSimpleTorchTensor::Reshape(TSet<int32> NewShape)
+bool FSimpleTorchTensor::Reshape(TArray<int32> NewShape)
 {
 	if (NewShape.Num() == 0)
 	{
@@ -390,7 +392,7 @@ bool FSimpleTorchTensor::Reshape(TSet<int32> NewShape)
 
 	if (NewDataSize == DataSize)
 	{
-		Dimensions = NewShape.Array();
+		Dimensions = NewShape;
 		InitAddressSpace();
 	}
 	else
@@ -400,7 +402,7 @@ bool FSimpleTorchTensor::Reshape(TSet<int32> NewShape)
 			Cleanup();
 
 			DataSize = NewDataSize;
-			Dimensions = NewShape.Array();
+			Dimensions = NewShape;
 			Data = new float[DataSize];
 
 			InitAddressSpace();
@@ -422,7 +424,7 @@ FSimpleTorchTensor FSimpleTorchTensor::Detach()
 		return FSimpleTorchTensor();
 	}
 
-	TSet<int32> Dims;
+	TArray<int32> Dims;
 	for (const auto& Val : Dimensions) Dims.Add(Val);
 
 	FSimpleTorchTensor ret = FSimpleTorchTensor(Dims);
diff --git a/Source/SimplePyTorch/Public/SimplePyTorch.h b/Source/SimplePyTorch/Public/SimplePyTorch.h
@@ -8,12 +8,12 @@
 #include <vector>
 
 // BEGIN C HEADER
-typedef bool(*__TSW_LoadScriptModel)(char* FileName);
-typedef bool(*__TSW_CheckModel)();
-typedef bool(*__TSW_Forward1d)(const std::vector<float> InData, int InDimensions);
-typedef bool(*__TSW_ForwardTensor)(const float* InData, const int InDimensions[3], float*& OutData, int* Size1, int* Size2, int* Size3);
-typedef bool(*__TSW_ForwardPass_Def)(const float* InData, const int* InDimensions, int nDimensionsCount, float*& OutData, int*& OutDimensions, int* OutDimensionsCount);
-typedef bool(*__TSW_Execute_Def)(char* FunctionName, const float* InData, const int* InDimensions, int nDimensionsCount, float*& OutData, int*& OutDimensions, int* OutDimensionsCount);
+typedef int(*__TSW_LoadScriptModel)(char* FileName);
+typedef bool(*__TSW_CheckModel)(int ModelId);
+typedef bool(*__TSW_Forward1d)(int ModelId, const std::vector<float> InData, int InDimensions);
+typedef bool(*__TSW_ForwardTensor)(int ModelId, const float* InData, const int InDimensions[3], float*& OutData, int* Size1, int* Size2, int* Size3);
+typedef bool(*__TSW_ForwardPass_Def)(int ModelId, const float* InData, const int* InDimensions, int nDimensionsCount, float*& OutData, int*& OutDimensions, int* OutDimensionsCount);
+typedef bool(*__TSW_Execute_Def)(int ModelId, char* FunctionName, const float* InData, const int* InDimensions, int nDimensionsCount, float*& OutData, int*& OutDimensions, int* OutDimensionsCount);
 // END HEADER
 
 class FSimplePyTorchModule : public IModuleInterface
diff --git a/Source/SimplePyTorch/Public/SimpleTorchModule.h b/Source/SimplePyTorch/Public/SimpleTorchModule.h
@@ -53,7 +53,7 @@ struct SIMPLEPYTORCH_API FSimpleTorchTensor
 	void InitAddressSpace();
 
 	/** Get flat address in Data from multidimensional address */
-	int32 GetAddress(TSet<int32> Address) const;
+	int32 GetAddress(TArray<int32> Address) const;
 public:
 
 	FSimpleTorchTensor()
@@ -62,15 +62,15 @@ struct SIMPLEPYTORCH_API FSimpleTorchTensor
 		, DataSize(0)
 		, ParentTensor(nullptr)
 	{}
-	FSimpleTorchTensor(FSimpleTorchTensor* Parent, TSet<int32> SubAddress)
+	FSimpleTorchTensor(FSimpleTorchTensor* Parent, TArray<int32> SubAddress)
 		: Data(NULL)
 		, bDataOwner(true)
 		, DataSize(0)
 		, ParentTensor(nullptr)
 	{
 		CreateAsChild(Parent, SubAddress);
 	}
-	FSimpleTorchTensor(TSet<int32> Dimensions)
+	FSimpleTorchTensor(TArray<int32> Dimensions)
 		: Data(NULL)
 		, bDataOwner(true)
 		, DataSize(0)
@@ -87,10 +87,10 @@ struct SIMPLEPYTORCH_API FSimpleTorchTensor
 	void Cleanup();
 
 	// Set dimensions and allocate memory
-	bool Create(TSet<int32> TensorDimensions);
+	bool Create(TArray<int32> TensorDimensions);
 
 	// Create tensor as a subtensor in another tensor (share the same memory)
-	bool CreateAsChild(FSimpleTorchTensor* Parent, TSet<int32> Address);
+	bool CreateAsChild(FSimpleTorchTensor* Parent, TArray<int32> Address);
 
 	// Is tensor initialized?
 	bool IsValid() const { return Data != NULL; }
@@ -99,7 +99,7 @@ struct SIMPLEPYTORCH_API FSimpleTorchTensor
 	bool IsDataOwner() const { return bDataOwner; }
 
 	// Get current tensor dimensions
-	TSet<int32> GetDimensions() const;
+	TArray<int32> GetDimensions() const;
 
 	// Get number of itemes in flat array
 	int32 GetDataSize() const { return DataSize; }
@@ -112,11 +112,11 @@ struct SIMPLEPYTORCH_API FSimpleTorchTensor
 	float* GetRawData() const { return Data; }
 
 	// Convert multidimensional address to flat address
-	int32 GetRawAddress(TSet<int32> Address) const { return GetAddress(Address); }
+	int32 GetRawAddress(TArray<int32> Address) const { return GetAddress(Address); }
 
 	// Get reference to single float value with address
-	float* GetCell(TSet<int32> Address);
-	float GetValue(TSet<int32> Address) const;
+	float* GetCell(TArray<int32> Address);
+	float GetValue(TArray<int32> Address) const;
 
 	/* Create float array. Only works for tensor with one dimension.
 	* Ex: auto p = FSimpleTorchTensor({ 4, 12 });
@@ -139,7 +139,7 @@ struct SIMPLEPYTORCH_API FSimpleTorchTensor
 
 	// Change dimensions.
 	// Only keeps data if new overall size is equal to old sizse
-	bool Reshape(TSet<int32> NewShape);
+	bool Reshape(TArray<int32> NewShape);
 
 	// Create copy of this tensor
 	FSimpleTorchTensor Detach();
@@ -190,6 +190,9 @@ class SIMPLEPYTORCH_API USimpleTorchModule : public UObject
 	bool ExecuteModelMethod(const FString& MethodName, const FSimpleTorchTensor& InData, FSimpleTorchTensor& OutData);
 
 private:
+	/** Identified of the loaded torch script model */
+	int32 ModelId;
+
 	/** Buffer size (default) */
 	int32 BufferSize;
 
diff --git a/Source/SimplePyTorch/SimplePyTorch.Build.cs b/Source/SimplePyTorch/SimplePyTorch.Build.cs
@@ -22,14 +22,12 @@ public SimplePyTorch(ReadOnlyTargetRules Target) : base(Target)
 		
 		PublicIncludePaths.AddRange(
 			new string[] {
-				// ... add public include paths required here ...
 			}
 			);
 				
 		
 		PrivateIncludePaths.AddRange(
 			new string[] {
-				// ... add other private include paths required here ...
 			}
 			);
 			
@@ -38,7 +36,6 @@ public SimplePyTorch(ReadOnlyTargetRules Target) : base(Target)
 			new string[]
 			{
 				"Core",
-				// ... add other public dependencies that you statically link with here ...
 			}
 			);
 			
@@ -51,39 +48,40 @@ public SimplePyTorch(ReadOnlyTargetRules Target) : base(Target)
 				"Slate",
 				"SlateCore",
 				"Projects"
-				// ... add private dependencies that you statically link with here ...	
 			}
 			);
 		
 		
 		DynamicallyLoadedModuleNames.AddRange(
 			new string[]
 			{
-				// ... add any modules that your module loads dynamically here ...
 			}
 			);
 
 		if (Target.Platform == UnrealTargetPlatform.Win64)
 		{
-			// Copy DLLs to target packaged project
-			RuntimeDependencies.Add("$(BinaryOutputDir)/asmjit.dll", Path.Combine(TorchBinariesPath, "asmjit.dll"));
-			RuntimeDependencies.Add("$(BinaryOutputDir)/c10.dll", Path.Combine(TorchBinariesPath, "c10.dll"));
-			RuntimeDependencies.Add("$(BinaryOutputDir)/caffe2_detectron_ops.dll", Path.Combine(TorchBinariesPath, "caffe2_detectron_ops.dll"));
-			RuntimeDependencies.Add("$(BinaryOutputDir)/caffe2_module_test_dynamic.dll", Path.Combine(TorchBinariesPath, "caffe2_module_test_dynamic.dll"));
-			RuntimeDependencies.Add("$(BinaryOutputDir)/fbgemm.dll", Path.Combine(TorchBinariesPath, "fbgemm.dll"));
-			RuntimeDependencies.Add("$(BinaryOutputDir)/fbjni.dll", Path.Combine(TorchBinariesPath, "fbjni.dll"));
-			RuntimeDependencies.Add("$(BinaryOutputDir)/libiomp5md.dll", Path.Combine(TorchBinariesPath, "libiomp5md.dll"));
-			RuntimeDependencies.Add("$(BinaryOutputDir)/libiompstubs5md.dll", Path.Combine(TorchBinariesPath, "libiompstubs5md.dll"));
-			RuntimeDependencies.Add("$(BinaryOutputDir)/pytorch_jni.dll", Path.Combine(TorchBinariesPath, "pytorch_jni.dll"));
-			RuntimeDependencies.Add("$(BinaryOutputDir)/torch.dll", Path.Combine(TorchBinariesPath, "torch.dll"));
-			RuntimeDependencies.Add("$(BinaryOutputDir)/torch_cpu.dll", Path.Combine(TorchBinariesPath, "torch_cpu.dll"));
-			RuntimeDependencies.Add("$(BinaryOutputDir)/torch_global_deps.dll", Path.Combine(TorchBinariesPath, "torch_global_deps.dll"));
-			RuntimeDependencies.Add("$(BinaryOutputDir)/uv.dll", Path.Combine(TorchBinariesPath, "uv.dll"));
 			// my PyTorch wrapper
 			RuntimeDependencies.Add("$(BinaryOutputDir)/torchscript_wrapper.dll", Path.Combine(TorchBinariesPath, "torchscript_wrapper.dll"));
-			// licenses
-			RuntimeDependencies.Add("$(BinaryOutputDir)/LICENSE.txt", Path.Combine(TorchPath, "LICENSE.txt"));
-			RuntimeDependencies.Add("$(BinaryOutputDir)/NOTICE.txt", Path.Combine(TorchPath, "NOTICE.txt"));
+			if (!Target.bBuildEditor)
+			{
+				// Copy DLLs to target packaged project
+				RuntimeDependencies.Add("$(BinaryOutputDir)/asmjit.dll", Path.Combine(TorchBinariesPath, "asmjit.dll"));
+				RuntimeDependencies.Add("$(BinaryOutputDir)/c10.dll", Path.Combine(TorchBinariesPath, "c10.dll"));
+				RuntimeDependencies.Add("$(BinaryOutputDir)/caffe2_detectron_ops.dll", Path.Combine(TorchBinariesPath, "caffe2_detectron_ops.dll"));
+				RuntimeDependencies.Add("$(BinaryOutputDir)/caffe2_module_test_dynamic.dll", Path.Combine(TorchBinariesPath, "caffe2_module_test_dynamic.dll"));
+				RuntimeDependencies.Add("$(BinaryOutputDir)/fbgemm.dll", Path.Combine(TorchBinariesPath, "fbgemm.dll"));
+				RuntimeDependencies.Add("$(BinaryOutputDir)/fbjni.dll", Path.Combine(TorchBinariesPath, "fbjni.dll"));
+				RuntimeDependencies.Add("$(BinaryOutputDir)/libiomp5md.dll", Path.Combine(TorchBinariesPath, "libiomp5md.dll"));
+				RuntimeDependencies.Add("$(BinaryOutputDir)/libiompstubs5md.dll", Path.Combine(TorchBinariesPath, "libiompstubs5md.dll"));
+				RuntimeDependencies.Add("$(BinaryOutputDir)/pytorch_jni.dll", Path.Combine(TorchBinariesPath, "pytorch_jni.dll"));
+				RuntimeDependencies.Add("$(BinaryOutputDir)/torch.dll", Path.Combine(TorchBinariesPath, "torch.dll"));
+				RuntimeDependencies.Add("$(BinaryOutputDir)/torch_cpu.dll", Path.Combine(TorchBinariesPath, "torch_cpu.dll"));
+				RuntimeDependencies.Add("$(BinaryOutputDir)/torch_global_deps.dll", Path.Combine(TorchBinariesPath, "torch_global_deps.dll"));
+				RuntimeDependencies.Add("$(BinaryOutputDir)/uv.dll", Path.Combine(TorchBinariesPath, "uv.dll"));
+				// licenses
+				RuntimeDependencies.Add("$(BinaryOutputDir)/LICENSE.txt", Path.Combine(TorchPath, "LICENSE.txt"));
+				RuntimeDependencies.Add("$(BinaryOutputDir)/NOTICE.txt", Path.Combine(TorchPath, "NOTICE.txt"));
+			}
 		}
 	}
 }
diff --git a/Source/ThirdParty/pytorch/Binaries/Win64/torchscript_wrapper.dll b/Source/ThirdParty/pytorch/Binaries/Win64/torchscript_wrapper.dll

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,10 @@ void FSimplePyTorchModule::StartupModule()`
`20`	`20`	`if (ThisPlugin.IsValid())`
`21`	`21`	`{`
`22`	`22`	`FilePath = FPaths::ConvertRelativePathToFull(ThisPlugin->GetBaseDir());`
	`23`	`+`
	`24`	`+ FString PluginBinariesDir = FilePath / TEXT("Source/ThirdParty/pytorch") / szBinaries / szPlatform;`
	`25`	`+ UE_LOG(LogTemp, Log, TEXT("PyTorch third-party dlls directory: %s"), *PluginBinariesDir);`
	`26`	`+ FPlatformProcess::PushDllDirectory(*PluginBinariesDir);`
`23`	`27`	`}`
`24`	`28`	`#else`
`25`	`29`	`FilePath = FPaths::ConvertRelativePathToFull(FPaths::ProjectDir());`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`#include <vector>`
`9`	`9`
`10`	`10`	`USimpleTorchModule::USimpleTorchModule()`
	`11`	`+ : ModelId(INDEX_NONE)`
`11`	`12`	`{`
`12`	`13`	`Buffer = NULL;`
`13`	`14`	`BufferDims = NULL;`
`@@ -54,7 +55,8 @@ bool USimpleTorchModule::LoadTorchScriptModel(FString FileName)`
`54`	`55`	`}`
`55`	`56`	`BufferDims = new int[16];`
`56`	`57`
`57`		`- return Module.FuncTSW_LoadScriptModel(TCHAR_TO_ANSI(*FileName));`
	`58`	`+ ModelId = Module.FuncTSW_LoadScriptModel(TCHAR_TO_ANSI(*FileName));`
	`59`	`+ bResult = (ModelId != INDEX_NONE);`
`58`	`60`	`}`
`59`	`61`	`else`
`60`	`62`	`{`
`@@ -71,7 +73,7 @@ bool USimpleTorchModule::IsTorchModelLoaded() const`
`71`	`73`	`bool bResult = false;`
`72`	`74`	`if (Module.bDllLoaded)`
`73`	`75`	`{`
`74`		`- return Module.FuncTSW_CheckModel();`
	`76`	`+ return Module.FuncTSW_CheckModel(ModelId);`
`75`	`77`	`}`
`76`	`78`
`77`	`79`	`return bResult;`
`@@ -89,7 +91,7 @@ bool USimpleTorchModule::ExecuteModelMethod(const FString& MethodName, const FSi`
`89`	`91`	`bool bResult = false;`
`90`	`92`	`if (Module.bDllLoaded && Buffer != NULL && OutData.IsDataOwner())`
`91`	`93`	`{`
`92`		`- TArray<int> InDims = InData.GetDimensions().Array();`
	`94`	`+ TArray<int> InDims = InData.GetDimensions();`
`93`	`95`
`94`	`96`	`float* pOutData = OutData.IsValid()`
`95`	`97`	`? OutData.GetRawData()`
`@@ -98,21 +100,21 @@ bool USimpleTorchModule::ExecuteModelMethod(const FString& MethodName, const FSi`
`98`	`100`	`int OutDimsCount = 0;`
`99`	`101`	`if (MethodName == TEXT("forward"))`
`100`	`102`	`{`
`101`		`- Module.FuncTSW_ForwardPass_Def(InData.GetRawData(), InDims.GetData(), InDims.Num(),`
	`103`	`+ Module.FuncTSW_ForwardPass_Def(ModelId, InData.GetRawData(), InDims.GetData(), InDims.Num(),`
`102`	`104`	`pOutData, BufferDims, &OutDimsCount);`
`103`	`105`	`}`
`104`	`106`	`else`
`105`	`107`	`{`
`106`		`- Module.FuncTSW_Execute_Def(TCHAR_TO_ANSI(*MethodName), InData.GetRawData(), InDims.GetData(), InDims.Num(),`
	`108`	`+ Module.FuncTSW_Execute_Def(ModelId, TCHAR_TO_ANSI(*MethodName), InData.GetRawData(), InDims.GetData(), InDims.Num(),`
`107`	`109`	`pOutData, BufferDims, &OutDimsCount);`
`108`	`110`	`}`
`109`	`111`
`110`	`112`	`bResult = (OutDimsCount > 0);`
`111`	`113`	`if (bResult)`
`112`	`114`	`{`
`113`		`- TArray<int32> OldOutDims = OutData.GetDimensions().Array();`
	`115`	`+ TArray<int32> OldOutDims = OutData.GetDimensions();`
`114`	`116`	`bool bOutTensorMatches = (OutDimsCount == OutData.GetDimensions().Num());`
`115`		`- TSet<int32> NewOutDims;`
	`117`	`+ TArray<int32> NewOutDims;`
`116`	`118`
`117`	`119`	`int32 Length = 1;`
`118`	`120`	`for (int i = 0; i < OutDimsCount; i++)`
`@@ -195,14 +197,14 @@ void FSimpleTorchTensor::Cleanup()`
`195`	`197`	`}`
`196`	`198`	`}`
`197`	`199`
`198`		`-int32 FSimpleTorchTensor::GetAddress(TSet<int32> Address) const`
	`200`	`+int32 FSimpleTorchTensor::GetAddress(TArray<int32> Address) const`
`199`	`201`	`{`
`200`	`202`	`if (!Data)`
`201`	`203`	`{`
`202`	`204`	`return INDEX_NONE;`
`203`	`205`	`}`
`204`	`206`
`205`		`- TArray<int32> AddrArray = Address.Array();`
	`207`	`+ TArray<int32> AddrArray = Address;`
`206`	`208`	`int32 Addr = 0;`
`207`	`209`	`for (int32 i = 0; i < AddressMultipliersCache.Num(); i++)`
`208`	`210`	`{`
`@@ -218,7 +220,7 @@ int32 FSimpleTorchTensor::GetAddress(TSet<int32> Address) const`
`218`	`220`	`return Addr;`
`219`	`221`	`}`
`220`	`222`
`221`		`-bool FSimpleTorchTensor::Create(TSet<int32> TensorDimensions)`
	`223`	`+bool FSimpleTorchTensor::Create(TArray<int32> TensorDimensions)`
`222`	`224`	`{`
`223`	`225`	`if (Data)`
`224`	`226`	`{`
`@@ -233,7 +235,7 @@ bool FSimpleTorchTensor::Create(TSet<int32> TensorDimensions)`
`233`	`235`
`234`	`236`	`if (DataSize == 0) return false;`
`235`	`237`
`236`		`- Dimensions = TensorDimensions.Array();`
	`238`	`+ Dimensions = TensorDimensions;`
`237`	`239`	`InitAddressSpace();`
`238`	`240`
`239`	`241`	`Data = new float[DataSize];`
`@@ -242,7 +244,7 @@ bool FSimpleTorchTensor::Create(TSet<int32> TensorDimensions)`
`242`	`244`	`return true;`
`243`	`245`	`}`
`244`	`246`
`245`		`-bool FSimpleTorchTensor::CreateAsChild(FSimpleTorchTensor* Parent, TSet<int32> Address)`
	`247`	`+bool FSimpleTorchTensor::CreateAsChild(FSimpleTorchTensor* Parent, TArray<int32> Address)`
`246`	`248`	`{`
`247`	`249`	`bDataOwner = false;`
`248`	`250`
`@@ -296,9 +298,9 @@ bool FSimpleTorchTensor::CreateAsChild(FSimpleTorchTensor* Parent, TSet<int32> A`
`296`	`298`	`return true;`
`297`	`299`	`}`
`298`	`300`
`299`		`-TSet<int32> FSimpleTorchTensor::GetDimensions() const`
	`301`	`+TArray<int32> FSimpleTorchTensor::GetDimensions() const`
`300`	`302`	`{`
`301`		`- TSet<int32> t;`
	`303`	`+ TArray<int32> t;`
`302`	`304`	`for (const auto& d : Dimensions)`
`303`	`305`	`t.Add(d);`
`304`	`306`
`@@ -329,13 +331,13 @@ float* FSimpleTorchTensor::GetRawData(int32* Size) const`
`329`	`331`	`}`
`330`	`332`	`}`
`331`	`333`
`332`		`-float* FSimpleTorchTensor::GetCell(TSet<int32> Address)`
	`334`	`+float* FSimpleTorchTensor::GetCell(TArray<int32> Address)`
`333`	`335`	`{`
`334`	`336`	`int32 Addr = GetAddress(Address);`
`335`	`337`	`return Addr == INDEX_NONE ? NULL : &Data[Addr];`
`336`	`338`	`}`
`337`	`339`
`338`		`-float FSimpleTorchTensor::GetValue(TSet<int32> Address) const`
	`340`	`+float FSimpleTorchTensor::GetValue(TArray<int32> Address) const`
`339`	`341`	`{`
`340`	`342`	`int32 Addr = GetAddress(Address);`
`341`	`343`	`return Addr == INDEX_NONE ? 0 : Data[Addr];`
`@@ -371,7 +373,7 @@ bool FSimpleTorchTensor::FromArray(const TArray<float>& InData)`
`371`	`373`	`return false;`
`372`	`374`	`}`
`373`	`375`
`374`		`-bool FSimpleTorchTensor::Reshape(TSet<int32> NewShape)`
	`376`	`+bool FSimpleTorchTensor::Reshape(TArray<int32> NewShape)`
`375`	`377`	`{`
`376`	`378`	`if (NewShape.Num() == 0)`
`377`	`379`	`{`
`@@ -390,7 +392,7 @@ bool FSimpleTorchTensor::Reshape(TSet<int32> NewShape)`
`390`	`392`
`391`	`393`	`if (NewDataSize == DataSize)`
`392`	`394`	`{`
`393`		`- Dimensions = NewShape.Array();`
	`395`	`+ Dimensions = NewShape;`
`394`	`396`	`InitAddressSpace();`
`395`	`397`	`}`
`396`	`398`	`else`
`@@ -400,7 +402,7 @@ bool FSimpleTorchTensor::Reshape(TSet<int32> NewShape)`
`400`	`402`	`Cleanup();`
`401`	`403`
`402`	`404`	`DataSize = NewDataSize;`
`403`		`- Dimensions = NewShape.Array();`
	`405`	`+ Dimensions = NewShape;`
`404`	`406`	`Data = new float[DataSize];`
`405`	`407`
`406`	`408`	`InitAddressSpace();`
`@@ -422,7 +424,7 @@ FSimpleTorchTensor FSimpleTorchTensor::Detach()`
`422`	`424`	`return FSimpleTorchTensor();`
`423`	`425`	`}`
`424`	`426`
`425`		`- TSet<int32> Dims;`
	`427`	`+ TArray<int32> Dims;`
`426`	`428`	`for (const auto& Val : Dimensions) Dims.Add(Val);`
`427`	`429`
`428`	`430`	`FSimpleTorchTensor ret = FSimpleTorchTensor(Dims);`