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

Next: 0.999 #429

Merged
merged 429 commits into from
May 20, 2014
Merged
Changes from 1 commit
Commits
Show all changes
429 commits
Select commit Hold shift + click to select a range
38e3d7f
Added matcaffe_init to easy reuse of caffe initialization
sguada Mar 31, 2014
5e79c95
Added default values to matcaffe_batch for testing
sguada Mar 31, 2014
503634d
Removed empty space, verified lint
sguada Mar 31, 2014
eeaa38f
Log error string rather than enum value in CUDA_CHECK
kloudkl Mar 31, 2014
a186dc4
Define CUDA_POST_KERNEL_CHECK with CUDA_CHECK
kloudkl Mar 31, 2014
aa4139b
Add caffe::cublasGetErrorString and redefine CUBLAS_CHECK with it
kloudkl Mar 31, 2014
14fe30c
Add curandGetErrorString and use it to redefine CURAND_CHECK
kloudkl Mar 31, 2014
d216322
Fix cpplint errors
kloudkl Mar 31, 2014
56ed1f8
Add a space before the error string
kloudkl Apr 1, 2014
1e571c3
seed boost rng with cluster_seedgen by default
jeffdonahue Apr 1, 2014
4b9e975
Merge pull request #283 from jeffdonahue/boost-rand-seed
shelhamer Apr 2, 2014
531ac6a
Merge pull request #278 from kloudkl/log_error_string_in_check_macro
jeffdonahue Apr 2, 2014
9b09f59
Merge pull request #223 from sguada/improved_matcaffe
jeffdonahue Apr 2, 2014
654d811
put TEST_GPUID in Makefile.config
jeffdonahue Mar 30, 2014
3abb10e
create superclean Makefile target to delete all files with generated
jeffdonahue Mar 30, 2014
a750a31
create softlink to test directory at build/test
jeffdonahue Mar 30, 2014
e29838d
put proto-generated .cc and .h files in build directory
jeffdonahue Mar 30, 2014
5d9040a
cleanup superclean output
jeffdonahue Mar 30, 2014
060c5f1
messed around with Makefile - currently in very messy state
jeffdonahue Mar 30, 2014
fd09cb3
lots of corrections to dependencies etc., things seem to mostly build
jeffdonahue Mar 30, 2014
195ba81
everything prints a blank line after compiling
jeffdonahue Mar 30, 2014
9f14265
libcaffe.* in build/lib/
jeffdonahue Mar 30, 2014
a034d62
minor cleanup
jeffdonahue Mar 30, 2014
209b4c8
add test header dependency and fix mat targets
jeffdonahue Mar 30, 2014
db26e5a
compile test bins directly into build/test
jeffdonahue Mar 30, 2014
39ca2de
cleanup python build and clean
jeffdonahue Mar 30, 2014
48994cf
fix test bugs and minor cleanup
jeffdonahue Mar 30, 2014
abf44a6
matcaffe fixes
jeffdonahue Mar 31, 2014
74a3788
remove silly thing where I copied proto headers to a separate
jeffdonahue Mar 31, 2014
6b3d257
include build/ before other dirs so old proto built files in src/ and
jeffdonahue Apr 2, 2014
8850703
Fix segfault.
Apr 3, 2014
13432eb
Fix parameter orders in declaration of Reshape
beam2d Apr 3, 2014
2bef46e
Merge pull request #288 from beam2d/fix-blob-params-order
jeffdonahue Apr 3, 2014
1b13ee2
Merge pull request #287 from robwhess/dev
shelhamer Apr 4, 2014
76caca3
gitignore python/caffe/proto/; superclean ignore data dir
jeffdonahue Apr 4, 2014
a9516a4
Merge pull request #277 from jeffdonahue/makefile-improvements
shelhamer Apr 4, 2014
2c0c5b0
Revert "Fix segfault." (python)
shelhamer Apr 5, 2014
9188c6b
add string constructor to Solver (analogous to Net)
longjon Apr 2, 2014
7823d66
pycaffe: expose SGDSolver
longjon Apr 2, 2014
f43ac55
make Solver::net return a shared_ptr rather than a raw pointer
longjon Apr 2, 2014
a8a0191
switch from inheritance to directly overriding methods for caffe.Net
longjon Apr 4, 2014
2915f4b
pycaffe: expose SGDSolver.net
longjon Apr 2, 2014
8d44507
pycaffe: introduce CheckFile helper
longjon Apr 2, 2014
584abd3
pycaffe: expose SGDSolver.solve
longjon Apr 2, 2014
58fe797
make height/width of input dims in conv layer tests more different to
jeffdonahue Apr 7, 2014
c5dd18f
separate CPU from GPU ConvolutionLayerTests
jeffdonahue Apr 7, 2014
1fa5ae2
fix im2col height/width bound check bug (issue #284 identified by
jeffdonahue Apr 7, 2014
b57d8ad
Doubled protobuf Bytes Limit
sguada Apr 8, 2014
b885078
Merge pull request #302 from sguada/protobuf_limit
shelhamer Apr 8, 2014
9f638cb
Merge pull request #298 from jeffdonahue/im2col-nonsquare-bug
shelhamer Apr 8, 2014
efacd98
Back-merge documentation and fixes
shelhamer Apr 8, 2014
e56c807
blas install docs, other install polish
shelhamer Apr 8, 2014
42c9d66
add LRN within map layer and dependencies (eltwise product and power)
jeffdonahue Mar 28, 2014
f3e2fe6
add unit tests for new layer types
jeffdonahue Mar 28, 2014
6e92f47
use average pool instead of conv
jeffdonahue Mar 28, 2014
bd756fe
add padding for average pooling
jeffdonahue Mar 29, 2014
d047bef
bug fix: average pooling already divides by N^2
jeffdonahue Mar 29, 2014
6c844cc
use split layer in LRNMapLayer
jeffdonahue Mar 29, 2014
2031663
use bvlc copyright
jeffdonahue Mar 29, 2014
42b832c
add cifar example using LRN_MAP (just like the cuda-convnet layers-18pct
jeffdonahue Mar 29, 2014
4c81ee5
fix some param bugs
jeffdonahue Mar 29, 2014
824c344
merge LRNMapLayer into LRNLayer with norm_region proto field
jeffdonahue Mar 29, 2014
24f7318
replace old cifar full with within channel LRN (per cuda-convnet
jeffdonahue Mar 29, 2014
69ac4f4
minor polishing
jeffdonahue Mar 29, 2014
d61adb8
remove unnecessary local variables from EltwiseProductLayer
jeffdonahue Mar 29, 2014
9fb7818
don't recompute pre_pad
jeffdonahue Mar 29, 2014
45f8626
cleanup extra LRN method names
jeffdonahue Mar 29, 2014
86db2a9
minor unit test cleanup
jeffdonahue Mar 29, 2014
bf511f7
cleanup power layer test suite
jeffdonahue Mar 29, 2014
404f22d
update proto field IDs from placeholder values
jeffdonahue Apr 8, 2014
58998df
Merge pull request #273 from jeffdonahue/lrn-map-layer
jeffdonahue Apr 8, 2014
8f1f3d2
trivial makefile grooming
shelhamer Apr 8, 2014
8fc0e4b
auto-configure linux/osx build differences
shelhamer Apr 8, 2014
d60eebc
Comment out MATLAB by default in Makefile.config
shelhamer Apr 8, 2014
4d4de23
Merge pull request #309 from shelhamer/comment-matlab-config
jeffdonahue Apr 8, 2014
d09f023
Merge pull request #305 from shelhamer/install-doc-blas-platform
jeffdonahue Apr 9, 2014
9068c5c
add test demonstrating weird boost RNG issue when sampling from a
jeffdonahue Apr 7, 2014
3fe018c
add analogous test for uniform instead of gaussian
jeffdonahue Apr 7, 2014
fca7eaf
cleanup log messages
jeffdonahue Apr 7, 2014
7d54229
add bernoulli*bernoulli test
jeffdonahue Apr 7, 2014
db4d3b0
call caffe_set_rng at the end of each vRng function to maintain state
jeffdonahue Apr 8, 2014
a52f654
fix bernoulli*bernoulli test, now all pass
jeffdonahue Apr 8, 2014
435cbf4
comment to explain the purpose of Caffe::set_generator
jeffdonahue Apr 8, 2014
d6776f0
cleanup test_math_functions
jeffdonahue Apr 8, 2014
95783f9
make rng_ a private member of Generator
jeffdonahue Apr 8, 2014
5491f58
cleanup RNG unit tests
jeffdonahue Apr 8, 2014
81db75c
gpu_hamming_distance fails unit test with fixed RNG; mark it NOT_IMPL…
jeffdonahue Apr 8, 2014
078e0bf
make RNG function names more similar to other caffe math function names
jeffdonahue Apr 8, 2014
d002799
make RNG function outputs the last argument per Google C++ style guid…
jeffdonahue Apr 8, 2014
acfafb2
have rng_stream initialize RNG if not already initialized
jeffdonahue Apr 8, 2014
2ebe94e
add analogous caffe_gpu_rng_* functions for gaussian and uniform, and
jeffdonahue Apr 8, 2014
61c5653
change *Plus* tests to *Times* tests because the Plus tests don't
jeffdonahue Apr 9, 2014
1f5b9a5
more rng test cleanup
jeffdonahue Apr 9, 2014
3e3980f
Merge pull request #297 from jeffdonahue/rng-bug
shelhamer Apr 9, 2014
e6ed527
change true_std to intended bernoulli_std
jeffdonahue Apr 9, 2014
0c623fc
Merge pull request #286 from longjon/pycaffe-solver
shelhamer Apr 9, 2014
938f946
include vecLib BLAS dir on osx
shelhamer Apr 9, 2014
b467ffb
fix osx 10.9 condition in Makefile
shelhamer Apr 9, 2014
2d7271b
add using std::isnan and use this-> when calling Test{For,Back}ward
jeffdonahue Apr 9, 2014
cfcd6d8
Merge pull request #310 from jeffdonahue/clang-test-power-layer-fixes
shelhamer Apr 9, 2014
dedd168
Back-merge docs and example image changes from `master` to `dev`
shelhamer Apr 10, 2014
c3545e5
polished ignore
shelhamer Apr 11, 2014
f45a946
fix lint errors by adding 'explicit' to new single arg pycaffe
jeffdonahue Apr 11, 2014
5fadbf7
change some unnecessary TYPED_TESTs to TEST_Fs
jeffdonahue Apr 12, 2014
f43300e
add unit tests for cpu/gpu copy functions
jeffdonahue Apr 11, 2014
7fb71de
add Adopt{Data,Diff} methods to blobs to enable "virtual copying"
jeffdonahue Apr 12, 2014
0d1a8ab
change Adopt -> Share as suggested by kloudkl
jeffdonahue Apr 12, 2014
c0e7218
sigmoid layer backward pass optimization: don't recompute forward pass
jeffdonahue Apr 12, 2014
2e46b3c
Merge pull request #319 from jeffdonahue/sigmoid-optimization
shelhamer Apr 13, 2014
588c8e5
Merge pull request #318 from jeffdonahue/blob-copy-by-reference
shelhamer Apr 13, 2014
8fd9f8c
Add possibility to use OpenBlas
AlOa Apr 14, 2014
a98fcb5
Merge pull request #325 from AlOa/OpenBlas
shelhamer Apr 15, 2014
426f089
rename python include config var to match lib
shelhamer Apr 15, 2014
ed38827
Give choice of ATLAS, MKL, and OpenBLAS (with option to override paths)
shelhamer Apr 15, 2014
9f1dc96
rename lenet dir to mnist
jeffdonahue Apr 15, 2014
a767caf
add mnist autoencoder example necessities (sigmoid cross entropy loss
jeffdonahue Apr 15, 2014
7b5a7e5
enable DataLayer to output unlabeled data
jeffdonahue Apr 15, 2014
24f7ec0
mnist autoencoder test proto bugfix: add sigmoid layer before loss
jeffdonahue Apr 15, 2014
22c698c
make solver able to compute and display test loss
jeffdonahue Apr 15, 2014
f4678bc
change lenet dir to 'mnist' in docs
jeffdonahue Apr 16, 2014
50cfd53
mnist_autoencoder_solver cleanup
jeffdonahue Apr 16, 2014
5babe0d
add sigmoid cross ent layer unit tests
jeffdonahue Apr 16, 2014
c50da5c
clear sigmoid top vec at initialization
jeffdonahue Apr 16, 2014
2d968ed
change to correct next layer id for merge
jeffdonahue Apr 16, 2014
2dad9ca
Merge pull request #330 from jeffdonahue/mnist-autoencoder-example
shelhamer Apr 16, 2014
c7fdb60
add ShareTrainedLayersWith method and use for test net in solver
jeffdonahue Apr 16, 2014
46f7f39
remove unnecessary return from void set_generator
jeffdonahue Apr 18, 2014
c795bec
pass caffe rng ref into variate_generator constructor instead of having
jeffdonahue Apr 18, 2014
799bda6
remove now unused set_generator and related code
jeffdonahue Apr 18, 2014
9ad2422
Merge pull request #332 from jeffdonahue/share-trained-layers
jeffdonahue Apr 18, 2014
52bc5cc
fix examples path in mnist leveldb sh
shelhamer Apr 18, 2014
f8c751f
Merge pull request #336 from jeffdonahue/fix-rng-segfault
shelhamer Apr 19, 2014
b11290a
installation doc update
sergeyk Apr 20, 2014
377ace2
Merge pull request #339 from sergeyk/dev
shelhamer Apr 20, 2014
a44fe33
Proofread install docs
shelhamer Apr 21, 2014
a183ac9
Comment current forward/backward responsibilities
shelhamer Apr 21, 2014
e684f10
fix bug where DataLayerPrefetch creates its own Caffe singleton, causing
jeffdonahue Apr 22, 2014
70a53c0
do the same as prev commit for ImageDataLayer
jeffdonahue Apr 22, 2014
aeae177
Merge pull request #348 from jeffdonahue/datalayer-singleton-bugfix
shelhamer Apr 22, 2014
29f78aa
make CheckGradientExhaustive fail for topless layers
longjon Apr 22, 2014
0175917
Merge pull request #350 from longjon/finicky-exhaustive
shelhamer Apr 22, 2014
20f8648
add forward tests (via reference impl) for SigmoidCrossEntropyLayer
jeffdonahue Apr 23, 2014
9dd3f45
add random_seed field to SolverParameter and have solver use it --
jeffdonahue Apr 17, 2014
c33d944
add data layer crop tests
jeffdonahue Apr 22, 2014
d278de2
add tests for random crop sequence -- currently both fail
jeffdonahue Apr 22, 2014
99e10ea
cleanup data_layer, add prefetch_rng_ field to it and use instead of
jeffdonahue Apr 22, 2014
a9fa57e
make seed test pass by setting up new layer to generate the 2nd sequence
jeffdonahue Apr 22, 2014
d3278b7
test scale param
jeffdonahue Apr 22, 2014
af63254
prefetch_rng in ImageDataLayer
jeffdonahue Apr 22, 2014
bab4880
prefetch_rng in window_data_layer
jeffdonahue Apr 22, 2014
84f5f36
replace remaining uses of rand() with caffe_rng_rand()
jeffdonahue Apr 22, 2014
91585cd
replace std::shuffle with version using prefetch rng; improve unit test
jeffdonahue Apr 22, 2014
16176a2
add caffe/random_fn lint rule to check for use of rand, rand_r, random
jeffdonahue Apr 23, 2014
aad98f0
test on "0th iteration" -- before doing any training
jeffdonahue Apr 24, 2014
147fa8d
Merge pull request #357 from jeffdonahue/test-on-iter-0
shelhamer Apr 24, 2014
c55ebd0
Merge pull request #352 from jeffdonahue/solver-seed
shelhamer Apr 24, 2014
65015e3
Update the drawnet.py to reflect the recent revised net definition.
niuzhiheng Apr 25, 2014
e9ce6cf
note pydot dependency of model visualization
shelhamer Apr 25, 2014
a32e930
Merge pull request #364 from niuzhiheng/dev
shelhamer Apr 25, 2014
0a68703
move analytic gradient computation outside loop and store -- saves a lot
jeffdonahue Apr 25, 2014
2c5f9dd
eltwise gradient checker
jeffdonahue Apr 25, 2014
c6f1011
Merge pull request #363 from jeffdonahue/speedup-gradient-check
shelhamer Apr 25, 2014
f5c2858
pycaffe: add unary CaffeNet constructor for uninitialized nets
longjon Apr 25, 2014
3ac5842
Merge pull request #365 from longjon/pycaffe-empty-nets
shelhamer Apr 25, 2014
dbad775
add HingeLossLayer for one-vs-all hinge loss
longjon Apr 8, 2014
a61a2ac
make gradient checker's kink use feature absolute value
longjon Apr 25, 2014
3271ce8
test HingeLossLayer
longjon Apr 25, 2014
096c7e2
set TRAIN in CommonTest.TestPhase
shelhamer Apr 26, 2014
a154ebc
Merge pull request #366 from shelhamer/test-phase-fix
jeffdonahue Apr 26, 2014
8ea837f
randomize order of test execution by make runtest
shelhamer Apr 26, 2014
5a340b0
set phase in dropout tests
shelhamer Apr 26, 2014
e0e4925
scope data layer sequence tests to avoid leveldb contention
shelhamer Apr 26, 2014
d3dd168
Merge pull request #368 from shelhamer/fix-data-layer-sequence-tests
jeffdonahue Apr 26, 2014
4a31964
Merge pull request #303 from longjon/hinge-loss-layer
jeffdonahue Apr 26, 2014
0b885b9
add device id arg to test_net (fix #232)
shelhamer Apr 26, 2014
4df0de2
proofreading and trivial polish
shelhamer Apr 26, 2014
72b11e7
Merge pull request #367 from shelhamer/randomize-test-order
jeffdonahue Apr 26, 2014
c6dcb79
set seed in neuron and power layer tests for deterministic results
jeffdonahue Apr 26, 2014
8e2a51b
default test net device to 0 and log device chosen
shelhamer Apr 26, 2014
04273e7
fix test_net to upgrade params from v0 if needed
shelhamer Apr 26, 2014
391ac4f
Merge pull request #370 from shelhamer/test-net-polish
jeffdonahue Apr 26, 2014
8368818
Handling CUBLAS_STATUS_NOT_SUPPORTED to suppress warning
sergeyk Apr 29, 2014
ad530e4
Add Sublime Text project settings to gitignore
sergeyk Apr 29, 2014
46e2036
rollback 8368818, does not build
jeffdonahue Apr 29, 2014
705efdf
Keep uniform test messages for all the test
sguada Apr 30, 2014
b258956
Merge pull request #377 from sguada/fix_initial_test
shelhamer Apr 30, 2014
b2b1e99
note the last added layer/params in caffe.proto to prevent conflicts
longjon Apr 30, 2014
b654d9d
Merge pull request #378 from longjon/no-merge-duplicates
jeffdonahue Apr 30, 2014
c8e6e94
add set_cpu_data to Blob and SyncedMemory
longjon Apr 4, 2014
298a27c
add MemoryDataLayer for reading input from contiguous blocks of memory
longjon Apr 4, 2014
f87fe62
add size accessors to MemoryDataLayer
longjon Apr 4, 2014
ce30b67
add basic tests for MemoryDataLayer
longjon Apr 17, 2014
634a382
pycaffe: let boost pass shared_ptr<CaffeNet>
longjon Apr 25, 2014
e1072a6
pycaffe: store a shared_ptr<CaffeNet> in SGDSolver
longjon Apr 25, 2014
76c2554
pycaffe: add Net.set_input_arrays for input from numpy
longjon Apr 25, 2014
d2fac2d
pycaffe: allow 1d labels to be passed to set_input_arrays
longjon Apr 17, 2014
e841d32
fix lint error in syncedmem.hpp
longjon Apr 25, 2014
c4146fe
Merge pull request #294 from longjon/memory-data-layer
shelhamer May 2, 2014
451d7e8
note bug in cifar10 full with CPU computation
jeffdonahue May 6, 2014
9d371cc
improve includes in util/math_function.hpp
longjon May 6, 2014
1554349
Merge pull request #396 from longjon/math-includes
jeffdonahue May 7, 2014
e10fb59
make solver_mode an enum with CPU and GPU -- fully backwards compatible
jeffdonahue May 9, 2014
6fcf5ed
Merge pull request #403 from jeffdonahue/solver-mode-enum
shelhamer May 9, 2014
f66f25d
fix Makefile bug - HXX_SRCS was things that don't end in .hpp, instead
jeffdonahue May 11, 2014
76dfaaf
Merge pull request #406 from jeffdonahue/makefile-include-bug
jeffdonahue May 11, 2014
2f1f2b0
add cublas status in cuda 6 to fix warning
shelhamer May 13, 2014
e95cb27
Merge pull request #413 from shelhamer/cublas-status-not-supported
shelhamer May 13, 2014
de3d622
net knows output blobs
shelhamer May 14, 2014
7b3e6f2
Merge pull request #414 from shelhamer/net-output-blobs
shelhamer May 14, 2014
51f276e
match existing python formatting
shelhamer Apr 9, 2014
47ec9ac
make python wrapper mean match binaryproto dimensions
shelhamer Apr 10, 2014
8da2a32
add python io getters, mean helper, and image caffeinator/decaffeinator
shelhamer Apr 10, 2014
872ddf3
pycaffe comments, lint
shelhamer Apr 10, 2014
f436cb2
Write/create/truncate prototxt when saving to fix #341
shelhamer May 14, 2014
a894796
fix workaround in net prototxt upgrade
shelhamer May 14, 2014
91c59d7
Merge pull request #417 from shelhamer/create-and-write-proto
jeffdonahue May 14, 2014
56ca978
expose input and output blob names to python as lists
shelhamer May 14, 2014
96cd02d
set input preprocessing per blob in python
shelhamer May 14, 2014
0e5a5cf
pycaffe Net.forward() helper
shelhamer May 14, 2014
9d4324e
bad forward/backward inputs throw exceptions instead of crashing python
shelhamer May 14, 2014
ac5e6fa
python Net.backward() helper and Net.BackwardPrefilled()
shelhamer May 14, 2014
af0b857
python forward() and backward() extract any blobs and diffs
shelhamer May 15, 2014
8af33e8
don't squeeze blob arrays for python
shelhamer May 15, 2014
1b23680
batch inputs in python by forward_all() and forward_backward_all()
shelhamer May 15, 2014
a3b307a
fix accidental revert of Init() from f5c28581
shelhamer May 15, 2014
a7f6750
python style
shelhamer May 15, 2014
459c8c1
replace iterator with indices for consistency
shelhamer May 15, 2014
025c64e
resize to input dimensions when formatting in python
shelhamer May 15, 2014
2779ce9
layer definition reorganization and documentation
sergeyk Apr 29, 2014
48a8a64
Split all loss layers into own .cpp files
sergeyk Apr 29, 2014
4051cef
Cosmetic change in prep for data layer work
sergeyk Apr 29, 2014
5d584c2
take blob args as ndarrays and assign on the python side
shelhamer May 16, 2014
5102413
Net.caffeinate() and Net.decaffeinate() format/unformat lists
shelhamer May 16, 2014
37123a5
drop cute names in favor of Net.{pre,de}process() for input formatting
shelhamer May 16, 2014
d01c6ed
fwd/back math docs for neuron layers
sergeyk Apr 29, 2014
efeaf17
Lil’ more docstring, and cosmetic change in EuclideanLossLayer
sergeyk May 19, 2014
1b735b5
Cosmetic change in ConcatLayer
sergeyk May 19, 2014
c5db25b
Incorporated Evan’s comments for neuron layers
sergeyk May 19, 2014
8534541
Merge pull request #376 from sergeyk/layer_reorg
sergeyk May 19, 2014
738c875
fix python mean subtraction
shelhamer May 19, 2014
50d0b6d
add caffe.io submodule for conversions, image loading and resizing
shelhamer May 19, 2014
6b85fd0
split drawnet into module code and script
shelhamer May 19, 2014
bf4d726
fix padding for the last batch
shelhamer May 19, 2014
2fc32d5
image classification in python
shelhamer May 19, 2014
111df0e
squash infuriating loop assignment bug in batching
shelhamer May 20, 2014
02ecf1d
windowed detection in python
shelhamer May 20, 2014
8830dc5
preprocess single inputs instead of lists
shelhamer May 20, 2014
42bf2d2
update notebook examples with new wrapper usage, re-organize
shelhamer May 20, 2014
f048bea
Merge pull request #311 from shelhamer/python-fixes
shelhamer May 20, 2014
c6b00a3
Back-merge changes in master
shelhamer May 20, 2014
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
Prev Previous commit
Next Next commit
create softlink to test directory at build/test
jeffdonahue committed Apr 2, 2014
commit a750a31c5eef6d6e31b9607156036e735478a7e0
31 changes: 23 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -75,7 +75,11 @@ GTEST_OBJ := $(addprefix $(BUILD_DIR)/, ${GTEST_SRC:.cpp=.o})
TOOL_BINS := ${TOOL_OBJS:.o=.bin}
EXAMPLE_BINS := ${EXAMPLE_OBJS:.o=.bin}
TEST_BINS := ${TEST_OBJS:.o=.testbin}
TEST_ALL_BIN := $(BUILD_DIR)/src/$(PROJECT)/test/test_all.testbin
TEST_BUILD_SUB_DIR := src/$(PROJECT)/test
TEST_DIR = $(BUILD_DIR)/$(TEST_BUILD_SUB_DIR)
TEST_ALL_BIN := $(TEST_DIR)/test_all.testbin
# A shortcut to the directory of test binaries for convenience.
TEST_DIR_LINK := $(BUILD_DIR)/test

##############################
# Derive include and lib directories
@@ -123,9 +127,10 @@ PYTHON_LDFLAGS := $(LDFLAGS) $(foreach library,$(PYTHON_LIBRARIES),-l$(library))
##############################
# Define build targets
##############################
.PHONY: all init test clean linecount lint tools examples py mat distribute \
py$(PROJECT) mat$(PROJECT) proto runtest \
superclean supercleanlist supercleanfiles
.PHONY: all init test clean linecount lint tools examples distribute \
py mat py$(PROJECT) mat$(PROJECT) proto runtest \
superclean supercleanlist supercleanfiles \
testshortcut

all: init $(NAME) $(STATIC_NAME) tools examples
@echo $(CXX_OBJS)
@@ -184,11 +189,21 @@ $(STATIC_NAME): init $(PROTO_OBJS) $(OBJS)
runtest: $(TEST_ALL_BIN)
$(TEST_ALL_BIN) $(TEST_GPUID)

$(TEST_BINS): %.testbin : %.o $(GTEST_OBJ) $(STATIC_NAME) $(TEST_HDRS)
$(CXX) $(TEST_MAIN_SRC) $< $(GTEST_OBJ) $(STATIC_NAME) -o $@ $(CXXFLAGS) $(LDFLAGS) $(WARNINGS)
$(TEST_BINS): %.testbin : %.o $(GTEST_OBJ) $(STATIC_NAME) $(TEST_HDRS) testshortcut
$(CXX) $(TEST_MAIN_SRC) $< $(GTEST_OBJ) $(STATIC_NAME) \
-o $@ $(CXXFLAGS) $(LDFLAGS) $(WARNINGS)

$(TEST_ALL_BIN): $(GTEST_OBJ) $(STATIC_NAME) $(TEST_OBJS)
$(CXX) $(TEST_MAIN_SRC) $(TEST_OBJS) $(GTEST_OBJ) $(STATIC_NAME) -o $(TEST_ALL_BIN) $(CXXFLAGS) $(LDFLAGS) $(WARNINGS)
$(TEST_ALL_BIN): $(GTEST_OBJ) $(STATIC_NAME) $(TEST_OBJS) testshortcut
$(CXX) $(TEST_MAIN_SRC) $(TEST_OBJS) $(GTEST_OBJ) $(STATIC_NAME) \
-o $(TEST_ALL_BIN) $(CXXFLAGS) $(LDFLAGS) $(WARNINGS)

testshortcut: $(TEST_DIR_LINK)

$(TEST_DIR_LINK): $(TEST_DIR)
@ln -s $(TEST_BUILD_SUB_DIR) $(TEST_DIR_LINK)

$(TEST_DIR):
@mkdir -p $(TEST_DIR)

$(TOOL_BINS): %.bin : %.o $(STATIC_NAME)
$(CXX) $< $(STATIC_NAME) -o $@ $(CXXFLAGS) $(LDFLAGS) $(WARNINGS)