Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dynare
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stéphane Adjemian
dynare
Commits
643face6
Commit
643face6
authored
Oct 19, 2023
by
Johannes Pfeifer
Browse files
Options
Downloads
Patches
Plain Diff
bug: do not remove +subfolder with fast option
Otherwise, expected files are not present
parent
fb8ff758
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/manual/source/running-dynare.rst
+5
-3
5 additions, 3 deletions
doc/manual/source/running-dynare.rst
matlab/dynare.m
+6
-3
6 additions, 3 deletions
matlab/dynare.m
with
11 additions
and
6 deletions
doc/manual/source/running-dynare.rst
+
5
−
3
View file @
643face6
...
@@ -409,9 +409,11 @@ by the ``dynare`` command.
...
@@ -409,9 +409,11 @@ by the ``dynare`` command.
.. option:: fast
.. option:: fast
Only useful with model option :opt:`use_dll`. Don’t recompile the
Don’t rewrite the output files otherwise written to the disk by the preprocessor
MEX files when running again the same model file and the lists
when re-running the same model file while the lists of variables and the equations
of variables and the equations haven’t changed. We use a 32
haven’t changed. Note that the whole model still needs to be preprocessed. This option
is most useful with model option :opt:`use_dll`, because
the time-consuming compilation of the MEX files will be skipped. We use a 32
bit checksum, stored in ``<model filename>/checksum``. There
bit checksum, stored in ``<model filename>/checksum``. There
is a very small probability that the preprocessor misses a
is a very small probability that the preprocessor misses a
change in the model. In case of doubt, re-run without the fast
change in the model. In case of doubt, re-run without the fast
...
...
This diff is collapsed.
Click to expand it.
matlab/dynare.m
+
6
−
3
View file @
643face6
...
@@ -184,6 +184,7 @@ preprocessoroutput = ~ismember('nopreprocessoroutput', varargin) && ...
...
@@ -184,6 +184,7 @@ preprocessoroutput = ~ismember('nopreprocessoroutput', varargin) && ...
nolog
=
ismember
(
'nolog'
,
varargin
)
||
ismember
(
'nolog'
,
file_opts
);
nolog
=
ismember
(
'nolog'
,
varargin
)
||
ismember
(
'nolog'
,
file_opts
);
onlymacro
=
ismember
(
'onlymacro'
,
varargin
)
||
ismember
(
'onlymacro'
,
file_opts
);
onlymacro
=
ismember
(
'onlymacro'
,
varargin
)
||
ismember
(
'onlymacro'
,
file_opts
);
onlyjson
=
ismember
(
'onlyjson'
,
varargin
)
||
ismember
(
'onlyjson'
,
file_opts
);
onlyjson
=
ismember
(
'onlyjson'
,
varargin
)
||
ismember
(
'onlyjson'
,
file_opts
);
fast
=
ismember
(
'fast'
,
varargin
)
||
ismember
(
'fast'
,
file_opts
);
% Start journal
% Start journal
diary
off
diary
off
...
@@ -234,12 +235,14 @@ end
...
@@ -234,12 +235,14 @@ end
% On MATLAB+Windows, the +folder may be locked by MATLAB, preventing its
% On MATLAB+Windows, the +folder may be locked by MATLAB, preventing its
% removal by the preprocessor.
% removal by the preprocessor.
% Trying to delete it here will actually fail, but surprisingly this allows
% Trying to delete it here will actually fail, but surprisingly this allows
% the preprocessor to actually remove the folder (see ModFile::writeOutput
Files
())
% the preprocessor to actually remove the folder (see ModFile::write
M
Output())
% For an instance of this bug, see:
% For an instance of this bug, see:
% https://forum.dynare.org/t/issue-with-dynare-preprocessor-4-6-1/15448/1
% https://forum.dynare.org/t/issue-with-dynare-preprocessor-4-6-1/15448/1
if
~
fast
if
ispc
&&
~
isoctave
&&
exist
([
'+'
,
fname
(
1
:
end
-
4
)],
'dir'
)
if
ispc
&&
~
isoctave
&&
exist
([
'+'
,
fname
(
1
:
end
-
4
)],
'dir'
)
[
~
,
~
]
=
rmdir
([
'+'
,
fname
(
1
:
end
-
4
)],
's'
);
[
~
,
~
]
=
rmdir
([
'+'
,
fname
(
1
:
end
-
4
)],
's'
);
end
end
end
% Under Windows, make sure the MEX file is unloaded (in the use_dll case),
% Under Windows, make sure the MEX file is unloaded (in the use_dll case),
% otherwise the preprocessor can't recompile it
% otherwise the preprocessor can't recompile it
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment