diff --git a/compile_SINGE.sh b/compile_SINGE.sh index 6458f1a..e9f61c8 100755 --- a/compile_SINGE.sh +++ b/compile_SINGE.sh @@ -4,6 +4,10 @@ # Store the md5sum of the source MATLAB files and binaries # If a directory is provided as an argument, copy the binaries and md5sum file there +# Test the updated compiled glmnetMex.mexa64 +mv glmnet_matlab/glmnetMex.mexa64 glmnet_matlab/glmnetMex.mexa64.bak +cp glmnet_matlab_64/glmnetMex.mexa64 glmnet_matlab/glmnetMex.mexa64 + # Compile SINGE creating the binaries SINGE_Test.m, SINGE_GLG_Test.m, and SINGE_Aggregate.m # SINGE_Test.m is compiled so that it can be tested to ensure the MATLAB version of SINGE works mcc -N -m -R -singleCompThread -R -nodisplay -R -nojvm -a ./glmnet_matlab/ -a ./code/ tests/SINGE_Test.m @@ -17,6 +21,9 @@ mv readme.txt readme_SINGE_GLG_Test.txt mcc -N -m -R -singleCompThread -R -nodisplay -R -nojvm -a ./code/ SINGE_Aggregate.m mv readme.txt readme_SINGE_Aggregate.txt +# Restore glmnetMex.mexa64 +mv glmnet_matlab/glmnetMex.mexa64.bak glmnet_matlab/glmnetMex.mexa64 + # Store the md5sums of all .m files tracked in the git repository and the binaries # See https://stackoverflow.com/questions/15606955/how-can-i-make-git-show-a-list-of-the-files-that-are-being-tracked/15606998 # and https://stackoverflow.com/questions/13335837/how-to-grep-for-a-file-extension diff --git a/docker/Dockerfile b/docker/Dockerfile index 927d191..2498f5c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -36,20 +36,20 @@ ENV SINGE_RUNNING_IN_DOCKER 1 # Download the compiled SINGE executables from the stable release # md5sum of v0.4.1 SINGE_GLG_Test is c50ec7bc13e287eca340c9d19d8bc27d/ -RUN tag=v0.4.1 && \ - wget --quiet https://github.com/gitter-lab/SINGE/releases/download/$tag/SINGE_Test && \ - wget --quiet https://github.com/gitter-lab/SINGE/releases/download/$tag/SINGE_GLG_Test && \ - wget --quiet https://github.com/gitter-lab/SINGE/releases/download/$tag/SINGE_Aggregate && \ - wget --quiet https://github.com/gitter-lab/SINGE/releases/download/$tag/code.md5 && \ - chmod u+x SINGE_* && \ - mv SINGE_Test tests/SINGE_Test +#RUN tag=v0.4.1 && \ +# wget --quiet https://github.com/gitter-lab/SINGE/releases/download/$tag/SINGE_Test && \ +# wget --quiet https://github.com/gitter-lab/SINGE/releases/download/$tag/SINGE_GLG_Test && \ +# wget --quiet https://github.com/gitter-lab/SINGE/releases/download/$tag/SINGE_Aggregate && \ +# wget --quiet https://github.com/gitter-lab/SINGE/releases/download/$tag/code.md5 && \ +# chmod u+x SINGE_* && \ +# mv SINGE_Test tests/SINGE_Test # Download an intermediate version of the compiled SINGE executables for testing # Download the md5sums of the source .m files and binaries -#RUN md5=c50ec7bc13e287eca340c9d19d8bc27d && \ -# wget --quiet https://www.biostat.wisc.edu/~gitter/tmp/$md5/SINGE_Test && \ -# wget --quiet https://www.biostat.wisc.edu/~gitter/tmp/$md5/SINGE_GLG_Test && \ -# wget --quiet https://www.biostat.wisc.edu/~gitter/tmp/$md5/SINGE_Aggregate && \ -# wget --quiet https://www.biostat.wisc.edu/~gitter/tmp/$md5/code.md5 && \ -# chmod u+x SINGE_* && \ -# mv SINGE_Test tests/SINGE_Test +RUN md5=3df4816680fcb1fd3f4e8528a327a103 && \ + wget --quiet --no-check-certificate https://www.biostat.wisc.edu/~gitter/tmp/$md5/SINGE_Test && \ + wget --quiet --no-check-certificate https://www.biostat.wisc.edu/~gitter/tmp/$md5/SINGE_GLG_Test && \ + wget --quiet --no-check-certificate https://www.biostat.wisc.edu/~gitter/tmp/$md5/SINGE_Aggregate && \ + wget --quiet --no-check-certificate https://www.biostat.wisc.edu/~gitter/tmp/$md5/code.md5 && \ + chmod u+x SINGE_* && \ + mv SINGE_Test tests/SINGE_Test diff --git a/glmnet_matlab_64/glmnetMex.mexa64 b/glmnet_matlab_64/glmnetMex.mexa64 new file mode 100644 index 0000000..a760d5f Binary files /dev/null and b/glmnet_matlab_64/glmnetMex.mexa64 differ