Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[Example] Fix the cpp example complier flag #13293

Merged
merged 20 commits into from
Nov 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a9d40c4
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Sep 18, 2018
429684a
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Sep 19, 2018
602b7d0
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Sep 20, 2018
85f9408
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Sep 27, 2018
5a01234
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Sep 28, 2018
8f58746
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Sep 28, 2018
1531594
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Oct 2, 2018
3e799de
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Oct 8, 2018
f690c69
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Oct 8, 2018
a091a97
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Oct 9, 2018
f1359be
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Oct 11, 2018
e360853
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Oct 11, 2018
23199d1
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Oct 12, 2018
166c2b6
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Oct 16, 2018
d01e8cb
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Oct 24, 2018
0454017
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Oct 26, 2018
90f1dd8
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Nov 1, 2018
2f019cd
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Nov 6, 2018
ec075f5
Merge branch 'master' of https://github.com/apache/incubator-mxnet
stu1130 Nov 13, 2018
f6f4c1a
fix the flag
stu1130 Nov 15, 2018
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
2 changes: 1 addition & 1 deletion cpp-package/example/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ debug: prebuild all


$(CPPEX_EXE):% : %.cpp
$(CXX) -std=c++0x $(CFLAGS) $(CPPEX_CFLAGS) -o build/$@ $(filter %.cpp %.a, $^) $(CPPEX_EXTRA_LDFLAGS)
$(CXX) -std=c++11 $(CFLAGS) $(CPPEX_CFLAGS) -o build/$@ $(filter %.cpp %.a, $^) $(CPPEX_EXTRA_LDFLAGS)

clean:
@rm -rf build
4 changes: 2 additions & 2 deletions cpp-package/example/example.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ cpp-package-example-all: cpp-package-all $(CPPEX_EXE)

build/cpp-package/example/% : cpp-package/example/%.cpp lib/libmxnet.so $(CPP_PACKAGE_OP_H_FILE)
@mkdir -p $(@D)
$(CXX) -std=c++0x $(CFLAGS) $(CPPEX_CFLAGS) -MM -MT cpp-package/example/$* $< >build/cpp-package/example//$*.d
$(CXX) -std=c++0x $(CFLAGS) $(CPPEX_CFLAGS) -o $@ $(filter %.cpp %.a, $^) $(LDFLAGS) $(CPPEX_EXTRA_LDFLAGS)
$(CXX) -std=c++11 $(CFLAGS) $(CPPEX_CFLAGS) -MM -MT cpp-package/example/$* $< >build/cpp-package/example//$*.d
$(CXX) -std=c++11 $(CFLAGS) $(CPPEX_CFLAGS) -o $@ $(filter %.cpp %.a, $^) $(LDFLAGS) $(CPPEX_EXTRA_LDFLAGS)

cpp-package-example-clean:
rm -rf build/cpp-package/example/*
Expand Down
4 changes: 2 additions & 2 deletions cpp-package/example/feature_extract/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ LDFLAGS=$(COMMFLAGS) -L ../../../lib -lmxnet $(BLAS) $(CUDA) -lgomp -pthread
all: feature_extract prepare_data_with_opencv

feature_extract: ./feature_extract.cpp
$(CXX) -c -std=c++0x $(CFLAGS) $^
$(CXX) -c -std=c++11 $(CFLAGS) $^
$(CXX) $(basename $@).o -o $@ $(LDFLAGS)
-rm -f $(basename $@).o

prepare_data_with_opencv: ./prepare_data_with_opencv.cpp
$(CXX) -c -std=c++0x $(OPENCV_CFLAGS) $^
$(CXX) -c -std=c++11 $(OPENCV_CFLAGS) $^
$(CXX) $(basename $@).o -o $@ $(OPENCV_LDFLAGS)
-rm -f $(basename $@).o

Expand Down