Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Matlab 2017 #16

Merged
merged 4 commits into from
Nov 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Algorithms/ORBoost.m
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,12 @@
model_information.testTime = etime(c2,c1);

fid = fopen(modelFile);
s = textscan(fid,'%s','Delimiter','\n','bufsize', 2^18-1);
if verLessThan('matlab','8.4')
s = textscan(fid,'%s','Delimiter','\n','bufsize', 2^18-1);
else
s = textscan(fid,'%s','Delimiter','\n');
end

s = s{1};
fclose(fid);

Expand Down
2 changes: 1 addition & 1 deletion src/Algorithms/SVOREX/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CXX ?= g++

CFLAGS = -Wall -Wconversion -O3 -fPIC -I$(MATLABDIR)/extern/include -I..
MEX = $(MATLABDIR)/bin/mex
MEX_OPTION = CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
MEX_OPTION = CC="$(CXX)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)"
# comment the following line if you use MATLAB on 32-bit computer
MEX_OPTION += -largeArrayDims
MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)
Expand Down
2 changes: 1 addition & 1 deletion src/Algorithms/SVORIM/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ CXX ?= g++

CFLAGS = -Wall -Wconversion -O3 -fPIC -I$(MATLABDIR)/extern/include -I..
MEX = $(MATLABDIR)/bin/mex
MEX_OPTION = CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
MEX_OPTION = CC="$(CXX)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)"
# comment the following line if you use MATLAB on 32-bit computer
MEX_OPTION += -largeArrayDims
MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)
Expand Down
2 changes: 1 addition & 1 deletion src/Algorithms/libsvm-rank-2.81/matlab/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ CXX = g++
CFLAGS = -Wall -Wconversion -O3 -fPIC -I$(MATLABDIR)/extern/include -I..

MEX = $(MATLABDIR)/bin/mex
MEX_OPTION = CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
MEX_OPTION = CC="$(CXX)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)"
# comment the following line if you use MATLAB on 32-bit computer
MEX_OPTION += -largeArrayDims
MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)
Expand Down
2 changes: 1 addition & 1 deletion src/Algorithms/libsvm-weights-3.12/matlab/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CXX ?= g++
CFLAGS = -Wall -Wconversion -O3 -fPIC -I$(MATLABDIR)/extern/include -I..

MEX = $(MATLABDIR)/bin/mex
MEX_OPTION = CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
MEX_OPTION = CC="$(CXX)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)"
# comment the following line if you use MATLAB on 32-bit computer
MEX_OPTION += -largeArrayDims
MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)
Expand Down
7 changes: 3 additions & 4 deletions src/Algorithms/orensemble/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

all: orensemble
make -C orensemble
all: untar
make -e -C orensemble
mv orensemble/boostrank-predict .
mv orensemble/boostrank-train .

orensemble:
untar:
tar xzf orensemble.tar.gz

clean:
Expand Down
Binary file modified src/Algorithms/orensemble/orensemble.tar.gz
Binary file not shown.
50 changes: 0 additions & 50 deletions src/Algorithms/orensemble/orensemble/Makefile

This file was deleted.

24 changes: 0 additions & 24 deletions src/Algorithms/orensemble/orensemble/README

This file was deleted.

Loading