From 52780e449df15747b1339b1fa2c8caf8d69b2c56 Mon Sep 17 00:00:00 2001 From: imushir Date: Mon, 28 Dec 2015 17:01:05 +0530 Subject: added support for uint8 uin16 int8 int16 --- macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci (limited to 'macros') diff --git a/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci b/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci new file mode 100644 index 0000000..5ab0c64 --- /dev/null +++ b/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci @@ -0,0 +1,23 @@ +function outsize = FA_SZ_ROW_COLUMN_CAT(inval,in1size,in2size) + + +//Check the input arguments +SCI2CNInArgCheck(argn(2),3,3); +in1size = string(in1size); +in2size = string(in2size); +inval = string(inval); +if(inval == '1') then + in1num_r = eval(in1size); + in2num_r = eval(in2size); + outsize(1) = string(in1num_r + in2num_r); + outsize(2) = string(in2num_r); +elseif(inval == '2') then + in1num_c = eval(in1size); + in2num_c = eval(in2size) + outsize(1) = string(in1num_c); + outsize(2) = string(in1num_c + in2num_c); +else + error(36, "Wrong input argument '+inval+'. Use 1 or 2 as first argument in cat command."); +end + +endfunction -- cgit From a8627e204617fc212c4f05d232208890d9d1cad6 Mon Sep 17 00:00:00 2001 From: imushir Date: Tue, 29 Dec 2015 11:55:07 +0530 Subject: added support for matrixMultiplication --- macros/findDeps/getAllSources.sci | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'macros') diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci index c8d6d0b..0862e88 100644 --- a/macros/findDeps/getAllSources.sci +++ b/macros/findDeps/getAllSources.sci @@ -89,6 +89,14 @@ function allSources = getAllSources(OutFormat) "src/c/matrixOperations/cat/zcats.c" "src/c/matrixOperations/cat/ccata.c" "src/c/matrixOperations/cat/ccats.c" + "src/c/matrixOperations/cat/u8cats.c" + "src/c/matrixOperations/cat/u8cata.c" + "src/c/matrixOperations/cat/u16cats.c" + "src/c/matrixOperations/cat/u16cata.c" + "src/c/matrixOperations/cat/i8cats.c" + "src/c/matrixOperations/cat/i8cata.c" + "src/c/matrixOperations/cat/i16cats.c" + "src/c/matrixOperations/cat/i16cata.c" "src/c/matrixOperations/eye/deyea.c" "src/c/matrixOperations/eye/seyea.c" "src/c/matrixOperations/eye/zeyea.c" @@ -178,6 +186,10 @@ function allSources = getAllSources(OutFormat) "src/c/matrixOperations/multiplication/cmulma.c" "src/c/matrixOperations/multiplication/dmulma.c" "src/c/matrixOperations/multiplication/smulma.c" + "src/c/matrixOperations/multiplication/u8mulma.c" + "src/c/matrixOperations/multiplication/u16mulma.c" + "src/c/matrixOperations/multiplication/i8mulma.c" + "src/c/matrixOperations/multiplication/i16mulma.c" "src/c/matrixOperations/division/cldivma.c" "src/c/matrixOperations/division/zldivma.c" "src/c/matrixOperations/division/sldivma.c" -- cgit From adee9863483df64816970dc3a4b6ea6e85f40610 Mon Sep 17 00:00:00 2001 From: imushir Date: Tue, 29 Dec 2015 11:58:06 +0530 Subject: added support for cat --- .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 92 ++++++++++++++++++++++ macros/findDeps/getAllInterfaces.sci | 1 + 2 files changed, 93 insertions(+) (limited to 'macros') diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index c3981a4..aa783b1 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -2118,6 +2118,98 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); +// ------------------- +// --- Class cat. --- +// ------------------- +ClassName = 'cat'; + +// --- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); +PrintStringInfo('NIN= 3',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= FA_TP_MAX(IN(2).TP,IN(3).TP)',ClassFileName,'file','y'); +//PrintStringInfo('OUT(1).SZ(1)= FA_ADD(IN(2).SZ(1),IN(3).SZ(1))',ClassFileName,'file','y'); +//PrintStringInfo('OUT(1).SZ(2)= FA_ADD(IN(2).SZ(2),IN(3).SZ(2))',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_ROW_COLUMN_CAT(IN(1).VAL,IN(2).SZ(1),IN(3).SZ(1)))',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_ROW_COLUMN_CAT(IN(1).VAL,IN(2).SZ(2),IN(3).SZ(2)))',ClassFileName,'file','y'); +//PrintStringInfo('OUT(1).SZ(1)= FA_SZ_ROW_COLUMN_CAT(IN(1).VAL,IN(2).SZ(1),IN(3).SZ(1))',ClassFileName,'file','y'); +//PrintStringInfo('OUT(1).SZ(2)= FA_SZ_ROW_COLUMN_CAT(IN(1).VAL,IN(2).SZ(2),IN(3).SZ(2))',ClassFileName,'file','y'); + + +// --- Function List Class. --- +//NUT: no mixed data types considered +ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); +PrintStringInfo('s0s0'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('s0s2'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y'); +PrintStringInfo('s2s2'+ArgSeparator+'s2',ClassFileName,'file','y'); + +PrintStringInfo('d0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('d0d2'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('d2d2'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('d0d2d2' +ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('d0u82u82' +ArgSeparator+'u82',ClassFileName,'file','y'); +PrintStringInfo('d0u162u162' +ArgSeparator+'u162',ClassFileName,'file','y'); +PrintStringInfo('d0i82i82' +ArgSeparator+'i82',ClassFileName,'file','y'); +PrintStringInfo('d0i162i162' +ArgSeparator+'i162',ClassFileName,'file','y'); + + + +PrintStringInfo('c0c0'+ArgSeparator+'c2',ClassFileName,'file','y'); +PrintStringInfo('c0c2'+ArgSeparator+'c2',ClassFileName,'file','y'); +PrintStringInfo('c2c0'+ArgSeparator+'c2',ClassFileName,'file','y'); +PrintStringInfo('c2c2'+ArgSeparator+'c2',ClassFileName,'file','y'); + +PrintStringInfo('z0z0'+ArgSeparator+'z2',ClassFileName,'file','y'); +PrintStringInfo('z0z2'+ArgSeparator+'z2',ClassFileName,'file','y'); +PrintStringInfo('z2z0'+ArgSeparator+'z2',ClassFileName,'file','y'); +PrintStringInfo('z2z2'+ArgSeparator+'z2',ClassFileName,'file','y'); + +PrintStringInfo('u80u80'+ArgSeparator+'u82',ClassFileName,'file','y'); +PrintStringInfo('u80u82'+ArgSeparator+'u82',ClassFileName,'file','y'); +PrintStringInfo('u82u80'+ArgSeparator+'u82',ClassFileName,'file','y'); +PrintStringInfo('u82u82'+ArgSeparator+'u82',ClassFileName,'file','y'); +PrintStringInfo('u160u160'+ArgSeparator+'u162',ClassFileName,'file','y'); +PrintStringInfo('u160u162'+ArgSeparator+'u162',ClassFileName,'file','y'); +PrintStringInfo('u162u160'+ArgSeparator+'u162',ClassFileName,'file','y'); +PrintStringInfo('u162u162'+ArgSeparator+'u162',ClassFileName,'file','y'); +PrintStringInfo('i80i80'+ArgSeparator+'i82',ClassFileName,'file','y'); +PrintStringInfo('i80i82'+ArgSeparator+'i82',ClassFileName,'file','y'); +PrintStringInfo('i82i80'+ArgSeparator+'i82',ClassFileName,'file','y'); +PrintStringInfo('i82i82'+ArgSeparator+'i82',ClassFileName,'file','y'); +PrintStringInfo('i160i160'+ArgSeparator+'i162',ClassFileName,'file','y'); +PrintStringInfo('i160i162'+ArgSeparator+'i162',ClassFileName,'file','y'); +PrintStringInfo('i162i160'+ArgSeparator+'i162',ClassFileName,'file','y'); +PrintStringInfo('i162i162'+ArgSeparator+'i162',ClassFileName,'file','y'); + +PrintStringInfo('z0d0'+ArgSeparator+'z2',ClassFileName,'file','y'); +PrintStringInfo('z2d0'+ArgSeparator+'z2',ClassFileName,'file','y'); +PrintStringInfo('c0s0'+ArgSeparator+'c2',ClassFileName,'file','y'); +PrintStringInfo('c2s0'+ArgSeparator+'c2',ClassFileName,'file','y'); + +PrintStringInfo('s0c0'+ArgSeparator+'c2',ClassFileName,'file','y'); +PrintStringInfo('s2c0'+ArgSeparator+'c2',ClassFileName,'file','y'); +PrintStringInfo('d0z0'+ArgSeparator+'z2',ClassFileName,'file','y'); +PrintStringInfo('d2z0'+ArgSeparator+'z2',ClassFileName,'file','y'); + +PrintStringInfo('s2c2'+ArgSeparator+'c2',ClassFileName,'file','y'); +PrintStringInfo('c2s2'+ArgSeparator+'c2',ClassFileName,'file','y'); +PrintStringInfo('d2z2'+ArgSeparator+'z2',ClassFileName,'file','y'); +PrintStringInfo('z2d2'+ArgSeparator+'z2',ClassFileName,'file','y'); + +PrintStringInfo('s0c2'+ArgSeparator+'c2',ClassFileName,'file','y'); +PrintStringInfo('c0s2'+ArgSeparator+'c2',ClassFileName,'file','y'); +PrintStringInfo('d0z2'+ArgSeparator+'z2',ClassFileName,'file','y'); +PrintStringInfo('z0d2'+ArgSeparator+'z2',ClassFileName,'file','y'); + +// --- Annotation Function And Function List Function. --- +FunctionName = 'cat'; // AS : Done AS : Float_Done +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + // ------------------- // --- Class Find. --- // ------------------- diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci index 7813809..8b5df6f 100644 --- a/macros/findDeps/getAllInterfaces.sci +++ b/macros/findDeps/getAllInterfaces.sci @@ -32,6 +32,7 @@ function allInterfaces = getAllInterfaces(OutFormat) "src/c/matrixOperations/interfaces/int_vmagn.h" "src/c/matrixOperations/interfaces/int_ones.h" "src/c/matrixOperations/interfaces/int_spec.h" + "src/c/matrixOperations/interfaces/int_cat.h" "src/c/matrixOperations/interfaces/int_zeros.h" "src/c/matrixOperations/interfaces/int_OpBackSlash.h" "src/c/matrixOperations/interfaces/int_OpApex.h" -- cgit From 7382a75d68141d72562f219a839543c9c6fc83aa Mon Sep 17 00:00:00 2001 From: imushir Date: Tue, 29 Dec 2015 12:21:00 +0530 Subject: added support for magnitude --- macros/findDeps/getAllSources.sci | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'macros') diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci index 0862e88..56a8fea 100644 --- a/macros/findDeps/getAllSources.sci +++ b/macros/findDeps/getAllSources.sci @@ -218,6 +218,14 @@ function allSources = getAllSources(OutFormat) "src/c/matrixOperations/magnitude/smagns.c" "src/c/matrixOperations/magnitude/zmagna.c" "src/c/matrixOperations/magnitude/zmagns.c" + "src/c/matrixOperations/magnitude/u8magna.c" + "src/c/matrixOperations/magnitude/u8magns.c" + "src/c/matrixOperations/magnitude/u16magna.c" + "src/c/matrixOperations/magnitude/u16magns.c" + "src/c/matrixOperations/magnitude/i8magna.c" + "src/c/matrixOperations/magnitude/i8magns.c" + "src/c/matrixOperations/magnitude/i16magna.c" + "src/c/matrixOperations/magnitude/i16magns.c" "src/c/matrixOperations/hilb/shilba.c" "src/c/matrixOperations/hilb/dhilba.c" "src/c/matrixOperations/squaredMagnitude/ssquMagna.c" -- cgit