Jeff Donahue
209b4c82ee
add test header dependency and fix mat targets
2014-04-02 10:58:49 -07:00
Jeff Donahue
a034d62958
minor cleanup
2014-04-02 10:58:49 -07:00
Jeff Donahue
9f14265cfd
libcaffe.* in build/lib/
2014-04-02 10:58:49 -07:00
Jeff Donahue
195ba81b88
everything prints a blank line after compiling
2014-04-02 10:58:49 -07:00
Jeff Donahue
fd09cb3641
lots of corrections to dependencies etc., things seem to mostly build
...
coherently now
2014-04-02 10:58:49 -07:00
Jeff Donahue
060c5f1ad6
messed around with Makefile - currently in very messy state
2014-04-02 10:58:49 -07:00
Jeff Donahue
5d9040a3d8
cleanup superclean output
2014-04-02 10:58:49 -07:00
Jeff Donahue
e29838ddf1
put proto-generated .cc and .h files in build directory
2014-04-02 10:58:49 -07:00
Jeff Donahue
a750a31c5e
create softlink to test directory at build/test
2014-04-02 10:58:49 -07:00
Jeff Donahue
3abb10e910
create superclean Makefile target to delete all files with generated
...
extensions
2014-04-02 10:58:49 -07:00
Jeff Donahue
654d8114ed
put TEST_GPUID in Makefile.config
2014-04-02 10:58:49 -07:00
Jonathan L Long
c8ec12c5cb
add DEBUG option to Makefile/Makefile.config.example
...
This allows debugging to be toggled without dirtying the tree.
2014-03-27 20:15:32 -07:00
jamt9000
40aa12aa18
Fixed order of cblas and atlas linker flags
...
They were the wrong way round, causing linking to fail in some cases
2014-03-21 13:52:36 -07:00
Evan Shelhamer
f6cbe2c5ce
make MKL switch surprise-proof
2014-03-21 13:52:36 -07:00
Evan Shelhamer
c028d09ca6
rewrite MKL flag note, polish makefile
...
add MKL dirs conditioned on USE_MKL
include libraries before making LD_FLAGS
2014-03-21 13:52:36 -07:00
Rowland Depp
a8c9b66b7f
major refactoring allow coexistence of MKL and non-MKL cases
2014-03-21 13:52:36 -07:00
Kai Li
1cf822e53b
Replace atlas with multithreaded OpenBLAS to speed-up on multi-core CPU
...
issue: #79
2014-03-21 13:52:35 -07:00
Rodrigo Benenson
e4e93f4d12
compile caffe without MKL (dependency replaced by boost::random, Eigen3)
...
- examples, test and pycaffe compile without problem (matcaffe not tested)
- tests show some errors (on cpu gradient tests), to be investigated
- random generators need to be double checked
- mkl commented code needs to be removed
2014-03-21 13:52:34 -07:00
Jeff Donahue
9251ae7fb4
also fix for runtest
2014-03-18 18:37:39 -07:00
Jeff Donahue
60883953b6
add libcaffe.a to TEST_ALL_BIN dependencies in Makefile
2014-03-18 18:37:39 -07:00
Evan Shelhamer
f890a18b49
Merge pull request #199 from longjon/pycaffe-ordereddict
...
Update Python interface, using OrderedDict for blobs and layers to expose activations, params, and diffs.
2014-03-17 17:07:36 -07:00
Jeff Donahue
3c19256bf1
make runtest with TEST_ALL_BIN obey TEST_GPUID
2014-03-17 14:03:19 -07:00
Eric Tzeng
8bc83b07db
Compile a binary to run all tests at once.
2014-03-13 14:30:44 -07:00
Jonathan L Long
d803535445
Rename pycaffe.cpp -> _caffe.cpp in preparation for python wrapper
...
This commit should not break any code which does not refer explicitly to
caffe.pycaffe.
2014-03-13 11:15:57 -07:00
Jeff Donahue
5fe44c8148
fix 'make lint' in OSX:
...
seems that NONGEN_CXX_SRCS wasn't getting populated in OSX due to some
disagreement in the regex formatting in find...give up on that and use
an ugly but reliable chain of -name ... -or -name ...
2014-02-27 00:37:52 -08:00
Jeff Donahue
52a539dcd1
fix python/matlab wrapper bugs introduced by lint; change linter->lint
...
in Makefile
2014-02-26 16:54:25 -08:00
Jeff Donahue
5fdf55c437
make lint will not rerun if successful and no source files have been
...
changed; saves output to build/cpp_lint.log (or build/cpp_lint.error_log
on failure)
2014-02-26 16:54:25 -08:00
Jeff Donahue
218ca1522d
cpplint.py -> cpp_lint.py and NOLINT_NEXTLINE -> NOLINT_NEXT_LINE
2014-02-26 15:42:39 -08:00
Jeff Donahue
41246fce42
add new tools dir to linted dir list
2014-02-26 15:42:39 -08:00
Jeff Donahue
a51e35bd6c
add examples, python, matlab to NONGEN_CXX_SRCS so they are linted as
...
well
2014-02-26 15:42:39 -08:00
Jeff Donahue
488a4bd4a7
exclude proto generated files from lint
2014-02-26 15:42:38 -08:00
Jeff Donahue
ba95a87e11
add cpplint.py and "make lint" to run on all c source files
2014-02-26 15:42:37 -08:00
Kai Li
8699d122d9
Reverse the order of hdf5_hl hdf5 as LIBRARIES in Makefile
2014-02-26 15:42:37 -08:00
Sergey Karayev
92302c9029
HDF5DataLayer, with test.
2014-02-26 15:42:37 -08:00
Evan Shelhamer
4f1cdeb4ef
Make tools/ for core binaries, stow scripts/ in tools/extra
...
Collect core Caffe tools like train_net, device_query, etc. together in
tools/ and include helper scripts under tools/extra.
2014-02-26 12:37:44 -08:00
Jonathan L Long
56c4930412
don't pass LDFLAGS when only performing compilation (-c)
...
This simplifies the compiler commands and suppresses warnings.
2014-02-17 15:51:48 -08:00
Evan Shelhamer
f4a0a6fcc2
add CXXFLAGS for libstdc++ on OS X 10.9
2014-02-11 19:55:41 -08:00
Sergey Karayev
461175e836
remove linking against mkl_intel_thread: unneeded
...
and gives hard-to-debug errors on os x
2014-02-03 02:41:04 -08:00
Evan Shelhamer
e54bd1be09
cleanup whitespace
2014-01-19 14:34:12 -08:00
Kai Li
9e7945a268
Add removing distribute directory when make clean
2014-01-13 20:42:01 +08:00
Kai Li
dd33fdafa0
Add make proto target to seperately generate caffe/proto/caffe.pb.h
...
issue: #22
2014-01-13 20:25:30 +08:00
Kai Li
b6aa777919
Seperated build, distribute and source directories
...
issue: #1
2014-01-13 19:34:34 +08:00
Jeff Donahue
ae9ed2afae
modify makefile to recompile on changes to header files
2013-11-28 13:57:09 -08:00
Yangqing Jia
49c5345707
removed the -Wl flag which was an earlier experimental try
2013-11-26 09:49:29 -08:00
Yangqing Jia
313a8621b1
makefile update
2013-11-26 09:47:26 -08:00
Yangqing Jia
720eba028c
Merge branch 'master' of github.com:Yangqing/caffe
2013-11-24 22:13:38 -08:00
Yangqing Jia
c632b4f6ce
makefile: add both lib and lib64 to the cuda library path.
2013-11-24 22:13:34 -08:00
Yangqing Jia
38ece83b5f
makefile: added a MATLAB_DIR variable. pycaffe and matcaffe will not be compiled in default unless one calls make pycaffe or make matcaffe explicitly.
2013-11-23 09:37:27 -08:00
Ross Girshick
3f57281121
update Makefile and add some more docs
2013-11-22 14:16:58 -08:00
Yangqing Jia
2b981cf3dc
fix Makefile problem
2013-11-21 17:00:57 -08:00