修改编译问题

update Swift 5
yulingtianxia · Apr 17, 2019 · 08587d6 · 08587d6
1 parent 04efc7f
commit 08587d6
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 62 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/iOSSample/AudioEmotion.xcodeproj/project.pbxproj b/iOSSample/AudioEmotion.xcodeproj/project.pbxproj
@@ -137,6 +137,7 @@
 				TargetAttributes = {
 					A4C080822247800600C87136 = {
 						CreatedOnToolsVersion = 10.2;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
@@ -343,7 +344,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.yulingtianxia.AudioEmotion;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALID_ARCHS = "arm64 arm64e";
 			};
@@ -368,7 +369,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.yulingtianxia.AudioEmotion;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALID_ARCHS = "arm64 arm64e";
 			};

diff --git a/iOSSample/AudioEmotion/PredictAudioEmotion.swift b/iOSSample/AudioEmotion/PredictAudioEmotion.swift
@@ -59,7 +59,7 @@ class PredictAudioEmotion: NSObject {
             for i in 0...windowSize {
                 audioData[i] = NSNumber.init(value: bufferData[0][offset + i])
             }
-            let modelInput = AudioEmotionInput(audio: audioData)
+            let modelInput = AudioEmotionInput(deep_features: audioData)
 
             guard let modelOutput = try? model.prediction(input: modelInput) else {
                 fatalError("Error calling predict")