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

122 Коммитов

Автор SHA1 Сообщение Дата
TANGUY Arnaud 374218a07a Fix choice MKL directory from Makefile.config 2014-07-29 14:08:42 +02:00
Evan Shelhamer dff2023a67 make "all" the default target
"all" is the right default since it builds the library itself.
define "everything" after it.
2014-07-28 15:22:43 -07:00
Jeff Donahue 6d71c516bc Symlink to tool bins without the .bin extension 2014-07-27 12:50:13 -07:00
Yangqing Jia f80911f6d5 Merge pull request #776 from Yangqing/sweep
Gflags dependency & misc
2014-07-24 14:15:45 -07:00
Yangqing Jia 15bc0f767f add gflags dependency to caffe. 2014-07-23 22:47:25 -07:00
Ross Girshick 1ceb791ab0 Use the same CXX for matcaffe as for the rest of the build 2014-07-22 20:06:48 -07:00
Jonathan L Long 29fd174ec6 add an "everything" target to make for comprehensive build testing
The everything target builds all components, checks warnings, runs lint,
and runs tests.
2014-07-19 19:08:55 -07:00
Evan Shelhamer 79a769c584 switch travis build to CPU-only flag, drop runtestnogpu target 2014-07-17 11:57:56 +02:00
Evan Shelhamer e52d91ea33 collect CUDA includes and calls, separate from CPU-only mode, leave out
- collect CUDA includes in device_alternate.hpp
- add guards for CUDA code
- move GPU code into cu from cpp
- make CUDA includes and libraries conditional in Makefile
- drop CUDA dependency from travis-ci build
2014-07-17 11:57:47 +02:00
Evan Shelhamer b882c3b470 add guards to drop GPU code in CPU-only mode 2014-07-17 11:57:09 +02:00
Evan Shelhamer b6d881d1e7 configure Makefile for CPU-only build 2014-07-17 11:57:06 +02:00
Jeff Donahue 3e35a160e2 Fix Makefile warning error message. 2014-07-15 13:47:14 -07:00
Evan Shelhamer 6a0883d45f fix choice of clang++ in OS X build 2014-07-15 10:20:10 +02:00
Ross Girshick c28823f782 fix bug that breaks MATLAB 2014a compilation 2014-07-14 17:04:43 -07:00
Jeff Donahue 9c65fbaa86 Replace CUSTOM_CXX env var to specify non-default C++ compiler. 2014-07-14 13:43:08 -07:00
Evan Shelhamer 856f06d44f fix Makefile comment about library names 2014-07-14 19:54:48 +02:00
Jeff Donahue c962e7de51 Travis build failure wasn't working for lint/warn because they didn't
exit with a non-zero code -- this fixes that.
2014-07-14 02:18:16 -07:00
Jeff Donahue 24bfd03da3 -Override the default compiler by specifying a CXX in
Makefile.config instead of CUSTOM_CXX, as Travis exports CXX
as the compiler env variable name.
-Change TEST_HDFS -> TEST_HXX_SRCS.
2014-07-14 02:18:16 -07:00
Jeff Donahue e5ce15d29d Move test headers to include/.
Add a test param to test both CPU and GPU (with both float and double
Dtypes).
2014-07-14 02:17:58 -07:00
Jeff Donahue 1679815f67 makefile hotfix 2014-07-09 16:39:17 -07:00
Jeff Donahue 37329cbc2c fix bug introduced by warning logs: errors didn't print because they
are logged to the warnings file
2014-07-09 15:47:21 -07:00
Jeff Donahue d86735ed3b Makefile: cleanup lint/warn report logic (and make the two more consistent) 2014-07-09 11:42:19 -07:00
Jeff Donahue 933dc6e7d9 Output a lint report for every source file linted; use to lint
incrementally
2014-07-08 17:56:06 -07:00
Jeff Donahue ba8a2bb8c9 Dump compiler warnings to *.warnings.txt; use "make warn" to print them 2014-07-08 17:53:53 -07:00
Jeff Donahue e5be75459a Don't make clean when running linecount 2014-07-08 15:02:00 -07:00
Evan Shelhamer 18a4e2d1fc customize compiler setting in Makefile.config
in case of issues with default compilers or exotic platforms.
2014-07-03 18:38:30 -07:00
James Thewlis a63feadb08 Fix building tests with parallel make
The changes for .cu tests meant that creating
TEST_BUILD_DIR wasn't happening first
2014-06-28 00:49:53 +01:00
James Thewlis 6450e0f0c8 Test for im2col kernel
With associated Makefile changes for .cu tests

This tests that the grid-stride loop works for im2col,
using the CPU version as a reference.
2014-06-27 10:15:41 +01:00
Evan Shelhamer 89fd7e3334 content ourselves to -Wall without -Werror for now 2014-06-25 17:58:38 -07:00
Evan Shelhamer 30ad1e2379 make clang++ happy on OSX by not linking with pthread 2014-06-25 17:35:40 -07:00
Jonathan L Long aa7371147e turn off some warnings for older compilers 2014-06-25 15:11:42 -07:00
Jonathan L Long 8490718f4c add WARNINGS to CXXFLAGS 2014-06-25 15:11:41 -07:00
Jonathan L Long ff5e35ee77 upgrade warnings to -Wall -Werror -Wno-sign-compare 2014-06-25 15:11:41 -07:00
linmin 12f6fd52a8 add option for lmdb 2014-06-12 22:23:49 -07:00
Jeff Donahue 25aa12922c fix Makefile build dir link upgrade bug reported by @jamt9000 2014-06-08 18:22:45 -07:00
Jeff Donahue a8dfed49e3 compile debug/release into separate directories so you don't have to
rebuild the whole thing to switch back and forth
2014-06-03 00:24:58 -07:00
Jonathan L Long 608abe267f don't pass LDFLAGS when only compiling 2014-05-26 01:34:32 -07:00
Jeff Donahue f66f25dbc2 fix Makefile bug - HXX_SRCS was things that don't end in .hpp, instead
of things that do...
2014-05-10 17:20:19 -07:00
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