Skip to content

Commit

Permalink
updated requirements given new OPTI version
Browse files Browse the repository at this point in the history
  • Loading branch information
@tholden
tholden committed Jun 24, 2017
1 parent 17e5f63 commit c6b077f
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 26 deletions.
11 changes: 4 additions & 7 deletions Core/Setup/EnforceRequirementsAndGeneratePath.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,12 @@ function EnforceRequirementsAndGeneratePath( Update, OriginalPath, CurrentFolder
if strcmp( Architecture, 'PCWIN' )
warning( 'dynareOBC:Setup32Bit', 'DynareOBC is no longer supported on 32 bit MATLAB.\n While it may work (particularly if you have commercial solvers installed), absolutely no guarantees are made.\n We strongly recommend that you install a 64 bit version of MATLAB.' );
DLLInstalled = CheckMSVCRequirement( '12.0', 40660, 'x86', 'http://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe', dynareOBCPath, '2013/vcredist_x86.exe' ) || DLLInstalled;
DLLInstalled = CheckMSVCRequirement( '14.0', 24215, 'x86', 'https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81CC-ED5963AEAD48/vc_redist.x86.exe', dynareOBCPath, '2015/vcredist_x86_24215.exe' ) || DLLInstalled;
% DLLInstalled = CheckRequirement( '5018D8E6-8D8E-4F76-9AFD-CB2EF1100E84', 234881261, 'https://software.intel.com/sites/default/files/managed/c1/90/w_ccompxe_redist_msi_2013_sp1.4.237.zip', dynareOBCPath, 'w_ccompxe_redist_msi_2013_sp1.4.237.zip', 'w_ccompxe_redist_ia32_2013_sp1.4.237.msi' ) || DLLInstalled;
DLLInstalled = CheckRequirement( '71343AE0-11AC-4B7F-B15C-B9692CA3A23D', 251658419, 'https://software.intel.com/sites/default/files/managed/6a/21/w_fcompxe_redist_msi_2015.2.179.zip', dynareOBCPath, 'w_fcompxe_redist_msi_2015.2.179.zip', 'w_fcompxe_redist_ia32_2015.2.179.msi' ) || DLLInstalled;
DLLInstalled = CheckMSVCRequirement( '14.0', 25017, 'x86', 'https://download.microsoft.com/download/1/f/e/1febbdb2-aded-4e14-9063-39fb17e88444/vc_redist.x86.exe', dynareOBCPath, '2017/vcredist_x86_25017.exe' ) || DLLInstalled;
DLLInstalled = CheckRequirement( 'E39CC82A-E2AE-49DB-BD13-1EA9680D3A4A', 285212882, 'https://software.intel.com/sites/default/files/managed/f1/c0/ww_ifort_redist_msi_2017.4.210.zip', dynareOBCPath, 'ww_ifort_redist_msi_2017.4.210.zip', 'ww_ifort_redist_ia32_2017.4.210.msi' ) || DLLInstalled;
elseif strcmp( Architecture, 'PCWIN64' )
% DLLInstalled = CheckMSVCRequirement( '12.0', 40660, 'x64', 'http://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x64.exe', dynareOBCPath, '2013/vcredist_x64.exe' ) || DLLInstalled;
DLLInstalled = CheckMSVCRequirement( '14.0', 24215, 'x64', 'https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81CC-ED5963AEAD48/vc_redist.x64.exe', dynareOBCPath, '2015/vcredist_x64_24215.exe' ) || DLLInstalled;
% DLLInstalled = CheckRequirement( 'B548D238-D8C7-4A36-8C4E-496F62285BB3', 234881261, 'https://software.intel.com/sites/default/files/managed/c1/90/w_ccompxe_redist_msi_2013_sp1.4.237.zip', dynareOBCPath, 'w_ccompxe_redist_msi_2013_sp1.4.237.zip', 'w_ccompxe_redist_intel64_2013_sp1.4.237.msi' ) || DLLInstalled;
% DLLInstalled = CheckRequirement( '7FD876F7-BE2A-45B2-ADDC-0316304540CF', 251658419, 'https://software.intel.com/sites/default/files/managed/6a/21/w_fcompxe_redist_msi_2015.2.179.zip', dynareOBCPath, 'w_fcompxe_redist_msi_2015.2.179.zip', 'w_fcompxe_redist_intel64_2015.2.179.msi' ) || DLLInstalled;
DLLInstalled = CheckRequirement( 'CE6424E9-29F7-40F3-994C-21C345B79CC4', 268435663, 'https://software.intel.com/sites/default/files/managed/34/d8/ww_ifort_redist_msi_2016.3.207.zip', dynareOBCPath, 'ww_ifort_redist_msi_2016.3.207.zip', 'ww_ifort_redist_intel64_2016.3.207.msi' ) || DLLInstalled;
DLLInstalled = CheckMSVCRequirement( '14.0', 25017, 'x64', 'https://download.microsoft.com/download/3/b/f/3bf6e759-c555-4595-8973-86b7b4312927/vc_redist.x64.exe', dynareOBCPath, '2017/vcredist_x64_25017.exe' ) || DLLInstalled;
DLLInstalled = CheckRequirement( '4DFA76F8-9FBA-4898-81C6-5623A610B88C', 285212882, 'https://software.intel.com/sites/default/files/managed/f1/c0/ww_ifort_redist_msi_2017.4.210.zip', dynareOBCPath, 'ww_ifort_redist_msi_2017.4.210.zip', 'ww_ifort_redist_intel64_2017.4.210.msi' ) || DLLInstalled;
end
catch
warning( 'dynareOBC:FailedInstallingRequirement', 'Failed to install at least one requirement. Usually this means you are missing admin rights. Please see the source code above this warning to see the URLs of the requirements that should be installed by an administrator on your machine. DynareOBC will disable the OptiToolbox, though even with this change it may still not work correctly.' );
Expand Down
10 changes: 5 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ If you are using Windows, and you do not have administrative rights on your own

If you are using a 64-bit version of MATLAB, please ask for the following to be installed:

* https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81CC-ED5963AEAD48/vc_redist.x64.exe
* ww_ifort_redist_intel64_2016.3.207.msi from inside: https://software.intel.com/sites/default/files/managed/34/d8/ww_ifort_redist_msi_2016.3.207.zip
* https://download.microsoft.com/download/3/b/f/3bf6e759-c555-4595-8973-86b7b4312927/vc_redist.x64.exe
* ww_ifort_redist_intel64_2017.4.210.msi from inside: https://software.intel.com/sites/default/files/managed/f1/c0/ww_ifort_redist_msi_2017.4.210.zip

If you are using a 32-bit version of MATLAB, please ask for the following to be installed:

* http://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe
* https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81CC-ED5963AEAD48/vc_redist.x86.exe
* w_fcompxe_redist_ia32_2015.2.179.msi from inside: https://software.intel.com/sites/default/files/managed/6a/21/w_fcompxe_redist_msi_2015.2.179.zip
* https://download.microsoft.com/download/1/f/e/1febbdb2-aded-4e14-9063-39fb17e88444/vc_redist.x86.exe
* https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe
* ww_ifort_redist_ia32_2017.4.210.msi from inside: https://software.intel.com/sites/default/files/managed/f1/c0/ww_ifort_redist_msi_2017.4.210.zip

Troubleshooting
---------------
Expand Down
Binary file modified ReadMe.pdf
View file
Binary file not shown.
14 changes: 7 additions & 7 deletions ReadMe.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,16 @@ the Intel C Compiler, or the Intel Fortran Compiler.

If you are using a 64-bit version of MATLAB, please ask for the following to be installed:

* https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81CC-ED5963AEAD48/vc_redist.x64.exe
* ww_ifort_redist_intel64_2016.3.207.msi from inside:
https://software.intel.com/sites/default/files/managed/34/d8/ww_ifort_redist_msi_2016.3.207.zip
* https://download.microsoft.com/download/3/b/f/3bf6e759-c555-4595-8973-86b7b4312927/vc_redist.x64.exe
* ww_ifort_redist_intel64_2017.4.210.msi from inside:
https://software.intel.com/sites/default/files/managed/f1/c0/ww_ifort_redist_msi_2017.4.210.zip

If you are using a 32-bit version of MATLAB, please ask for the following to be installed:

* http://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe
* https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81CC-ED5963AEAD48/vc_redist.x86.exe
* w_fcompxe_redist_ia32_2015.2.179.msi from inside:
https://software.intel.com/sites/default/files/managed/6a/21/w_fcompxe_redist_msi_2015.2.179.zip
* https://download.microsoft.com/download/1/f/e/1febbdb2-aded-4e14-9063-39fb17e88444/vc_redist.x86.exe
* https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe
* ww_ifort_redist_ia32_2017.4.210.msi from inside:
https://software.intel.com/sites/default/files/managed/f1/c0/ww_ifort_redist_msi_2017.4.210.zip

Troubleshooting
---------------
Expand Down
14 changes: 7 additions & 7 deletions dynareOBC.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,16 @@ function dynareOBC( InputFileName, varargin )
%
% If you are using a 64-bit version of MATLAB, please ask for the following to be installed:
%
% * https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81CC-ED5963AEAD48/vc_redist.x64.exe
% * ww_ifort_redist_intel64_2016.3.207.msi from inside:
% https://software.intel.com/sites/default/files/managed/34/d8/ww_ifort_redist_msi_2016.3.207.zip
% * https://download.microsoft.com/download/3/b/f/3bf6e759-c555-4595-8973-86b7b4312927/vc_redist.x64.exe
% * ww_ifort_redist_intel64_2017.4.210.msi from inside:
% https://software.intel.com/sites/default/files/managed/f1/c0/ww_ifort_redist_msi_2017.4.210.zip
%
% If you are using a 32-bit version of MATLAB, please ask for the following to be installed:
%
% * http://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe
% * https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81CC-ED5963AEAD48/vc_redist.x86.exe
% * w_fcompxe_redist_ia32_2015.2.179.msi from inside:
% https://software.intel.com/sites/default/files/managed/6a/21/w_fcompxe_redist_msi_2015.2.179.zip
% * https://download.microsoft.com/download/1/f/e/1febbdb2-aded-4e14-9063-39fb17e88444/vc_redist.x86.exe
% * https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe
% * ww_ifort_redist_ia32_2017.4.210.msi from inside:
% https://software.intel.com/sites/default/files/managed/f1/c0/ww_ifort_redist_msi_2017.4.210.zip
%
% Troubleshooting
% ---------------
Expand Down

0 comments on commit c6b077f

Please sign in to comment.