Merge branch 'remote-refactor'

getnamo · getnamo · commit b27746e081e3 · 2020-06-29T02:18:47.000-07:00
diff --git a/Content/Scripts/TFPluginAPI.py b/Content/Scripts/TFPluginAPI.py
diff --git a/Content/Scripts/TensorFlowComponent.py b/Content/Scripts/TensorFlowComponent.py
diff --git a/Content/Scripts/upymodule.json b/Content/Scripts/upymodule.json
@@ -1,7 +1,6 @@
 {
 	"name" : "tensorflow-ue4",
 	"pythonModules": {
-		"tensorflow": "1.12.0",
-		"h5py":"2.7.0"
+		"tensorflow": "1.15.0"
 	}
 }
diff --git a/Content/TensorflowComponent.uasset b/Content/TensorflowComponent.uasset
diff --git a/Source/TFAudioCapture/Private/FTFAudioCapture.cpp b/Source/TFAudioCapture/Private/FTFAudioCapture.cpp
@@ -1,6 +1,6 @@
 #include "ITFAudioCapture.h"
 #include "TFAudioCaptureComponent.h"
-#include "LambdaRunnable.h"
+#include "CULambdaRunnable.h"
 #include "FWindowsAudioCapture.h"
 
 class FTFAudioCapture : public ITFAudioCapture
@@ -43,7 +43,7 @@ void FTFAudioCapture::StartCapture(TFunction<void(const TArray<uint8>&, float)>
 	TFunction<void(const TArray<uint8>&, float)> OnDataDelegate = [this, OnAudioData] (const TArray<uint8>& AudioData, float AudioMaxLevel)
 	{
 		//Call each added component function inside game thread
-		FLambdaRunnable::RunShortLambdaOnGameThread([this, AudioData, OnAudioData, AudioMaxLevel]
+		FCULambdaRunnable::RunShortLambdaOnGameThread([this, AudioData, OnAudioData, AudioMaxLevel]
 		{
 			for (auto Delegate : Delegates)
 			{
@@ -61,7 +61,7 @@ void FTFAudioCapture::StartCapture(TFunction<void(const TArray<uint8>&, float)>
 	TFunction<void(const TArray<uint8>&, float)> OnFinishedDelegate = [this, OnCaptureFinished](const TArray<uint8>& AudioData, float AudioMaxLevel)
 	{
 		//Call each added component function inside game thread
-		FLambdaRunnable::RunShortLambdaOnGameThread([this, AudioData, OnCaptureFinished, AudioMaxLevel]
+		FCULambdaRunnable::RunShortLambdaOnGameThread([this, AudioData, OnCaptureFinished, AudioMaxLevel]
 		{
 			for (auto Delegate : Delegates)
 			{
diff --git a/Source/TFAudioCapture/Private/FWindowsAudioCapture.cpp b/Source/TFAudioCapture/Private/FWindowsAudioCapture.cpp
@@ -1,6 +1,7 @@
 #include "FWindowsAudioCapture.h"
-#include "LambdaRunnable.h"
+#include "CULambdaRunnable.h"
 #include "CoreMinimal.h"
+#include "HAL/ThreadSafeBool.h"
 
 #include "AllowWindowsPlatformTypes.h"
 #include <iostream>
@@ -26,7 +27,7 @@ void FWindowsAudioCapture::StartCapture(TFunction<void(const TArray<uint8>&, flo
 	bRunLoopActive = true;
 	FThreadSafeBool* bShouldRunPtr = &bRunLoopActive;
 
-	FLambdaRunnable::RunLambdaOnBackGroundThread([this, OnAudioData, OnCaptureFinished, bShouldRunPtr]()
+	FCULambdaRunnable::RunLambdaOnBackGroundThread([this, OnAudioData, OnCaptureFinished, bShouldRunPtr]()
 	{
 		HWAVEIN hWaveIn;
 		MMRESULT result;
diff --git a/Source/TensorFlow/Private/TensorFlow.cpp b/Source/TensorFlow/Private/TensorFlow.cpp
@@ -2,7 +2,6 @@
 
 #include "TensorFlow.h"
 #include "TensorFlowPrivatePCH.h"
-#include "UnrealEnginePython.h"
 #include "IPluginManager.h"
 
 #define LOCTEXT_NAMESPACE "FTensorFlowModule"
@@ -11,16 +10,6 @@ DEFINE_LOG_CATEGORY(TensorFlowLog);
 void FTensorFlowModule::StartupModule()
 {
 	// This code will execute after your module is loaded into memory; the exact timing is specified in the .uplugin file per-module
-
-	//Get the python module and add self as a dependent
-	if (FUnrealEnginePythonModule::IsAvailable())
-	{
-		FUnrealEnginePythonModule::Get().AddPythonDependentPlugin("TensorFlow");
-	}
-	else
-	{
-		UE_LOG(TensorFlowLog, Warning, TEXT("UnrealEnginePython Plugin not found! Make sure you've enabled it in Edit->Plugins."));
-	}
 }
 
 void FTensorFlowModule::ShutdownModule()
diff --git a/Source/TensorFlow/TensorFlow.Build.cs b/Source/TensorFlow/TensorFlow.Build.cs
@@ -61,7 +61,7 @@ public TensorFlow(ReadOnlyTargetRules Target) : base(Target)
                 "RHI",
                 "RenderCore",
                 "Engine",
-                "UnrealEnginePython"
+				"MachineLearningRemote"
 				// ... add other public dependencies that you statically link with here ...
 			}
 			);
diff --git a/TensorFlow.uplugin b/TensorFlow.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "0.14.0",
+	"VersionName": "1.0.0alpha",
 	"FriendlyName": "TensorFlow",
 	"Description": "Unofficial TensorFlow plugin for UE4. Enables state of the art machine learning via python and blueprints.",
 	"Category": "Computing",
@@ -25,7 +25,7 @@
 	},
 	{
 		"Name": "TFAudioCapture",
-		"Type": "Developer",
+		"Type": "Runtime",
 		"LoadingPhase": "Default",
 		"WhitelistPlatforms": [
 			"Win64",
@@ -35,11 +35,11 @@
 	],
 	"Plugins": [
 	{
-		"Name": "UnrealEnginePython",
+		"Name": "SocketIOClient",
 		"Enabled": true
 	},
 	{
-		"Name": "SocketIOClient",
+		"Name": "MachineLearningRemote",
 		"Enabled": true
 	}
 	]

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name" : "tensorflow-ue4",`
`3`	`3`	`"pythonModules": {`
`4`		`- "tensorflow": "1.12.0",`
`5`		`- "h5py":"2.7.0"`
	`4`	`+ "tensorflow": "1.15.0"`
`6`	`5`	`}`
`7`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#include "ITFAudioCapture.h"`
`2`	`2`	`#include "TFAudioCaptureComponent.h"`
`3`		`-#include "LambdaRunnable.h"`
	`3`	`+#include "CULambdaRunnable.h"`
`4`	`4`	`#include "FWindowsAudioCapture.h"`
`5`	`5`
`6`	`6`	`class FTFAudioCapture : public ITFAudioCapture`
`@@ -43,7 +43,7 @@ void FTFAudioCapture::StartCapture(TFunction<void(const TArray<uint8>&, float)>`
`43`	`43`	`TFunction<void(const TArray<uint8>&, float)> OnDataDelegate = [this, OnAudioData] (const TArray<uint8>& AudioData, float AudioMaxLevel)`
`44`	`44`	`{`
`45`	`45`	`//Call each added component function inside game thread`
`46`		`- FLambdaRunnable::RunShortLambdaOnGameThread([this, AudioData, OnAudioData, AudioMaxLevel]`
	`46`	`+ FCULambdaRunnable::RunShortLambdaOnGameThread([this, AudioData, OnAudioData, AudioMaxLevel]`
`47`	`47`	`{`
`48`	`48`	`for (auto Delegate : Delegates)`
`49`	`49`	`{`
`@@ -61,7 +61,7 @@ void FTFAudioCapture::StartCapture(TFunction<void(const TArray<uint8>&, float)>`
`61`	`61`	`TFunction<void(const TArray<uint8>&, float)> OnFinishedDelegate = [this, OnCaptureFinished](const TArray<uint8>& AudioData, float AudioMaxLevel)`
`62`	`62`	`{`
`63`	`63`	`//Call each added component function inside game thread`
`64`		`- FLambdaRunnable::RunShortLambdaOnGameThread([this, AudioData, OnCaptureFinished, AudioMaxLevel]`
	`64`	`+ FCULambdaRunnable::RunShortLambdaOnGameThread([this, AudioData, OnCaptureFinished, AudioMaxLevel]`
`65`	`65`	`{`
`66`	`66`	`for (auto Delegate : Delegates)`
`67`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public TensorFlow(ReadOnlyTargetRules Target) : base(Target)`
`61`	`61`	`"RHI",`
`62`	`62`	`"RenderCore",`
`63`	`63`	`"Engine",`
`64`		`- "UnrealEnginePython"`
	`64`	`+ "MachineLearningRemote"`
`65`	`65`	`// ... add other public dependencies that you statically link with here ...`
`66`	`66`	`}`
`67`	`67`	`);`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"FileVersion": 3,`
`3`	`3`	`"Version": 1,`
`4`		`- "VersionName": "0.14.0",`
	`4`	`+ "VersionName": "1.0.0alpha",`
`5`	`5`	`"FriendlyName": "TensorFlow",`
`6`	`6`	`"Description": "Unofficial TensorFlow plugin for UE4. Enables state of the art machine learning via python and blueprints.",`
`7`	`7`	`"Category": "Computing",`
`@@ -25,7 +25,7 @@`
`25`	`25`	`},`
`26`	`26`	`{`
`27`	`27`	`"Name": "TFAudioCapture",`
`28`		`- "Type": "Developer",`
	`28`	`+ "Type": "Runtime",`
`29`	`29`	`"LoadingPhase": "Default",`
`30`	`30`	`"WhitelistPlatforms": [`
`31`	`31`	`"Win64",`
`@@ -35,11 +35,11 @@`
`35`	`35`	`],`
`36`	`36`	`"Plugins": [`
`37`	`37`	`{`
`38`		`- "Name": "UnrealEnginePython",`
	`38`	`+ "Name": "SocketIOClient",`
`39`	`39`	`"Enabled": true`
`40`	`40`	`},`
`41`	`41`	`{`
`42`		`- "Name": "SocketIOClient",`
	`42`	`+ "Name": "MachineLearningRemote",`
`43`	`43`	`"Enabled": true`
`44`	`44`	`}`
`45`	`45`	`]`