Граф коммитов

84 Коммитов

Автор SHA1 Сообщение Дата
Evan Shelhamer 8ea837ff13 randomize order of test execution by make runtest 2014-04-25 19:39:14 -07:00
Evan Shelhamer ed38827284 Give choice of ATLAS, MKL, and OpenBLAS (with option to override paths)
- configure build for ATLAS, MKL, or OpenBLAS on Linux and OSX
- allow overriding of the include or lib dirs
- replace magic numbers with BLAS names (atlas, mkl, open)

Follow-up from #305 and #325.
2014-04-15 01:49:08 -06:00
AlOa 8fd9f8cec7 Add possibility to use OpenBlas 2014-04-14 16:12:12 +02:00
Evan Shelhamer b467ffb75d fix osx 10.9 condition in Makefile 2014-04-09 15:44:07 -07:00
Evan Shelhamer 938f946956 include vecLib BLAS dir on osx 2014-04-09 14:33:31 -07:00
Evan Shelhamer 8fc0e4bbe6 auto-configure linux/osx build differences
- set cxx as needed (clang++ on os x)
- set stdlib flag for os x 10.9 (CUDA libc++ workaround)
- link ATLAS properly for non-MKL installation whether linux or os x
2014-04-08 15:45:00 -07:00
Evan Shelhamer 8f1f3d2938 trivial makefile grooming 2014-04-08 15:25:04 -07:00
Jeff Donahue 76caca3a5a gitignore python/caffe/proto/; superclean ignore data dir 2014-04-04 13:44:34 -07:00
Jeff Donahue 6b3d257eea include build/ before other dirs so old proto built files in src/ and
include/ don't interfere
2014-04-02 11:29:01 -07:00
Jeff Donahue 74a3788298 remove silly thing where I copied proto headers to a separate
build/include dir
2014-04-02 10:58:49 -07:00
Jeff Donahue abf44a6174 matcaffe fixes 2014-04-02 10:58:49 -07:00
Jeff Donahue 48994cf0dd fix test bugs and minor cleanup 2014-04-02 10:58:49 -07:00
Jeff Donahue 39ca2def35 cleanup python build and clean 2014-04-02 10:58:49 -07:00
Jeff Donahue db26e5a8f3 compile test bins directly into build/test 2014-04-02 10:58:49 -07:00
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