summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2020-01-23Merge pull request #6346 from jerryz123/HDF5_configPrzemysław Dolata1-1/+11
Added USE_HDF5 flag to build
2020-01-23Cherry-picked USE_HDF5 from Android branchJerry Zhao1-1/+11
2018-02-08Fix incorrect namespace for pycaffe submodule caffe_pb2 generated by protobufYegor Bedarev1-1/+1
2017-11-11Fix Makefile parallel builds missing protobuf headersclarkson1-1/+1
2017-06-21Fixed bug where make distribute duplicates python files in distribute/pythonArne Suppe1-1/+1
2017-04-14Caffe 1.0Evan Shelhamer1-1/+1
2017-02-16version bump: rc5Evan Shelhamer1-1/+1
2017-02-08make: bump version to rc4Evan Shelhamer1-1/+1
2017-01-06Switched multi-GPU to NCCLCyprien Noel1-0/+6
2016-11-21Checks inside Xcode for latest OSX SDK (#4840)Zylphrex1-3/+3
OS X: build with latest SDK by default
2016-08-18[build] set default BLAS include for OS X 10.11Evan Shelhamer1-1/+4
the latest hunt for the ever-elusive vecLib/Accelerate
2016-05-13Fix Makefile CUDA_VERSION extraction on OSX YosemiteYale Song1-1/+1
2016-04-30fix grep in CUDA version detection to accomodate OSX's grep (and other grep ↵Sheng Zha1-1/+1
that doesn't support \d extension)
2016-03-15Update Makefile: Changed MKL_DIR to MKLROOTJacekR1-3/+3
MKLROOT variable is set by MKL scripts, so it also should be used in Makefile.
2016-02-20Merge pull request #3696 from shelhamer/fix-osx-install-nameEvan Shelhamer1-3/+2
fix library install name on OS X for @rpath linking
2016-02-20Fix OSX El Capitan CUDA incompatibility, by adding lib to rpathMohamed Ezz1-0/+10
2016-02-20fix library install name on OSX for relative path linkingEvan Shelhamer1-3/+2
for linking of the caffe tools, tests, etc. the library install name needs to include the @rpath set for the executables and interfaces this was broken on OSX by #3311
2016-01-29Merge pull request #3587 from junshi15/distribute_protoEvan Shelhamer1-0/+2
Include proto definition in distribute dir
2016-01-29use relative paths on making build/tools/ linksgdh19951-1/+1
The old uses `abspath`, which I think is so harmful: * If I `cp -a` the whole project, `build/tools/caffe` still refer to the old file, until `make clean`, making debugging very hard * For `tar` and `scp`, the soft links can not work unless the target project folder has the same path
2016-01-22Merge pull request #3311 from lukeyeager/bvlc/versioningEvan Shelhamer1-9/+21
Add versioning to build and mark version 1.0.0-rc3
2016-01-22Version 1.0.0-rc3Luke Yeager1-9/+21
2016-01-22copy proto to distribute directoryJun Shi1-0/+2
2016-01-21Add makefile config option for linking Python 3 librariesRobbie Cooper1-1/+1
2015-12-01dismantle layer headersEvan Shelhamer1-1/+1
No more monolithic includes: split layers into their own headers for modular inclusion and build.
2015-11-10Merge pull request #3127 from lukeyeager/install-lib-permissionsEvan Shelhamer1-1/+1
[build] Install libs as non-executable files
2015-11-10Replace unistd functions with cross platform counterpartsTea1-1/+1
2015-10-22Merge pull request #3186 from lionleaf/makefile_opencv_imgcodecsRonghang Hu1-1/+6
Add opencv_imgcodecs to library path in Makefile
2015-10-22Add opencv_imgcodecs to library path in MakefileAndreas Løve Selvik1-1/+6
Project does not compile without opencv_imgcodecs in the library path if you're using OpenCV 3. This introduces a OPENCV_VERSION flag in Makefile.config that includes the library if set to 3. (Trying to include it with OpenCV 2 also breaks the build)
2015-09-28Install libs as non-executable filesLuke Yeager1-1/+1
According to the Debian policy manual, "Shared libraries should not be installed executable, since the dynamic linker does not require this and trying to execute a shared library usually results in a core dump." https://www.debian.org/doc/debian-policy/ch-sharedlibs.html#s-sharedlibs-runtime
2015-09-25Add ALLOW_LMDB_NOLOCK build optionLuke Yeager1-0/+3
This option lets you open LMDB files with the MDB_NOLOCK flag. You should not set this flag if you will be reading LMDBs with any possibility of simultaneous read and write.
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 04:47:38 +0000