blob: 2be1ffed4fb23fe09c5704e2ed0ef6609093fd5a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- Makefile.orig 2017-02-21 04:06:19 UTC
+++ Makefile
@@ -316,10 +316,10 @@ endif
# Debugging
ifeq ($(DEBUG), 1)
- COMMON_FLAGS += -DDEBUG -g -O0
+ COMMON_FLAGS += -DDEBUG -g
NVCCFLAGS += -G
else
- COMMON_FLAGS += -DNDEBUG -O2
+ COMMON_FLAGS += -DNDEBUG
endif
# cuDNN acceleration configuration.
@@ -681,19 +681,18 @@ $(DIST_ALIASES): $(DISTRIBUTE_DIR)
$(DISTRIBUTE_DIR): all py | $(DISTRIBUTE_SUBDIRS)
# add proto
- cp -r src/caffe/proto $(DISTRIBUTE_DIR)/
+ cp -r src/caffe/proto %%STAGEDIR%%%%DATADIR%%/
# add include
cp -r include $(DISTRIBUTE_DIR)/
mkdir -p $(DISTRIBUTE_DIR)/include/caffe/proto
cp $(PROTO_GEN_HEADER_SRCS) $(DISTRIBUTE_DIR)/include/caffe/proto
# add tool and example binaries
- cp $(TOOL_BINS) $(DISTRIBUTE_DIR)/bin
- cp $(EXAMPLE_BINS) $(DISTRIBUTE_DIR)/bin
+ for f in $(TOOL_BINS) $(EXAMPLE_BINS); do cp -v "$$f" "$(DISTRIBUTE_DIR)/bin/`basename -s.bin $$f`"; done
# add libraries
cp $(STATIC_NAME) $(DISTRIBUTE_DIR)/lib
install -m 644 $(DYNAMIC_NAME) $(DISTRIBUTE_DIR)/lib
cd $(DISTRIBUTE_DIR)/lib; rm -f $(DYNAMIC_NAME_SHORT); ln -s $(DYNAMIC_VERSIONED_NAME_SHORT) $(DYNAMIC_NAME_SHORT)
# add python - it's not the standard way, indeed...
- cp -r python $(DISTRIBUTE_DIR)/python
+ cp -r python/caffe %%STAGEDIR%%%%PYTHON_SITELIBDIR%%/
-include $(DEPS)
|
