Skip to content
Snippets Groups Projects
Commit 665b7419 authored by Federico Felici's avatar Federico Felici
Browse files

Add build method for expcode + clean up node info

parent 27c53768
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
code/classes/SCDclass_expcode.m
+ 163
− 165
View file @ 665b7419
......@@ -35,12 +35,142 @@ classdef SCDclass_expcode
node06
node07
node08
end
methods(Static)
function node = defaultnode(nodenr)
node01.active = 0;
node01.ncpu = 1;
node01.type = 'std1cpu2015a';
node01.timing.t_start = -4.5;
node01.timing.t_stop = 3;
node01.timing.dt = 1e-4;
node01.buildcfg.conffile{1} = 'standard';
node01.buildcfg.initscdbeforecomp = 0;
node01.usewavegen = 0;
node01.datadict='SCD_rtc_01.sldd';
node02.active = 0;
node02.ncpu = 4;
node02.type = 'std1cpu2015a';
node02.timing.t_start = -4.5;
node02.timing.t_stop = 3;
node02.timing.dt = 1e-4;
node02.thperiod = [1.0000e-03 1.0000e-03 1.0000e-03 1.0000e-03];
node02.buildcfg.conffile{1} = 'standard';
node02.buildcfg.conffile{2} = 'standard';
node02.buildcfg.conffile{3} = 'standard';
node02.buildcfg.conffile{4} = 'standard';
node02.buildcfg.conffile=node02.buildcfg.conffile';
node02.buildcfg.initscdbeforecomp = 0;
node02.usewavegen = 0;
node02.datadict='SCD_rtc_02.sldd';
node03.active = 0;
node03.ncpu = 4;
node03.type = '4cpus2015a';
node03.timing.t_start = -2.0;
node03.timing.t_stop = 2.75;
node03.timing.dt = 1e-3;
node03.thdwsample = [0 0 0 0];
node03.thperiod = [1.0000e-03 1.0000e-03 1.0000e-03 1.0000e-03];
node03.buildcfg.conffile{1} = 'standard';
node03.buildcfg.conffile{2} = 'standard';
node03.buildcfg.conffile{3} = 'standard';
node03.buildcfg.conffile{4} = 'standard';
node03.buildcfg.conffile=node03.buildcfg.conffile';
node03.buildcfg.initscdbeforecomp = [0 0 0 0];
node03.usewavegen = 0;
node03.useethcat1 = 0;
node03.datadict='SCD_rtc_03.sldd';
node04.active = 0;
node04.ncpu = 4;
node04.type = 'std1cpu2015a';
node04.timing.t_start = -4.5;
node04.timing.t_stop = 3;
node04.timing.dt = 1e-4;
node04.buildcfg.conffile{1} = 'standard';
node04.buildcfg.initscdbeforecomp = 0;
node04.usewavegen = 0;
node05.active = 0;
node05.ncpu = 1;
node05.type = 'std1cpu2015a';
node05.timing.t_start = -4.5;
node05.timing.t_stop = 3;
node05.timing.dt = 1e-4;
node05.buildcfg.conffile{1} = 'standard';
node05.buildcfg.initscdbeforecomp = 0;
node05.usewavegen = 0;
node06.active = 0;
node06.ncpu = 4;
node06.type = '4cpus2015a';
node06.timing.t_start = 0.0;
node06.timing.t_stop = 2.75;
node06.timing.dt = 1e-3;
node06.thdwsample = [0 0 0 0];
node06.thperiod = [1.0000e-03 1.0000e-03 1.0000e-03 1.0000e-03];
node06.buildcfg.conffile{1} = 'standard';
node06.buildcfg.conffile{2} = 'standard';
node06.buildcfg.conffile{3} = 'standard';
node06.buildcfg.conffile{4} = 'standard';
node06.buildcfg.conffile=node06.buildcfg.conffile';
node06.buildcfg.initscdbeforecomp = [0 0 0 0];
node06.usewavegen = 0;
node06.datadict='SCD_rtc_06.sldd';
node07.active = 0;
node07.ncpu = 4;
node07.type = '4cpus2015a';
node07.timing.t_start = -0.5;
node07.timing.t_stop = 2.5;
node07.timing.dt = 1e-3;
node07.thdwsample = [0 0 0 0];
node07.thperiod = [1.0000e-03 1.0000e-03 1.0000e-03 1.0000e-03];
node07.buildcfg.conffile{1} = 'standard';
node07.buildcfg.conffile{2} = 'standard';
node07.buildcfg.conffile{3} = 'standard';
node07.buildcfg.conffile{4} = 'standard';
node07.buildcfg.conffile=node07.buildcfg.conffile';
node07.buildcfg.initscdbeforecomp = [0 0 0 0];
node07.usewavegen = 0;
node07.datadict='SCD_rtc_07.sldd';
node08.active = 0;
node08.ncpu = 1;
node08.type = '4cpus2015a';
node08.timing.t_start = -0.5;
node08.timing.t_stop = 2.5;
node08.timing.dt = 1e-3;
node08.thdwsample = [0 0 0 0];
node08.thperiod = [1.0000e-03 1.0000e-03 1.0000e-03 1.0000e-03];
node08.buildcfg.conffile{1} = 'standard';
node08.buildcfg.conffile{2} = 'standard';
node08.buildcfg.conffile{3} = 'standard';
node08.buildcfg.conffile{4} = 'standard';
node08.buildcfg.conffile=node08.buildcfg.conffile';
node08.buildcfg.initscdbeforecomp = [0 0 0 0];
node08.usewavegen = 0;
node08.datadict='SCD_rtc_08.sldd';
node = eval(sprintf('node%02d',nodenr));
% general part]
node.wrapper = cell(node.ncpu,1);
node.wrapdatadicts=cell(node.ncpu,1);
node.varalgo = ones(node.ncpu,1);
node.cpuactive = zeros(node.ncpu,1);
for iwrap=1:node.ncpu
node.wrapper{iwrap} = sprintf('SCDwrap_template%02d%02d.slx',nodenr,iwrap);
node.wrapdatadicts{iwrap} = sprintf('SCDwrap_template%02d%02d.sldd',nodenr,iwrap);
end
end
end
methods
function obj=SCDclass_expcode()
% All templates constructor
......@@ -56,16 +186,7 @@ classdef SCDclass_expcode
{1:4}; ...
{1:4}; ...
{1}];
% obj.nodeddlist=cell(6,1);
% obj.nodeddlist{1} = 'SCD_rtc_01.sldd';
% obj.nodeddlist{2} = 'SCD_rtc_02.sldd';
% obj.nodeddlist{3} = 'SCD_rtc_03.sldd';
% obj.nodeddlist{4} = 'SCD_rtc_06.sldd';
% obj.nodeddlist{5} = 'SCD_rtc_07.sldd';
% obj.nodeddlist{6} = 'SCD_rtc_08.sldd';
obj.algonamelist={};
obj.algoddlist={};
obj.wrapperlist={};
......@@ -74,149 +195,9 @@ classdef SCDclass_expcode
obj.mdscontainer = SCDclass_mdsobjcontainer;
obj.taskcontainer = SCDclass_taskcontainer;
obj.node01.active = 0;
obj.node01.type = 'std1cpu2015a';
obj.node01.timing.t_start = -4.5;
obj.node01.timing.t_stop = 3;
obj.node01.timing.dt = 1e-4;
obj.node01.varalgo = 1;
obj.node01.buildcfg.conffile{1} = 'standard';
obj.node01.buildcfg.initscdbeforecomp = 0;
obj.node01.usewavegen = 0;
obj.node01.datadict='SCD_rtc_01.sldd';
obj.node01.wrapdatadicts{1} = 'SCDwrap_template0101.sldd';
obj.node02.active = 0;
obj.node02.type = 'std1cpu2015a';
obj.node02.timing.t_start = -4.5;
obj.node02.timing.t_stop = 3;
obj.node02.timing.dt = 1e-4;
obj.node02.varalgo = [1 1 1 1];
obj.node02.thperiod = [1.0000e-03 1.0000e-03 1.0000e-03 1.0000e-03];
obj.node02.buildcfg.conffile{1} = 'standard';
obj.node02.buildcfg.conffile{2} = 'standard';
obj.node02.buildcfg.conffile{3} = 'standard';
obj.node02.buildcfg.conffile{4} = 'standard';
obj.node02.buildcfg.conffile=obj.node02.buildcfg.conffile';
obj.node02.buildcfg.initscdbeforecomp = 0;
obj.node02.usewavegen = 0;
obj.node02.datadict='SCD_rtc_02.sldd';
obj.node02.wrapdatadicts{1} = 'SCDwrap_template0201.sldd';
obj.node02.wrapdatadicts{2} = 'SCDwrap_template0202.sldd';
obj.node02.wrapdatadicts{3} = 'SCDwrap_template0203.sldd';
obj.node02.wrapdatadicts{4} = 'SCDwrap_template0204.sldd';
obj.node02.wrapdatadicts=obj.node02.wrapdatadicts';
obj.node03.active = 0;
obj.node03.type = '4cpus2015a';
obj.node03.timing.t_start = -2.0;
obj.node03.timing.t_stop = 2.75;
obj.node03.timing.dt = 1e-3;
obj.node03.thdwsample = [0 0 0 0];
obj.node03.thperiod = [1.0000e-03 1.0000e-03 1.0000e-03 1.0000e-03];
obj.node03.varalgo = [1 1 1 1];
obj.node03.buildcfg.conffile{1} = 'standard';
obj.node03.buildcfg.conffile{2} = 'standard';
obj.node03.buildcfg.conffile{3} = 'standard';
obj.node03.buildcfg.conffile{4} = 'standard';
obj.node03.buildcfg.conffile=obj.node03.buildcfg.conffile';
obj.node03.buildcfg.initscdbeforecomp = [0 0 0 0];
obj.node03.usewavegen = 0;
obj.node03.useethcat1 = 0;
obj.node03.datadict='SCD_rtc_03.sldd';
obj.node03.wrapdatadicts{1} = 'SCDwrap_template0301.sldd';
obj.node03.wrapdatadicts{2} = 'SCDwrap_template0302.sldd';
obj.node03.wrapdatadicts{3} = 'SCDwrap_template0303.sldd';
obj.node03.wrapdatadicts{4} = 'SCDwrap_template0304.sldd';
obj.node03.wrapdatadicts=obj.node03.wrapdatadicts';
obj.node04.active = 0;
obj.node04.type = 'std1cpu2015a';
obj.node04.timing.t_start = -4.5;
obj.node04.timing.t_stop = 3;
obj.node04.timing.dt = 1e-4;
obj.node04.varalgo = 1;
obj.node04.buildcfg.conffile{1} = 'standard';
obj.node04.buildcfg.initscdbeforecomp = 0;
obj.node04.usewavegen = 0;
obj.node05.active = 0;
obj.node05.type = 'std1cpu2015a';
obj.node05.timing.t_start = -4.5;
obj.node05.timing.t_stop = 3;
obj.node05.timing.dt = 1e-4;
obj.node05.varalgo = 1;
obj.node05.buildcfg.conffile{1} = 'standard';
obj.node05.buildcfg.initscdbeforecomp = 0;
obj.node05.usewavegen = 0;
obj.node06.active = 0;
obj.node06.type = '4cpus2015a';
obj.node06.timing.t_start = 0.0;
obj.node06.timing.t_stop = 2.75;
obj.node06.timing.dt = 1e-3;
obj.node06.thdwsample = [0 0 0 0];
obj.node06.thperiod = [1.0000e-03 1.0000e-03 1.0000e-03 1.0000e-03];
obj.node06.varalgo = [1 1 1 1];
obj.node06.buildcfg.conffile{1} = 'standard';
obj.node06.buildcfg.conffile{2} = 'standard';
obj.node06.buildcfg.conffile{3} = 'standard';
obj.node06.buildcfg.conffile{4} = 'standard';
obj.node06.buildcfg.conffile=obj.node06.buildcfg.conffile';
obj.node06.buildcfg.initscdbeforecomp = [0 0 0 0];
obj.node06.usewavegen = 0;
obj.node06.datadict='SCD_rtc_06.sldd';
obj.node06.wrapdatadicts{1} = 'SCDwrap_template0601.sldd';
obj.node06.wrapdatadicts{2} = 'SCDwrap_template0602.sldd';
obj.node06.wrapdatadicts{3} = 'SCDwrap_template0603.sldd';
obj.node06.wrapdatadicts{4} = 'SCDwrap_template0604.sldd';
obj.node06.wrapdatadicts=obj.node06.wrapdatadicts';
obj.node07.active = 0;
obj.node07.type = '4cpus2015a';
obj.node07.timing.t_start = -0.5;
obj.node07.timing.t_stop = 2.5;
obj.node07.timing.dt = 1e-3;
obj.node07.thdwsample = [0 0 0 0];
obj.node07.thperiod = [1.0000e-03 1.0000e-03 1.0000e-03 1.0000e-03];
obj.node07.varalgo = [1 1 1 1];
obj.node07.buildcfg.conffile{1} = 'standard';
obj.node07.buildcfg.conffile{2} = 'standard';
obj.node07.buildcfg.conffile{3} = 'standard';
obj.node07.buildcfg.conffile{4} = 'standard';
obj.node07.buildcfg.conffile=obj.node07.buildcfg.conffile';
obj.node07.buildcfg.initscdbeforecomp = [0 0 0 0];
obj.node07.usewavegen = 0;
obj.node07.datadict='SCD_rtc_07.sldd';
obj.node07.wrapdatadicts{1} = 'SCDwrap_template0701.sldd';
obj.node07.wrapdatadicts{2} = 'SCDwrap_template0702.sldd';
obj.node07.wrapdatadicts{3} = 'SCDwrap_template0703.sldd';
obj.node07.wrapdatadicts{4} = 'SCDwrap_template0704.sldd';
obj.node07.wrapdatadicts=obj.node07.wrapdatadicts';
obj.node08.active = 0;
obj.node08.type = '4cpus2015a';
obj.node08.timing.t_start = -0.5;
obj.node08.timing.t_stop = 2.5;
obj.node08.timing.dt = 1e-3;
obj.node08.thdwsample = [0 0 0 0];
obj.node08.thperiod = [1.0000e-03 1.0000e-03 1.0000e-03 1.0000e-03];
obj.node08.varalgo = [1 1 1 1];
obj.node08.buildcfg.conffile{1} = 'standard';
obj.node08.buildcfg.conffile{2} = 'standard';
obj.node08.buildcfg.conffile{3} = 'standard';
obj.node08.buildcfg.conffile{4} = 'standard';
obj.node08.buildcfg.conffile=obj.node08.buildcfg.conffile';
obj.node08.buildcfg.initscdbeforecomp = [0 0 0 0];
obj.node08.usewavegen = 0;
obj.node08.datadict='SCD_rtc_08.sldd';
obj.node08.wrapdatadicts{1} = 'SCDwrap_template0801.sldd';
for nodenr = 1:8
obj.(sprintf('node%02d',nodenr)) = SCDclass_expcode.defaultnode(nodenr);
end
end
function printinfo(obj)
......@@ -253,7 +234,7 @@ classdef SCDclass_expcode
fprintf('* Configured init scripts: %d (use printinits method for details)\n', numel(obj.stdinits));
end
function obj = addwrapper(obj, node, cpu, varalgo, modelname, varargin)
function obj = addwrapper(obj, node, cpu, varalgo, wrappername, varargin)
p=inputParser;
checknodes = @(x) ismember(x,obj.activenodes );
......@@ -265,7 +246,7 @@ classdef SCDclass_expcode
addRequired(p, 'modelname', @(x) ischar(x));
addOptional(p, 'datadictionary', '', @(x) ischar(x));
parse(p, node, cpu, varalgo, modelname, varargin{:});
parse(p, node, cpu, varalgo, wrappername, varargin{:});
% In data dcitionary is not specified it is assumed having
% the same name than the model
......@@ -275,7 +256,7 @@ classdef SCDclass_expcode
datadictionary=[p.Results.datadictionary '.sldd'];
end
% Frist checking for duplicates
% First checking for duplicates
if(numel(obj.wrapperlist)>0)
wrappernamelist={};
wrapperddnamelist={};
......@@ -284,10 +265,17 @@ classdef SCDclass_expcode
wrapperddnamelist{end+1}=obj.wrapperlist{ii}{5};
end
if(ismember(p.Results.modelname,wrappernamelist) || ismember(p.Results.datadictionary,wrapperddnamelist))
warning('SCDclass_expcode:addwrapper','wrapper ''%s'' already present, ignoring.',modelname);
warning('SCDclass_expcode:addwrapper','wrapper ''%s'' already present, ignoring.',wrappername);
return
end
end
%% update node info
nodestr=sprintf('node%02d',node);
obj.(nodestr).varalgo(cpu) = varalgo;
obj.(nodestr).wrapper{cpu} = wrappername;
obj.(nodestr).cpuactive(cpu) = 1;
%% save in wrapper list
tempwrapper=cell(10,1);
tempwrapper{1}=p.Results.node;
......@@ -561,6 +549,21 @@ classdef SCDclass_expcode
function sim(obj)
sim('tcv')
end
function build(obj)
assert(~isempty(getenv('RTCCODE_LIBPATH')),'RTCCODE_LIBPATH environment variable needs to be defined to compile');
SCDconf_setCODEconf('configurationSettingsCODEicc')
for inode=1:8
nodeinfo=obj.(sprintf('node%02d',inode));
for icpu = 1:nodeinfo.ncpu
if nodeinfo.cpuactive(icpu)
cpuslxname = sprintf('SCD_rtccode_%02d_%02d',inode,icpu);
fprintf(' *** Buiding Node %s ***\n',cpuslxname);
rtwbuild(cpuslxname);
end
end
end
end
end
methods (Access = private)
......@@ -609,7 +612,6 @@ classdef SCDclass_expcode
% Looping through every active node
for idx_nodedds=1:numel(obj.activenodes)
% Getting data dictionary and required data sources
datadictname=eval(sprintf('obj.node%02d.datadict',obj.activenodes(idx_nodedds)));
nodedd=Simulink.data.dictionary.open(datadictname);
......@@ -862,15 +864,11 @@ classdef SCDclass_expcode
eval(str);
end
end
varalgodd.setValue(s);
end
end
end
code/classes/SCDclass_expcodecontainer.m
+ 1
− 1
View file @ 665b7419
......@@ -101,7 +101,7 @@ classdef SCDclass_expcodecontainer
function out=getbymaincode(obj,code)
if(obj.numexpcodes==0)
error('SCDclass_expcodecontainer.getbymaincode','Expcode container empty!');
error('SCDclass_expcodecontainer.getbymaincode: %s','Expcode container empty!');
end
presentcodes=[];
......
tests/test_expcodes.m
+ 2
− 12
View file @ 665b7419
......@@ -52,18 +52,8 @@ classdef test_expcodes < matlab.unittest.TestCase
testCase.expcode_obj.compile; % compile tcv.slx with this expcode
end
function test_rtwbuild(testCase)
assert(~isempty(getenv('RTCCODE_LIBPATH')),'RTCCODE_LIBPATH environment variable needs to be defined to compile');
SCDconf_setCODEconf('configurationSettingsCODEicc')
switch testCase.expcode_obj.maincode
case 1005
rtwbuild('SCD_rtccode_02_02');
case 1010
rtwbuild('SCD_rtccode_02_02');
rtwbuild('SCD_rtccode_02_03');
otherwise
% do nothing
end
function test_build(testCase)
testCase.expcode_obj.build;
end
end
end
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment