Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2015-09-19 | [build] check xcode command line tools version >= 6 | Evan Shelhamer | 1 | -2/+3 | |
future-proof version check for BLAS libraries on OS X fix #3092 | |||||
2015-09-17 | [build] include IO dependencies by default | Evan Shelhamer | 1 | -1/+6 | |
keep old behavior by including leveldb, lmdb, and opencv by default | |||||
2015-09-17 | Separate IO dependencies | Tea | 1 | -4/+24 | |
OpenCV, LMDB, LevelDB and Snappy are made optional via switches (USE_OPENCV, USE_LMDB, USE_LEVELDB) available for Make and CMake builds. Since Snappy is a LevelDB dependency, its use is determined by USE_LEVELDB. HDF5 is left bundled because it is used for serializing weights and solverstates. | |||||
2015-08-14 | New make target to only build the library. | Cyprien Noel | 1 | -2/+4 | |
2015-07-20 | Travis scripts for python3 and pytest for cmake. Also fixes CUDA CMake build ↵ | philkr | 1 | -2/+2 | |
issue #2722. | |||||
2015-05-29 | Fix automatic header file dependency for MatCaffe | Ronghang Hu | 1 | -1/+4 | |
Automatic header file dependency was introduced in #1472, but not correctly applied to matcaffe. Fix it by moving ./caffe_.d to build/matlab/+caffe/private/caffe_.d and add it to DEPS | |||||
2015-05-29 | Clean up old matcaffe wrapper and rename caffe.reset to caffe.reset_all | Ronghang Hu | 1 | -21/+4 | |
Remove old matlab wrapper but keep the classification demo and hdf5 demo Change 'caffe.reset()' to 'caffe.reset_all()' to avoid potential name conflict. Otherwise, Matlab R2015a complains: Warning: Function reset has the same name as a MATLAB builtin. We suggest you rename the function to avoid a potential name conflict. | |||||
2015-05-29 | MatCaffe3 : a powerful matlab interface for caffe | Ronghang Hu | 1 | -1/+21 | |
Added matcaffe3, a powerful matlab interface. To test it, run 'make mattest' | |||||
2015-04-30 | Merge pull request #2369 from jeffdonahue/makefile-link-bugfix | Jeff Donahue | 1 | -2/+6 | |
Makefile bugfix: debug/release dir link not toggled properly | |||||
2015-04-30 | Makefile bugfix: OTHER_BUILD_DIR name set incorrectly when empty due to | Jeff Donahue | 1 | -2/+6 | |
lazy variable expansion when using the `?=` operator -- change them to explicit empty string checks with simple assignment operator `:=`. | |||||
2015-04-24 | clarify Makefile.config check | Jonathan L Long | 1 | -1/+2 | |
2015-04-17 | Abort Makefile parsing if the configuration file cannot be found. | Felix Abecassis | 1 | -0/+3 | |
2015-04-17 | set default DISTRIBUTE_DIR -- fix #2328 | Evan Shelhamer | 1 | -0/+1 | |
2015-03-29 | Check if CPU_ONLY is set when determining CUDA version | small-yellow-duck | 1 | -6/+8 | |
Previously, CUDA_VERSION would appear to be < 7 if there was no CUDA installed, and that would generate the wrong C++ flags for compiling on recent OSX versions. Instead, skip the CUDA version check if CPU_ONLY is set. This change only affects CPU_ONLY installations. | |||||
2015-02-24 | Merge pull request #1960 from gustavla/makefile_fix | Jon Long | 1 | -1/+2 | |
Replaced illegal tab in Makefile with spaces. | |||||
2015-02-24 | Makefile fix for OS X 10.10 | Sergey Karayev | 1 | -1/+1 | |
2015-02-24 | Replaced illegal tab in Makefile with spaces. | Gustav Larsson | 1 | -1/+2 | |
Commands, such as $(error ...), are not allowed to be indented with tabs outside of targets, throwing an error instead of outputting the actual error. The solution is to use innocuous spaces instead. Ideally, spaces should be used everywhere outside targets, but since make does not mind it if variable assignments are tab-indented outside targets, a complete overhaul is not necessary. However, if more errors are added, it might make more sense to be consistent. Also, make will already add a period so I removed it. | |||||
2015-02-20 | check caffe tool runs in runtest | Evan Shelhamer | 1 | -0/+1 | |
2015-02-20 | [build] fix dynamic linking of tools | Evan Shelhamer | 1 | -1/+6 | |
set the right rpath for tools and examples respectively thanks for the report @mees! | |||||
2015-02-19 | [build] fix rpath for examples | Evan Shelhamer | 1 | -1/+1 | |
2015-02-17 | [make] link libcaffe.so before dependencies | Jonathan L Long | 1 | -2/+2 | |
2015-02-16 | add WITH_PYTHON_LAYER build option to include Python layer | Jonathan L Long | 1 | -0/+6 | |
Currently, this will only work when running from pycaffe (but not the tool binary), due to static linking conflicts with registration. | |||||
2015-02-16 | [pycaffe] allow Layer to be extended from Python | Jonathan L Long | 1 | -1/+2 | |
This is done by adding PythonLayer as a boost::python HeldType. | |||||
2015-02-16 | [pycaffe] strike down wrappers, momentarily gut all functionality | Jonathan L Long | 1 | -2/+1 | |
2015-02-16 | only dynamically link the tests | Evan Shelhamer | 1 | -13/+4 | |
No need to independently test static and dynamic linking. | |||||
2015-02-16 | dynamic linking | Evan Shelhamer | 1 | -17/+23 | |
2015-02-06 | build with libc++ on Yosmite with CUDA 7 | Evan Shelhamer | 1 | -4/+7 | |
2015-01-22 | Merge pull request #1473 from longjon/pytest | Evan Shelhamer | 1 | -0/+3 | |
Python testing | |||||
2015-01-16 | Merge pull request #1704 from longjon/friendlier-link-messages | Evan Shelhamer | 1 | -2/+2 | |
Makefile: friendlier messages for link commands | |||||
2015-01-16 | Merge pull request #1705 from longjon/origin-rpath | Evan Shelhamer | 1 | -1/+2 | |
Makefile: specify RPATH using $ORIGIN | |||||
2015-01-15 | Merge pull request #1236 from mlapin/legacy_nvcc_support | Evan Shelhamer | 1 | -1/+0 | |
Drop OpenCV includes from NVCC code for legacy reasons. | |||||
2015-01-15 | support OS X Yosemite / 10.10 | Evan Shelhamer | 1 | -7/+14 | |
- pick libstdc++ for OS X (regardless of version) - make gtest rely on its own tuple to not conflict with clang (thanks @pluskid!) - 10.10 has Accelerate while 10.9 has vecLib for BLAS (thanks @leonardt and @drdan14) | |||||
2015-01-10 | [build] specify RPATH using $ORIGIN | Jonathan L Long | 1 | -1/+2 | |
Currently, when dynamically linking against libcaffe (right now, only done for tests), RPATH is specified relative to the caffe source root. This commit fixes RPATH using the special $ORIGIN variable to be relative to the executable itself, so that there is no dependence on the working directory. | |||||
2015-01-10 | [build] more meaningful messages for link commands | Jonathan L Long | 1 | -2/+2 | |
2015-01-06 | add "make pytest" for running Python tests | Jonathan L Long | 1 | -0/+3 | |
2014-12-30 | don't do runtest as part of 'make everything' | Jeff Donahue | 1 | -1/+1 | |
2014-12-30 | only build matcaffe as part of 'make everything' if MATLAB_DIR is set | Jeff Donahue | 1 | -1/+8 | |
2014-12-28 | pretty the build with the Q variable | Jonathan L Long | 1 | -30/+30 | |
Unset Q (in the environment) to see full commands, or edit in Makefile.config. | |||||
2014-12-28 | automatic dependency generation | Jonathan L Long | 1 | -8/+13 | |
2014-12-16 | move cuda output from build/.../.cuo -> build/cuda/.../.o | Jonathan L Long | 1 | -12/+12 | |
This will allow nvcc's -M dependency generation option to work harmoniously, since it assumes that output will have a .o extension. | |||||
2014-12-16 | automatic discovery of source directories | Jonathan L Long | 1 | -15/+7 | |
2014-12-16 | consolidate build rules for object files | Jonathan L Long | 1 | -67/+10 | |
2014-12-16 | remove extra blank line | Jonathan L Long | 1 | -1/+0 | |
2014-10-21 | make release, debug build dirs configurable in Makefile | Evan Shelhamer | 1 | -2/+2 | |
2014-10-19 | include opencv only in .cpp | Maksim Lapin | 1 | -1/+0 | |
2014-10-14 | Reintroduce pkg-config with optional Makefile.config flag. | Jeff Donahue | 1 | -1/+8 | |
2014-10-14 | Revert "OpenCV should be compiled using pkg-config options." -- breaks | Jeff Donahue | 1 | -2/+2 | |
compilation on working systems This reverts commit 4587b2f9043996fed36fc989c00329ec829ecae9. | |||||
2014-10-11 | OpenCV should be compiled using pkg-config options. | Kevin James Matzen | 1 | -2/+2 | |
2014-10-11 | adding missing libraries - lm and lstdc++ | Yangqing Jia | 1 | -4/+3 | |
2014-10-06 | Merge pull request #1179 from ducha-aiki/fix_pthread_link | Evan Shelhamer | 1 | -3/+2 | |
[fix] put pthread last in order for gflags |