Skip to content

[IOS][SDK] Refactor CTensors <- NSDictionary code, fix compiler warnings #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jpuneet wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[IOS][SDK] Refactor CTensors <- NSDictionary code, fix compiler warnings #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions sdks/ios/deliteAI/Classes/sources/impl/controller/NimbleNetController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
- (void)restartSession;
- (void)restartSessionWithId:(NSString*)sessionId;

void freeCTensor(CTensor* tensor);

@end

#endif
92 changes: 15 additions & 77 deletions sdks/ios/deliteAI/Classes/sources/impl/controller/NimbleNetController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,79 +376,37 @@ - (NSDictionary*)run_task_controller:(NSString*)taskName
modelInputsWithShape:(NSDictionary*)modelInputsWithShape {
void* json_alloc = create_json_allocator();

CTensors req;
req.numTensors = (int)modelInputsWithShape.count;
req.tensors = (CTensor*)malloc((req.numTensors) * sizeof(CTensor));

// model input transformer

NSArray* keys = modelInputsWithShape.allKeys;
for (NSUInteger index = 0; index < keys.count; index++) {
NSString* inputName = keys[index];
NSDictionary* modelInputObjectData = modelInputsWithShape[inputName];
void* voidCastedData;
int inputDataType;
int64_t* int64ShapeArray = NULL;
int shapeArrayLength = 0;
if (modelInputObjectData[@"shape"] != [NSNull null]) {
NSArray* modelInputObjectShape = modelInputObjectData[@"shape"];
shapeArrayLength = (int)modelInputObjectShape.count;
int64ShapeArray = (int64_t*)malloc(sizeof(int64_t) * shapeArrayLength);
for (NSUInteger i = 0; i < shapeArrayLength; i++) {
int64ShapeArray[i] = [(NSNumber*)modelInputObjectShape[i] longLongValue];
}

NSArray* arrayData = modelInputObjectData[@"data"];
inputDataType = [modelInputObjectData[@"type"] intValue];
NSUInteger arrayLength = [arrayData count];
voidCastedData = convertArraytoVoidPointerWithJsonAlloc(arrayData, arrayLength,
inputDataType, json_alloc);
} else {
id data = modelInputObjectData[@"data"];
inputDataType = [modelInputObjectData[@"type"] intValue];
voidCastedData = convertSingularInputtoVoidPointer(data, inputDataType, json_alloc);
}

if (voidCastedData == nil) {
freeCTensors(&req, index);
if (int64ShapeArray != NULL) {
free(int64ShapeArray);
int64ShapeArray = NULL;
}
deallocate_json_allocator(json_alloc);
return populateErrorReturnObject(5000, @"Datatype not yet supported");
}

req.tensors[index].name = strdup([inputName UTF8String]);
req.tensors[index].data = voidCastedData;
req.tensors[index].dataType = inputDataType;
req.tensors[index].shape = int64ShapeArray;
req.tensors[index].shapeLength = shapeArrayLength;
CTensors inCTensors;
NSDictionary* inCTensorsInitStatus =
cTensorsInitWithDict(&inCTensors, modelInputsWithShape, json_alloc);
if (inCTensorsInitStatus != nil) {
deallocate_json_allocator(json_alloc);
return inCTensorsInitStatus;
}

CFTimeInterval startTime = CACurrentMediaTime();
CTensors ret;
NimbleNetStatus* nimbleNetStatus = run_method([taskName UTF8String], req, &ret);
const CFTimeInterval startTime = CACurrentMediaTime();
CTensors outCTensors;
NimbleNetStatus* nimbleNetStatus = run_method(taskName.UTF8String, inCTensors, &outCTensors);
if (nimbleNetStatus == NULL) {
CFTimeInterval elapsedTime = CACurrentMediaTime() - startTime;
long long int elapsedTimeinMicro = (long long int)(elapsedTime * 1000000);
const CFTimeInterval elapsedTime = CACurrentMediaTime() - startTime;
const long long int elapsedTimeinMicro = (long long int)(elapsedTime * 1000000);
write_run_method_metric(taskName.UTF8String, elapsedTimeinMicro);
}

cTensorsDelete(&inCTensors, inCTensors.numTensors);

bool status = false;

if (nimbleNetStatus == NULL) {
status = true;
}

NSDictionary* output = convertCTensorsToNSDictionary(nimbleNetStatus, ret, json_alloc);

freeCTensors(&req, req.numTensors);
NSDictionary* output = convertCTensorsToNSDictionary(nimbleNetStatus, outCTensors, json_alloc);

if (nimbleNetStatus != NULL) {
deallocate_nimblenet_status(nimbleNetStatus);
} else {
deallocate_output_memory2(&ret);
deallocate_output_memory2(&outCTensors);
}

deallocate_json_allocator(json_alloc);
Expand All @@ -461,26 +419,6 @@ - (void)reset_app_state_controller {
}

// private functions
void freeCTensor(CTensor* tensor) {
if (tensor->dataType != JSON && tensor->dataType != JSON_ARRAY) {
const bool freed = c_tensor_delete_data(tensor);
if (!freed) {
free(tensor->data);
}
}
if (tensor->shape != NULL) {
free(tensor->shape);
}
free(tensor->name);
}

void freeCTensors(CTensors* req, NSUInteger index) {
for (int i = 0; i < index; i++) {
freeCTensor(&req->tensors[i]);
}
free(req->tensors);
}

NSString* getNimbleSdkDirectoryPath(void) {
NSArray* paths =
NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
Expand Down
13 changes: 10 additions & 3 deletions sdks/ios/deliteAI/Classes/sources/impl/controller/converter/InputConverter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,19 @@
#import "executor_structs.h"
#import "nimble_net/c_tensor.h"

NSDictionary* cTensorsInitWithDict(CTensors* self_, NSDictionary* tensorsDict, void* json_alloc);

void cTensorDelete(CTensor* self_);
void cTensorsDelete(CTensors* self_, NSUInteger index);

// =================================================================================================

@interface InputConverter : NSObject

NimbleNetStatus* convertSingularInputToCTensor(id data, CTensor* child);
void* convertSingularInputtoVoidPointer(id data, int dataType, void* json_alloc);
void* convertArraytoVoidPointerWithJsonAlloc(NSArray* arrayData, int arrayLength, int dataType,
void* json_alloc);
void* convertArraytoVoidPointer(NSArray* arrayData, int arrayLength, int dataType);
void* convertArraytoVoidPointerWithJsonAlloc(NSArray* arrayData, NSUInteger arrayLength,
int dataType, void* json_alloc);
void* convertArraytoVoidPointer(NSArray* arrayData, NSUInteger arrayLength, int dataType);

@end
79 changes: 76 additions & 3 deletions sdks/ios/deliteAI/Classes/sources/impl/controller/converter/InputConverter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,87 @@

#import <DeliteAI/DeliteAI-Swift.h>
#import <Foundation/Foundation.h>
#import <stdlib.h>
#import <string.h>

#import "executor_structs.h"
#import "nimblejson.hpp"

NSDictionary* cTensorsInitWithDict(CTensors* self_, NSDictionary* tensorsDict, void* json_alloc) {
self_->tensors = (CTensor*)malloc(sizeof(CTensor) * tensorsDict.count);
self_->numTensors = (int)tensorsDict.count;

NSArray* keys = tensorsDict.allKeys;
for (NSUInteger index = 0; index < keys.count; index++) {
NSString* tensorName = keys[index];
NSDictionary* tensorDict = tensorsDict[tensorName];

void* tensorData;
int tensorDataType = [tensorDict[@"type"] intValue];
int64_t* tensorShape = NULL;
int tensorShapeLength = 0;

if (tensorDict[@"shape"] != [NSNull null]) {
NSArray* tensorShapeArray = tensorDict[@"shape"];
tensorShape = (int64_t*)malloc(sizeof(int64_t) * tensorShapeArray.count);
for (NSUInteger i = 0; i < tensorShapeArray.count; i++) {
tensorShape[i] = [(NSNumber*)tensorShapeArray[i] longLongValue];
}
tensorShapeLength = (int)tensorShapeArray.count;

NSArray* arrayData = tensorDict[@"data"];
tensorData = convertArraytoVoidPointerWithJsonAlloc(arrayData, arrayData.count,
tensorDataType, json_alloc);
} else {
id data = tensorDict[@"data"];
tensorData = convertSingularInputtoVoidPointer(data, tensorDataType, json_alloc);
}

if (tensorData == NULL) {
cTensorsDelete(self_, index);
if (tensorShape != NULL) {
free(tensorShape);
tensorShape = NULL;
}
return populateErrorReturnObject(5000, @"Datatype not yet supported");
}

self_->tensors[index].name = strdup(tensorName.UTF8String);
self_->tensors[index].data = tensorData;
self_->tensors[index].dataType = tensorDataType;
self_->tensors[index].shape = tensorShape;
self_->tensors[index].shapeLength = tensorShapeLength;
}

return nil;
}

void cTensorDelete(CTensor* self_) {
free(self_->name);
if (self_->dataType != JSON && self_->dataType != JSON_ARRAY) {
const bool freed = c_tensor_delete_data(self_);
if (!freed) {
free(self_->data);
}
}
if (self_->shape != NULL) {
free(self_->shape);
}
}

void cTensorsDelete(CTensors* self_, NSUInteger index) {
for (int i = 0; i < index; i++) {
cTensorDelete(&self_->tensors[i]);
}
free(self_->tensors);
}

// =================================================================================================

@implementation InputConverter : NSObject

void* convertArraytoVoidPointerWithJsonAlloc(NSArray* arrayData, int arrayLength, int dataType,
void* json_alloc) {
void* convertArraytoVoidPointerWithJsonAlloc(NSArray* arrayData, NSUInteger arrayLength,
int dataType, void* json_alloc) {
switch (dataType) {
case JSON_ARRAY: {
return convertJsonArrayToVoidPointer(arrayData, json_alloc);
Expand All @@ -25,7 +98,7 @@ @implementation InputConverter : NSObject
}
}

void* convertArraytoVoidPointer(NSArray* arrayData, int arrayLength, int dataType) {
void* convertArraytoVoidPointer(NSArray* arrayData, NSUInteger arrayLength, int dataType) {
switch (dataType) {
case STRING: {
char** cArray = (char**)malloc(arrayLength * sizeof(char*));
Expand Down
2 changes: 1 addition & 1 deletion sdks/ios/deliteAI/Classes/sources/impl/controller/interactor/FunctionPointersImpl.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ void deallocate_ios_nimblenet_status(NimbleNetStatus* status){

void deallocate_frontend_ctensor(CTensor* ctensor){
if (ctensor == NULL) return;
freeCTensor(ctensor);
cTensorDelete(ctensor);
}

NimbleNetStatus* get_ios_object_size(IosObject proto, int* val) {
Expand Down