Merge branch 'remote-refactor'

Content/Scripts/upymodule.json

@@ -1,7 +1,6 @@
 {
 	"name" : "tensorflow-ue4",
 	"pythonModules": {
-		"tensorflow": "1.12.0",
-		"h5py":"2.7.0"
+		"tensorflow": "1.15.0"
 	}
 }

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)
 			{

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;

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()

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 ...
 			}
 			);

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
 	}
 	]