summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
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
2014-10-06change -lpthread to -pthread in linkingDmytro Mishkin1-2/+2
Compilation flags is already there
2014-10-03Merge pull request #1070 from sguada/move_data_meanSergio Guadarrama1-0/+1
Refactor data_transform to allow datum, cv:Mat and Blob transformation
2014-10-03Fix OSX compilation for nvcc with opencvSergio1-0/+1
2014-10-03[fix] translate g++ whole archive to force load for clang++ compilationEvan Shelhamer1-1/+10
To build with the layer registry clang++ requires `-force_load` as g++ requires `--whole-archive`.
2014-09-30Merge pull request #1167 from Yangqing/factoryYangqing Jia1-18/+31
Layer factory.
2014-09-29Changed linking order: -pthread -> back.Dmytro Mishkin1-3/+2
Otherwise error: /usr/bin/ld: /usr/local/lib/libgflags.a(gflags.cc.o): undefined reference to symbol 'pthread_rwlock_wrlock@@GLIBC_2.2.5' /lib/x86_64-linux-gnu/libpthread.so.0: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status
2014-09-28Add back static library. Using -Wl,--whole-archive will allow us to preserve ↵Yangqing Jia1-20/+27
all symbols.
2014-09-28Pre-lunch fun: add a dynamic library guard test.Yangqing Jia1-9/+21
2014-09-28running factory.Yangqing Jia1-22/+16
2014-09-23Changed "blas" to "openblas"savy-911-1/+1
The change was made because openblas has to be linked as "-lopenblas" and not "-lblas". This caused an error when compiling.
2014-09-08Merge pull request #1050 from jeffdonahue/linecount-moreJeff Donahue1-1/+3
linecount counts more dirs than just src/
2014-09-08Merge pull request #1044 from jeffdonahue/no-tmpnamJeff Donahue1-1/+7
change uses of tmpnam to mkstemp/mkdtemp
2014-09-08linecount counts more dirs than just src/Jeff Donahue1-1/+3
2014-09-07add cuDNN to buildEvan Shelhamer1-1/+8
2014-09-07add <cuda>/lib64 only if exists to suppress linker warningsJeff Donahue1-1/+7
2014-09-03[docs] configure doxygen + docs script for docs/doxygen site outputEvan Shelhamer1-1/+3
2014-09-03add "make {docs,doxygen}" targets to build doxygen-generated docsJeff Donahue1-1/+25
2014-08-31[pycaffe] split _caffe into source and header filesJonathan L Long1-1/+2
This brings pycaffe more in line with usual C++ style, and will allow the wrapper classes to be used within caffe when embedding Python.
2014-08-30remove residual pthread references, but restore in build for gtestEvan Shelhamer1-2/+2
gtest depends on pthread in Ubuntu 14.04
2014-08-30Makefile: fix boost::thread linking, drop pthread, sortEvan Shelhamer1-13/+17
2014-08-29Replace pthread with boost::threadKai Li1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 06:26:14 +0000