Skip to content

Commit

Permalink
[BUG][OCTAVE] Fix bug caused by a recent added dependecy of optim on …
Browse files Browse the repository at this point in the history
…the statistics toolbox (#257)

* [TRAVIS][BUG] Increase version of optim and dependency

* Change order of octave package installation

* Revert previous two commits – add bootstrapTest call at the start of the octave execution for the last stage

* Reorder octave package statistics before optim loading (starting with optim 1.5.3, it requires that statistics>=1.4.0 is loaded beforehand). Doing it now so that this doesn't bug up in the future (hopefully)

* Reorder io octave package installation order

* Reorder octaves io package installation order
  • Loading branch information
mathieuboudreau committed Aug 9, 2018
1 parent 0dd8429 commit 5799e73
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ before_install:
#- travis_retry wget -O /home/travis/octave/OctavePackages.zip https://osf.io/t465n/download
#- unzip /home/travis/octave/OctavePackages.zip
- travis_retry wget http://sourceforge.net/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/struct-1.0.14.tar.gz -P /home/travis/octave
- travis_retry wget http://sourceforge.net/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/statistics-1.3.0.tar.gz -P /home/travis/octave
- travis_retry wget http://sourceforge.net/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/optim-1.5.2.tar.gz -P /home/travis/octave
- travis_retry wget https://sourceforge.net/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/io-2.4.10.tar.gz -P /home/travis/octave
- travis_retry wget http://sourceforge.net/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/statistics-1.3.0.tar.gz -P /home/travis/octave
- travis_retry wget http://sourceforge.net/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/image-2.6.1.tar.gz -P /home/travis/octave
# --------------
- make -C External/MOcov install
Expand Down Expand Up @@ -71,4 +71,4 @@ jobs:
- stage: Test (no coverage)
script: travis_wait 30 octave --no-gui --eval "bootstrapTest;cd('/home/travis/build/neuropoly/qMRLab/Test/MoxUnitCompatible');res=moxunit_runtests('SimTest_qmt_bssfp.m');exit(~res);"
- stage: Send combined coveralls.io report
script: aws s3 cp s3://qmrlab/$TRAVIS_BUILD_NUMBER/ /home/travis/build/neuropoly/qMRLab/Test/MoxUnitCompatible/ --recursive --include "*.json";octave --no-gui --eval "cd('/home/travis/build/neuropoly/qMRLab/');startup;mocov_combine('/home/travis/build/neuropoly/qMRLab/Test/MoxUnitCompatible/','coverage_combined.json')";aws s3 cp /home/travis/build/neuropoly/qMRLab/Test/MoxUnitCompatible/coverage_combined.json s3://qmrlab/$TRAVIS_BUILD_NUMBER/coverage_combined.json;curl --verbose -F json_file=@/home/travis/build/neuropoly/qMRLab/Test/MoxUnitCompatible/coverage_combined.json https://coveralls.io/api/v1/jobs
script: aws s3 cp s3://qmrlab/$TRAVIS_BUILD_NUMBER/ /home/travis/build/neuropoly/qMRLab/Test/MoxUnitCompatible/ --recursive --include "*.json";octave --no-gui --eval "bootstrapTest;cd('/home/travis/build/neuropoly/qMRLab/');startup;mocov_combine('/home/travis/build/neuropoly/qMRLab/Test/MoxUnitCompatible/','coverage_combined.json')";aws s3 cp /home/travis/build/neuropoly/qMRLab/Test/MoxUnitCompatible/coverage_combined.json s3://qmrlab/$TRAVIS_BUILD_NUMBER/coverage_combined.json;curl --verbose -F json_file=@/home/travis/build/neuropoly/qMRLab/Test/MoxUnitCompatible/coverage_combined.json https://coveralls.io/api/v1/jobs
6 changes: 3 additions & 3 deletions bootstrapTest.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
if moxunit_util_platform_is_octave
if ~cacheState
more off;
installist = {'struct-1.0.14.tar.gz','optim-1.5.2.tar.gz','io-2.4.10.tar.gz','statistics-1.3.0.tar.gz','image-2.6.1.tar.gz'};
loadlist = {'struct','optim','io','statistics','image'};
installist = {'struct-1.0.14.tar.gz','io-2.4.10.tar.gz','statistics-1.3.0.tar.gz','optim-1.5.2.tar.gz','image-2.6.1.tar.gz'};
loadlist = {'struct','io','statistics','optim','image'};
cd('/home/travis/octave');
for ii=1:length(installist)
pkg prefix '/home/travis/octave'
Expand Down Expand Up @@ -93,4 +93,4 @@
cd(cur)
error('Cannot compile External/Faddeeva_MATLAB, a function used by NODDI. Plz install a compiler and run Faddeeva_build. Alternatively, edit NODDI_erfi.')
end
end
end
4 changes: 2 additions & 2 deletions startup.m
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

else % OCTAVE
% install octave package
installlist = {'struct','optim','io','statistics','image'};
installlist = {'struct','io','statistics','optim','image'};
for ii=1:length(installlist)
try
disp(['loading ' installlist{ii}])
Expand Down Expand Up @@ -55,4 +55,4 @@
warning('NODDI IS SLOW: Cannot compile External/Faddeeva_MATLAB.m, a fast function used by NODDI (in NODDI_erfi.m). Plz install a compiler (https://fr.mathworks.com/support/compilers.html) and run startup.m again.')
end
end
end
end

0 comments on commit 5799e73

Please sign in to comment.