Skip to content

Commit

Permalink
Fix detection of nested FMUs in grtfmi.tlc
Browse files Browse the repository at this point in the history 
fixes #168
  • Loading branch information
@t-sommer
t-sommer committed Mar 29, 2022
1 parent f72d16c commit 4002cee
Showing 1 changed file with 115 additions and 116 deletions.
231 changes: 115 additions & 116 deletions grtfmi/grtfmi_make_rtw_hook.m
View file
Original file line number Diff line number Diff line change
@@ -1,132 +1,131 @@
function grtfmi_make_rtw_hook(hookMethod, modelName, rtwRoot, templateMakefile, buildOpts, buildArgs, buildInfo)

switch hookMethod
if ~strcmp(hookMethod, 'after_make')
return
end

case 'after_make'
current_dir = pwd;

current_dir = pwd;

% remove FMU build directory from previous build
if exist('FMUArchive', 'dir')
rmdir('FMUArchive', 's');
end

% create the archive directory (uncompressed FMU)
mkdir('FMUArchive');

template_dir = get_param(gcs, 'FMUTemplateDir');

% copy template files
if ~isempty(template_dir)
copyfile(template_dir, 'FMUArchive');
end

% remove fmiwrapper.inc for referenced models
if ~strcmp(current_dir(end-11:end), '_grt_fmi_rtw')
delete('fmiwrapper.inc');
return
end
% remove FMU build directory from previous build
if exist('FMUArchive', 'dir')
rmdir('FMUArchive', 's');
end

if strcmp(get_param(gcs, 'GenCodeOnly'), 'on')
return
end
% create the archive directory (uncompressed FMU)
mkdir('FMUArchive');

pathstr = which('grtfmi.tlc');
[grtfmi_dir, ~, ~] = fileparts(pathstr);

% add model.png
if strcmp(get_param(gcs, 'AddModelImage'), 'on')
% create an image of the model
print(['-s' modelName], '-dpng', fullfile('FMUArchive', 'model.png'));
else
% use the generic Simulink logo
copyfile(fullfile(grtfmi_dir, 'model.png'), fullfile('FMUArchive', 'model.png'));
end

command = get_param(modelName, 'CMakeCommand');
command = grtfmi_find_cmake(command);
generator = get_param(modelName, 'CMakeGenerator');
toolset = get_param(modelName, 'CMakeToolset');
build_configuration = get_param(modelName, 'CMakeBuildConfiguration');
source_code_fmu = get_param(modelName, 'SourceCodeFMU');
fmi_version = get_param(modelName, 'FMIVersion');

% copy extracted nested FMUs
nested_fmus = find_system(modelName, 'ReferenceBlock', 'FMIKit_blocks/FMU');

if ~isempty(nested_fmus)
disp('### Copy nested FMUs')
for i = 1:numel(nested_fmus)
nested_fmu = nested_fmus{i};
unzipdir = FMIKit.getUnzipDirectory(nested_fmu);
user_data = get_param(nested_fmu, 'UserData');
dialog = FMIKit.showBlockDialog(nested_fmu, false);
if user_data.runAsKind == 0
model_identifier = char(dialog.modelDescription.modelExchange.modelIdentifier);
else
model_identifier = char(dialog.modelDescription.coSimulation.modelIdentifier);
end
disp(['Copying ' unzipdir ' to resources'])
copyfile(unzipdir, fullfile('FMUArchive', 'resources', model_identifier), 'f');
end
end

disp('### Running CMake generator')

% get model sources
[custom_include, custom_source, custom_library] = ...
grtfmi_model_sources(modelName, pwd);

custom_include = cmake_list(custom_include);
custom_source = cmake_list(custom_source);
custom_library = cmake_list(custom_library);

% check for Simscape blocks
if isempty(find_system(modelName, 'BlockType', 'SimscapeBlock'))
simscape_blocks = 'off';
template_dir = get_param(gcs, 'FMUTemplateDir');

% copy template files
if ~isempty(template_dir)
copyfile(template_dir, 'FMUArchive');
end

% remove fmiwrapper.inc for referenced models
if ~strcmp(current_dir(end-11:end), '_grt_fmi_rtw')
delete('fmiwrapper.inc');
return
end

if strcmp(get_param(gcs, 'GenCodeOnly'), 'on')
return
end

pathstr = which('grtfmi.tlc');
[grtfmi_dir, ~, ~] = fileparts(pathstr);

% add model.png
if strcmp(get_param(gcs, 'AddModelImage'), 'on')
% create an image of the model
print(['-s' modelName], '-dpng', fullfile('FMUArchive', 'model.png'));
else
% use the generic Simulink logo
copyfile(fullfile(grtfmi_dir, 'model.png'), fullfile('FMUArchive', 'model.png'));
end

command = get_param(modelName, 'CMakeCommand');
command = grtfmi_find_cmake(command);
generator = get_param(modelName, 'CMakeGenerator');
toolset = get_param(modelName, 'CMakeToolset');
build_configuration = get_param(modelName, 'CMakeBuildConfiguration');
source_code_fmu = get_param(modelName, 'SourceCodeFMU');
fmi_version = get_param(modelName, 'FMIVersion');

% copy extracted nested FMUs
nested_fmus = find_system(modelName, 'FunctionName', 'sfun_fmurun');

if ~isempty(nested_fmus)
disp('### Copy nested FMUs')
for i = 1:numel(nested_fmus)
nested_fmu = nested_fmus{i};
unzipdir = FMIKit.getUnzipDirectory(nested_fmu);
user_data = get_param(nested_fmu, 'UserData');
dialog = FMIKit.showBlockDialog(nested_fmu, false);
if user_data.runAsKind == 0
model_identifier = char(dialog.modelDescription.modelExchange.modelIdentifier);
else
simscape_blocks = 'on';
end

% write the CMakeCache.txt file
fid = fopen('CMakeCache.txt', 'w');
fprintf(fid, 'MODEL_NAME:STRING=%s\n', modelName);
fprintf(fid, 'RTW_DIR:STRING=%s\n', strrep(pwd, '\', '/'));
fprintf(fid, 'MATLAB_ROOT:STRING=%s\n', strrep(matlabroot, '\', '/'));
fprintf(fid, 'CUSTOM_INCLUDE:STRING=%s\n', custom_include);
fprintf(fid, 'CUSTOM_SOURCE:STRING=%s\n', custom_source);
fprintf(fid, 'CUSTOM_LIBRARY:STRING=%s\n', custom_library);
fprintf(fid, 'SOURCE_CODE_FMU:BOOL=%s\n', upper(source_code_fmu));
fprintf(fid, 'SIMSCAPE:BOOL=%s\n', upper(simscape_blocks));
fprintf(fid, 'FMI_VERSION:STRING=%s\n', fmi_version);
fprintf(fid, 'COMPILER_OPTIMIZATION_LEVEL:STRING=%s\n', get_param(gcs, 'CMakeCompilerOptimizationLevel'));
fprintf(fid, 'COMPILER_OPTIMIZATION_FLAGS:STRING=%s\n', get_param(gcs, 'CMakeCompilerOptimizationFlags'));
fclose(fid);

disp('### Generating project')

cmake_options = [' -G "' generator '"'];

if ispc
generator_platform = get_param(modelName, 'CMakeGeneratorPlatform');
cmake_options = [cmake_options ' -A ' generator_platform];
model_identifier = char(dialog.modelDescription.coSimulation.modelIdentifier);
end
disp(['Copying ' unzipdir ' to resources'])
copyfile(unzipdir, fullfile('FMUArchive', 'resources', model_identifier), 'f');
end
end

if ~isempty(toolset)
cmake_options = [cmake_options ' -T "' toolset '"'];
end
disp('### Running CMake generator')

% get model sources
[custom_include, custom_source, custom_library] = ...
grtfmi_model_sources(modelName, pwd);

status = system(['"' command '"' cmake_options ' "' strrep(grtfmi_dir, '\', '/') '"']);
assert(status == 0, 'Failed to run CMake generator');
custom_include = cmake_list(custom_include);
custom_source = cmake_list(custom_source);
custom_library = cmake_list(custom_library);

% check for Simscape blocks
if isempty(find_system(modelName, 'BlockType', 'SimscapeBlock'))
simscape_blocks = 'off';
else
simscape_blocks = 'on';
end

disp('### Building FMU')
status = system(['"' command '" --build . --config ' build_configuration]);
assert(status == 0, 'Failed to build FMU');
% write the CMakeCache.txt file
fid = fopen('CMakeCache.txt', 'w');
fprintf(fid, 'MODEL_NAME:STRING=%s\n', modelName);
fprintf(fid, 'RTW_DIR:STRING=%s\n', strrep(pwd, '\', '/'));
fprintf(fid, 'MATLAB_ROOT:STRING=%s\n', strrep(matlabroot, '\', '/'));
fprintf(fid, 'CUSTOM_INCLUDE:STRING=%s\n', custom_include);
fprintf(fid, 'CUSTOM_SOURCE:STRING=%s\n', custom_source);
fprintf(fid, 'CUSTOM_LIBRARY:STRING=%s\n', custom_library);
fprintf(fid, 'SOURCE_CODE_FMU:BOOL=%s\n', upper(source_code_fmu));
fprintf(fid, 'SIMSCAPE:BOOL=%s\n', upper(simscape_blocks));
fprintf(fid, 'FMI_VERSION:STRING=%s\n', fmi_version);
fprintf(fid, 'COMPILER_OPTIMIZATION_LEVEL:STRING=%s\n', get_param(gcs, 'CMakeCompilerOptimizationLevel'));
fprintf(fid, 'COMPILER_OPTIMIZATION_FLAGS:STRING=%s\n', get_param(gcs, 'CMakeCompilerOptimizationFlags'));
fclose(fid);

disp('### Generating project')

cmake_options = [' -G "' generator '"'];

if ispc
generator_platform = get_param(modelName, 'CMakeGeneratorPlatform');
cmake_options = [cmake_options ' -A ' generator_platform];
end

% copy the FMU to the working directory
copyfile([modelName '.fmu'], '..');
if ~isempty(toolset)
cmake_options = [cmake_options ' -T "' toolset '"'];
end

status = system(['"' command '"' cmake_options ' "' strrep(grtfmi_dir, '\', '/') '"']);
assert(status == 0, 'Failed to run CMake generator');

disp('### Building FMU')
status = system(['"' command '" --build . --config ' build_configuration]);
assert(status == 0, 'Failed to build FMU');

% copy the FMU to the working directory
copyfile([modelName '.fmu'], '..');

end

function joined = cmake_list(array)
Expand All @@ -139,7 +138,7 @@ function grtfmi_make_rtw_hook(hookMethod, modelName, rtwRoot, templateMakefile,
joined = array{1};

for i = 2:numel(array)
joined = [joined ';' array{i}]; %#ok<ARGROW>
joined = [joined ';' array{i}];
end

end

0 comments on commit 4002cee

Please sign in to comment.