summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2015-09-19[build] check xcode command line tools version >= 6Evan Shelhamer1-2/+3
future-proof version check for BLAS libraries on OS X fix #3092
2015-09-17[build] include IO dependencies by defaultEvan Shelhamer1-1/+6
keep old behavior by including leveldb, lmdb, and opencv by default
2015-09-17Separate IO dependenciesTea1-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-14New make target to only build the library.Cyprien Noel1-2/+4
2015-07-20Travis scripts for python3 and pytest for cmake. Also fixes CUDA CMake build ↵philkr1-2/+2
issue #2722.
2015-05-29Fix automatic header file dependency for MatCaffeRonghang Hu1-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-29Clean up old matcaffe wrapper and rename caffe.reset to caffe.reset_allRonghang Hu1-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-29MatCaffe3 : a powerful matlab interface for caffeRonghang Hu1-1/+21
Added matcaffe3, a powerful matlab interface. To test it, run 'make mattest'
2015-04-30Merge pull request #2369 from jeffdonahue/makefile-link-bugfixJeff Donahue1-2/+6
Makefile bugfix: debug/release dir link not toggled properly
2015-04-30Makefile bugfix: OTHER_BUILD_DIR name set incorrectly when empty due toJeff Donahue1-2/+6
lazy variable expansion when using the `?=` operator -- change them to explicit empty string checks with simple assignment operator `:=`.
2015-04-24clarify Makefile.config checkJonathan L Long1-1/+2
2015-04-17Abort Makefile parsing if the configuration file cannot be found.Felix Abecassis1-0/+3
2015-04-17set default DISTRIBUTE_DIR -- fix #2328Evan Shelhamer1-0/+1
2015-03-29Check if CPU_ONLY is set when determining CUDA versionsmall-yellow-duck1-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-24Merge pull request #1960 from gustavla/makefile_fixJon Long1-1/+2
Replaced illegal tab in Makefile with spaces.
2015-02-24Makefile fix for OS X 10.10Sergey Karayev1-1/+1
2015-02-24Replaced illegal tab in Makefile with spaces.Gustav Larsson1-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-20check caffe tool runs in runtestEvan Shelhamer1-0/+1
2015-02-20[build] fix dynamic linking of toolsEvan Shelhamer1-1/+6
set the right rpath for tools and examples respectively thanks for the report @mees!
2015-02-19[build] fix rpath for examplesEvan Shelhamer1-1/+1
2015-02-17[make] link libcaffe.so before dependenciesJonathan L Long1-2/+2
2015-02-16add WITH_PYTHON_LAYER build option to include Python layerJonathan L Long1-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 PythonJonathan L Long1-1/+2
This is done by adding PythonLayer as a boost::python HeldType.
2015-02-16[pycaffe] strike down wrappers, momentarily gut all functionalityJonathan L Long1-2/+1
2015-02-16only dynamically link the testsEvan Shelhamer1-13/+4
No need to independently test static and dynamic linking.
2015-02-16dynamic linkingEvan Shelhamer1-17/+23
2015-02-06build with libc++ on Yosmite with CUDA 7Evan Shelhamer1-4/+7
2015-01-22Merge pull request #1473 from longjon/pytestEvan Shelhamer1-0/+3
Python testing
2015-01-16Merge pull request #1704 from longjon/friendlier-link-messagesEvan Shelhamer1-2/+2
Makefile: friendlier messages for link commands
2015-01-16Merge pull request #1705 from longjon/origin-rpathEvan Shelhamer1-1/+2
Makefile: specify RPATH using $ORIGIN
2015-01-15Merge pull request #1236 from mlapin/legacy_nvcc_supportEvan Shelhamer1-1/+0
Drop OpenCV includes from NVCC code for legacy reasons.
2015-01-15support OS X Yosemite / 10.10Evan Shelhamer1-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 $ORIGINJonathan L Long1-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 commandsJonathan L Long1-2/+2
2015-01-06add "make pytest" for running Python testsJonathan L Long1-0/+3
2014-12-30don't do runtest as part of 'make everything'Jeff Donahue1-1/+1
2014-12-30only build matcaffe as part of 'make everything' if MATLAB_DIR is setJeff Donahue1-1/+8
2014-12-28pretty the build with the Q variableJonathan L Long1-30/+30
Unset Q (in the environment) to see full commands, or edit in Makefile.config.
2014-12-28automatic dependency generationJonathan L Long1-8/+13
2014-12-16move cuda output from build/.../.cuo -> build/cuda/.../.oJonathan L Long1-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-16automatic discovery of source directoriesJonathan L Long1-15/+7
2014-12-16consolidate build rules for object filesJonathan L Long1-67/+10
2014-12-16remove extra blank lineJonathan L Long1-1/+0
2014-10-21make release, debug build dirs configurable in MakefileEvan Shelhamer1-2/+2
2014-10-19include opencv only in .cppMaksim Lapin1-1/+0
2014-10-14Reintroduce pkg-config with optional Makefile.config flag.Jeff Donahue1-1/+8
2014-10-14Revert "OpenCV should be compiled using pkg-config options." -- breaksJeff Donahue1-2/+2
compilation on working systems This reverts commit 4587b2f9043996fed36fc989c00329ec829ecae9.
2014-10-11OpenCV should be compiled using pkg-config options.Kevin James Matzen1-2/+2
2014-10-11adding missing libraries - lm and lstdc++Yangqing Jia1-4/+3
2014-10-06Merge pull request #1179 from ducha-aiki/fix_pthread_linkEvan Shelhamer1-3/+2
[fix] put pthread last in order for gflags